Refactor use UserManager::getRepository() instead of getManager

public/main/admin/add_drh_to_user.php

@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Entity\User as UserEntity;
 use Chamilo\CoreBundle\Entity\UserRelUser;
+use Chamilo\CoreBundle\Framework\Container;
 
 $cidReset = true;
 
@@ -16,9 +17,8 @@ if (!isset($_REQUEST['u'])) {
 }
 
 $em = Database::getManager();
-$userRepository = UserManager::getRepository();
-/** @var UserEntity $user */
-$user = UserManager::getManager()->find($_REQUEST['u']);
+$userRepository = Container::getUserRepository();
+$user = api_get_user_entity($_REQUEST['u']);
 
 if (null === $user) {
     api_not_allowed(true);
@@ -32,8 +32,7 @@ $subscribedUsers = $userRepository->getAssignedHrmUserList(
 $hrmOptions = [];
 /** @var UserRelUser $subscribedUser */
 foreach ($subscribedUsers as $subscribedUser) {
-    /** @var UserEntity $hrm */
-    $hrm = UserManager::getManager()->find($subscribedUser->getFriendUserId());
+    $hrm = api_get_user_entity($subscribedUser->getFriendUserId());
 
     if (null === $hrm) {
         continue;
@@ -66,8 +65,7 @@ if ($form->validate()) {
     $values = $form->exportValues();
 
     foreach ($values['hrm'] as $hrmId) {
-        /** @var UserEntity $hrm */
-        $hrm = UserManager::getManager()->find($hrmId);
+        $hrm = api_get_user_entity($hrmId);
 
         if (null === $hrm) {
             continue;

public/main/auth/profile.php

@@ -369,8 +369,7 @@ $filtered_extension = false;
 if ($form->validate()) {
     $wrong_current_password = false;
     $user_data = $form->getSubmitValues(1);
-    /** @var User $user */
-    $user = UserManager::getRepository()->find(api_get_user_id());
+    $user = api_get_user_entity(api_get_user_id());
 
     // set password if a new one was provided
     $validPassword = false;

public/main/auth/resend_confirmation_mail.php

@@ -11,7 +11,7 @@ $form->addButtonSend(get_lang('Send message'));
 
 if ($form->validate()) {
     $values = $form->exportValues();
-    $user = UserManager::getManager()->findUserByUsername($values['user']);
+    $user = UserManager::getRepository()->findUserByUsername($values['user']);
     if ($user) {
         UserManager::sendUserConfirmationMail($user);
     } else {

public/main/auth/reset.php

@@ -36,7 +36,7 @@ if ($form->validate()) {
     $token = $values['token'];
 
     /** @var \Chamilo\CoreBundle\Entity\User $user */
-    $user = UserManager::getManager()->findUserByConfirmationToken($token);
+    $user = UserManager::getRepository()->findUserByConfirmationToken($token);
     if ($user) {
         if (!$user->isPasswordRequestNonExpired($ttl)) {
             Display::addFlash(Display::return_message(get_lang('Link expired, please try again.')), 'warning');
@@ -45,7 +45,7 @@ if ($form->validate()) {
         }
 
         $user->setPlainPassword($password);
-        $userManager = UserManager::getManager();
+        $userManager = UserManager::getRepository();
         $userManager->updateUser($user, true);
 
         $user->setConfirmationToken(null);

public/main/auth/user_mail_confirmation.php

@@ -10,7 +10,7 @@ if (!ctype_alnum($token)) {
 }
 
 /** @var \Chamilo\CoreBundle\Entity\User $user */
-$user = UserManager::getManager()->findUserByConfirmationToken($token);
+$user = UserManager::getRepository()->findUserByConfirmationToken($token);
 
 if ($user) {
     $user->setActive(1); // Set to 1 to activate the user

public/main/cron/user_import/resend_email_with_new_password.php

@@ -21,7 +21,7 @@ exit();
 $list = file('input.txt');
 require_once '../../inc/global.inc.php';
 $users = Database::get_main_table(TABLE_MAIN_USER);
-$userManager = UserManager::getManager();
+$userManager = UserManager::getRepository();
 $repository = UserManager::getRepository();
 
 /**

public/main/inc/lib/formvalidator/Element/UserAvatar.php

@@ -45,7 +45,7 @@ class UserAvatar extends HTML_QuickForm_input
     public function setValue($value)
     {
         $this->user = !is_a($value, 'Chamilo\CoreBundle\Entity\User')
-            ? UserManager::getManager()->find($value)
+            ? UserManager::getRepository()->find($value)
             : $value;
 
         parent::setValue($this->user->getId());

public/main/inc/lib/usermanager.lib.php

@@ -57,16 +57,7 @@ class UserManager
      */
     public static function getRepository()
     {
-        return Container::$container->get(UserRepository::class);
-    }
-
-    /**
-     * Create/update/delete methods are available in the UserManager
-     * (based in the Sonata\UserBundle\Entity\UserManager).
-     */
-    public static function getManager()
-    {
-        return Container::getUserManager();
+        return Container::getUserRepository();
     }
 
     /**
@@ -348,8 +339,6 @@ class UserManager
         $em->persist($user);
         $em->flush();
 
-        $userId = $user->getId();
-
         // Add user to a group
         $statusToGroup = [
             COURSEMANAGER => 'TEACHER',
@@ -370,6 +359,8 @@ class UserManager
 
         $em->flush();
 
+        $userId = $user->getId();
+
         if (!empty($userId)) {
             if ($isAdmin) {
                 self::addUserAsAdmin($user);
@@ -1047,8 +1038,8 @@ class UserManager
         $firstname,
         $lastname,
         $username,
-        $password = null,
-        $auth_source = null,
+        $password,
+        $auth_source,
         $email,
         $status,
         $official_code,

public/main/inc/lib/webservices/Rest.php

@@ -1922,7 +1922,7 @@ class Rest extends WebService
         }
 
         // save modifications
-        UserManager::getManager()->updateUser($user, true);
+        UserManager::getRepository()->updateUser($user, true);
 
         // tell the world we just updated this user
         if (!empty($hook)) {

public/main/inc/lib/webservices/WebService.class.php

@@ -29,7 +29,7 @@ class WebService
     protected function __construct($username, $apiKey)
     {
         /** @var User user */
-        $this->user = UserManager::getManager()->findUserByUsername($username);
+        $this->user = UserManager::getRepository()->findUserByUsername($username);
         $this->apiKey = $apiKey;
     }
 
@@ -54,7 +54,7 @@ class WebService
      */
     public static function findUserApiKey($username, $serviceName)
     {
-        $user = UserManager::getManager()->findUserByUsername($username);
+        $user = UserManager::getRepository()->findUserByUsername($username);
         if ($user) {
             $apiKeys = UserManager::get_api_keys($user->getId(), $serviceName);
 
@@ -86,7 +86,7 @@ class WebService
             return false;
         }
 
-        $user = UserManager::getManager()->findUserByUsername($username);
+        $user = UserManager::getRepository()->findUserByUsername($username);
 
         if (!$user) {
             return false;

public/main/webservices/api/tests/SaveUserJsonTest.php

@@ -43,7 +43,7 @@ class SaveUserJsonTest extends V2TestCase
         $userId = $this->integer([ 'json' => $json ]);
 
         // assert the user was saved and given the returned user id
-        $user = UserManager::getManager()->find($userId);
+        $user = api_get_user_entity($userId);
         $this->assertNotNull($user, 'the returned userId does not point to an user');
 
         // assert each field was filled with provided information

public/main/webservices/api/tests/SaveUserTest.php

@@ -42,7 +42,7 @@ class SaveUserTest extends V2TestCase
         );
 
         // assert the user was saved and given the returned user id
-        $user = UserManager::getManager()->find($userId);
+        $user = api_get_user_entity($userId);
         $this->assertNotNull($user, 'the returned userId does not point to an user');
 
         // assert each field was filled with provided information

public/main/webservices/api/tests/UpdateUserFromUsernameTest.php

@@ -77,7 +77,7 @@ class UpdateUserFromUsernameTest extends V2TestCase
 
         // compare each saved value to the original
         /** @var User $user */
-        $userManager = UserManager::getManager();
+        $userManager = UserManager::getRepository();
         $user = $userManager->find($userId);
         $userManager->reloadUser($user);
         $this->assertSame($newFirstName, $user->getFirstname());

public/plugin/buycourses/src/buycourses.ajax.php

@@ -461,8 +461,7 @@ switch ($action) {
         $nodeName = '';
         if (BuyCoursesPlugin::SERVICE_TYPE_USER == $nodeType) {
             $nodeType = get_lang('User');
-            /** @var User $user */
-            $user = UserManager::getManager()->find($serviceSale['node_id']);
+            $user = api_get_user_entity($serviceSale['node_id']);
             $nodeName = $user ? $user->getCompleteNameWithUsername() : null;
         } else {
             if (BuyCoursesPlugin::SERVICE_TYPE_COURSE == $nodeType) {

public/plugin/buycourses/src/service_process.php

@@ -102,8 +102,7 @@ if ($typeUser) {
     }
     $form->addSelect('info_select', get_lang('User'), $selectOptions);
 } elseif ($typeCourse) {
-    /** @var User $user */
-    $user = UserManager::getRepository()->find($currentUserId);
+    $user = api_get_user_entity($currentUserId);
     $courses = $user->getCourses();
     $checker = false;
     foreach ($courses as $course) {
@@ -121,8 +120,7 @@ if ($typeUser) {
     $form->addSelect('info_select', get_lang('Course'), $selectOptions);
 } elseif ($typeSession) {
     $sessions = [];
-    /** @var User $user */
-    $user = UserManager::getRepository()->find($currentUserId);
+    $user = api_get_user_entity($currentUserId);
     $userSubscriptions = $user->getSessionCourseSubscriptions();
 
     /** @var SessionRelCourseRelUser $userSubscription */

src/CoreBundle/Framework/Container.php

@@ -249,11 +249,6 @@ class Container
         return Database::getManager();
     }
 
-    public static function getUserManager(): UserRepository
-    {
-        return self::$container->get(UserRepository::class);
-    }
-
     public static function getAttendanceRepository(): CAttendanceRepository
     {
         return self::$container->get(CAttendanceRepository::class);
@@ -519,10 +514,8 @@ class Container
         Database::setConnection($container->get('doctrine.dbal.default_connection'));
         $em = $container->get('doctrine.orm.entity_manager');
         Database::setManager($em);
-        CourseManager::setEntityManager($em);
-        CourseManager::setCourseSettingsManager($container->get(SettingsCourseManager::class));
         // Setting course tool chain (in order to create tools to a course)
-        CourseManager::setToolList($container->get(ToolChain::class));
+        //CourseManager::setToolList($container->get(ToolChain::class));
         /*if ($setSession) {
             self::$session = $container->get('session');
         }*/