From ea8cc65a07ed5c21acbd9f652c5559500459078c Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 22 Feb 2021 12:22:40 +0100 Subject: [PATCH] Fix entities --- public/main/inc/lib/usermanager.lib.php | 4 ++-- public/main/inc/lib/webservices/Rest.php | 2 +- public/main/webservices/registration.soap.php | 4 ++-- src/CoreBundle/Entity/AccessUrl.php | 3 +++ src/CourseBundle/Entity/CThematic.php | 4 ++-- src/CourseBundle/Event/CourseAccess.php | 6 +----- src/CourseBundle/Repository/CLinkRepository.php | 2 +- src/CourseBundle/Repository/CThematicRepository.php | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-) diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php index c6692d1dd8..8e045a80a3 100644 --- a/public/main/inc/lib/usermanager.lib.php +++ b/public/main/inc/lib/usermanager.lib.php @@ -317,7 +317,7 @@ class UserManager ->setAuthSource($authSource) ->setPhone($phone) ->setAddress($address) - ->setLanguage($language) + ->setLocale($language) ->setRegistrationDate($now) ->setHrDeptId($hr_dept_id) ->setActive($active) @@ -1149,7 +1149,7 @@ class UserManager ->setUsername($username) ->setStatus($status) ->setAuthSource($auth_source) - ->setLanguage($language) + ->setLocale($language) ->setLocale($language) ->setEmail($email) ->setOfficialCode($official_code) diff --git a/public/main/inc/lib/webservices/Rest.php b/public/main/inc/lib/webservices/Rest.php index e34488d6ac..90543f0670 100644 --- a/public/main/inc/lib/webservices/Rest.php +++ b/public/main/inc/lib/webservices/Rest.php @@ -1846,7 +1846,7 @@ class Rest extends WebService if (!in_array($value, $languages['folder'])) { throw new Exception(get_lang('LanguageUnavailable')); } - $user->setLanguage($value); + $user->setLocale($value); break; case 'registration_date': $user->setRegistrationDate($value); diff --git a/public/main/webservices/registration.soap.php b/public/main/webservices/registration.soap.php index c8f5fbd23e..6dd96d0ddb 100644 --- a/public/main/webservices/registration.soap.php +++ b/public/main/webservices/registration.soap.php @@ -1991,7 +1991,7 @@ function WSEditUser($params) $user->setExpirationDate($expiration_date); } if (!empty($language)) { - $user->setLanguage($language); + $user->setLocale($language); } $user @@ -1999,7 +1999,7 @@ function WSEditUser($params) ->setStatus($status) ->setOfficialCode($official_code) ->setPhone($phone) - ->setPictureUri($picture_uri) + //->setPictureUri($picture_uri) ->setHrDeptId($hr_dept_id) ->setActive(true); diff --git a/src/CoreBundle/Entity/AccessUrl.php b/src/CoreBundle/Entity/AccessUrl.php index e8e3f68ece..b3b13c79e1 100644 --- a/src/CoreBundle/Entity/AccessUrl.php +++ b/src/CoreBundle/Entity/AccessUrl.php @@ -5,6 +5,7 @@ namespace Chamilo\CoreBundle\Entity; use ApiPlatform\Core\Annotation\ApiResource; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; use Symfony\Component\Serializer\Annotation\Groups; @@ -35,6 +36,8 @@ class AccessUrl extends AbstractResource implements ResourceInterface protected $id; /** + * @var AccessUrlRelCourse[]|ArrayCollection + * * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true) */ protected $courses; diff --git a/src/CourseBundle/Entity/CThematic.php b/src/CourseBundle/Entity/CThematic.php index 65016ac8a2..9a4674e3ff 100644 --- a/src/CourseBundle/Entity/CThematic.php +++ b/src/CourseBundle/Entity/CThematic.php @@ -59,7 +59,7 @@ class CThematic extends AbstractResource implements ResourceInterface protected $active; /** - * @var CThematicPlan[] + * @var CThematicPlan[]|ArrayCollection * * @ORM\OneToMany( * targetEntity="CThematicPlan", mappedBy="thematic", cascade={"persist", "remove"}, orphanRemoval=true @@ -68,7 +68,7 @@ class CThematic extends AbstractResource implements ResourceInterface protected $plans; /** - * @var CThematicAdvance[] + * @var CThematicAdvance[]|ArrayCollection * * @ORM\OrderBy({"startDate" = "ASC"}) * diff --git a/src/CourseBundle/Event/CourseAccess.php b/src/CourseBundle/Event/CourseAccess.php index e646b48a5d..6d04ef6c4c 100644 --- a/src/CourseBundle/Event/CourseAccess.php +++ b/src/CourseBundle/Event/CourseAccess.php @@ -16,11 +16,7 @@ class CourseAccess extends Event protected $user; protected $course; - /** - * @param $user - * @param $course - */ - public function __construct($user, $course) + public function __construct(User $user, Course $course) { $this->user = $user; $this->course = $course; diff --git a/src/CourseBundle/Repository/CLinkRepository.php b/src/CourseBundle/Repository/CLinkRepository.php index 7bbfba46e6..3e4a2684d2 100644 --- a/src/CourseBundle/Repository/CLinkRepository.php +++ b/src/CourseBundle/Repository/CLinkRepository.php @@ -38,7 +38,7 @@ final class CLinkRepository extends ResourceRepository implements GridInterface $newResource = $form->getData(); $newResource ->setDisplayOrder(0) - ->setOnHomepage(0) + ->setOnHomepage('0') ; return $newResource; diff --git a/src/CourseBundle/Repository/CThematicRepository.php b/src/CourseBundle/Repository/CThematicRepository.php index 665a71b647..c34957dd85 100644 --- a/src/CourseBundle/Repository/CThematicRepository.php +++ b/src/CourseBundle/Repository/CThematicRepository.php @@ -23,6 +23,6 @@ final class CThematicRepository extends ResourceRepository public function getResources(User $user, ResourceNode $parentNode, Course $course = null, Session $session = null, CGroup $group = null): QueryBuilder { - return $this->getResourcesByCourse($user, $course, $session, $group, $parentNode); + return $this->getResourcesByCourse( $course, $session, $group, $parentNode); } }