Internal: Refactor code user use class name when using getRepository()

src/CoreBundle/Controller/CourseController.php

@@ -6,6 +6,7 @@ namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldRelTag;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CourseBundle\Entity\CCourseDescription;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
@@ -52,14 +53,13 @@ class CourseController extends AbstractController
     {
         $courseId = $course->getId();
         $userId = $this->getUser()->getId();
-
         $em = $this->getDoctrine()->getManager();
 
-        $fieldsRepo = $em->getRepository('ChamiloCoreBundle:ExtraField');
-        $fieldTagsRepo = $em->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
+        $fieldsRepo = $em->getRepository(ExtraField::class);
+        $fieldTagsRepo = $em->getRepository(ExtraFieldRelTag::class);
 
         /** @var CCourseDescription $courseDescription */
-        $courseDescriptionTools = $em->getRepository('ChamiloCourseBundle:CCourseDescription')
+        $courseDescriptionTools = $em->getRepository(CCourseDescription::class)
             ->findBy(
                 [
                     'cId' => $course->getId(),

src/CoreBundle/Controller/SessionController.php

@@ -5,6 +5,7 @@
 namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Entity\ExtraField;
+use Chamilo\CoreBundle\Entity\ExtraFieldRelTag;
 use Chamilo\CoreBundle\Entity\SequenceResource;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\SessionRelCourse;
@@ -12,7 +13,6 @@ use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\CoreBundle\Repository\SequenceRepository;
 use Chamilo\CourseBundle\Entity\CCourseDescription;
-use CoursesController;
 use Essence\Essence;
 use ExtraFieldValue;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Entity;
@@ -45,12 +45,12 @@ class SessionController extends AbstractController
 
         $courses = [];
         $sessionCourses = $session->getCourses();
-        $fieldsRepo = $em->getRepository('ChamiloCoreBundle:ExtraField');
-        $fieldTagsRepo = $em->getRepository('ChamiloCoreBundle:ExtraFieldRelTag');
+        $fieldsRepo = $em->getRepository(ExtraField::class);
+        $fieldTagsRepo = $em->getRepository(ExtraFieldRelTag::class);
         $userRepo = \UserManager::getRepository();
 
         /** @var SequenceRepository $sequenceResourceRepo */
-        $sequenceResourceRepo = $em->getRepository('ChamiloCoreBundle:SequenceResource');
+        $sequenceResourceRepo = $em->getRepository(SequenceResource::class);
 
         $tagField = $fieldsRepo->findOneBy([
             'extraFieldType' => ExtraField::COURSE_FIELD_TYPE,

src/CoreBundle/Entity/CourseRelUser.php

@@ -12,8 +12,16 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * CourseRelUser.
  *
  * @ApiResource(
+ *      attributes={"security"="is_granted('ROLE_USER')"},
  *      shortName="CourseSubscription",
- *      normalizationContext={"groups"={"course_rel_user:read", "user:read"}}
+ *      normalizationContext={"groups"={"course_rel_user:read", "user:read"}},
+ *      collectionOperations={
+ *         "get"={"security"="is_granted('ROLE_ADMIN') or object.user == user"},
+ *         "post"={"security"="is_granted('ROLE_ADMIN') or object.user == user"}
+ *     },
+ *      itemOperations={
+ *         "get"={"security"="is_granted('ROLE_ADMIN') or object.user == user"},
+ *     }
  * )
  *
  * @ORM\Table(

src/CoreBundle/Entity/Listener/ResourceListener.php

@@ -6,12 +6,15 @@ namespace Chamilo\CoreBundle\Entity\Listener;
 
 use Chamilo\CoreBundle\Entity\AbstractResource;
 use Chamilo\CoreBundle\Entity\AccessUrl;
+use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceFile;
 use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Entity\ResourceRight;
 use Chamilo\CoreBundle\Entity\ResourceToRootInterface;
+use Chamilo\CoreBundle\Entity\ResourceType;
 use Chamilo\CoreBundle\Entity\ResourceWithUrlInterface;
+use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CoreBundle\ToolChain;
 use Cocur\Slugify\SlugifyInterface;
@@ -126,7 +129,7 @@ class ResourceListener
             $slug = sprintf('%s.%s', $this->slugify->slugify($originalBasename), $originalExtension);
         }*/
 
-        $repo = $em->getRepository('ChamiloCoreBundle:ResourceType');
+        $repo = $em->getRepository(ResourceType::class);
         $class = str_replace('Entity', 'Repository', get_class($event->getEntity()));
         $class .= 'Repository';
         $name = $this->toolChain->getResourceTypeNameFromRepository($class);
@@ -148,7 +151,7 @@ class ResourceListener
         }
 
         if ($resource->hasParentResourceNode()) {
-            $nodeRepo = $em->getRepository('ChamiloCoreBundle:ResourceNode');
+            $nodeRepo = $em->getRepository(ResourceNode::class);
             $parent = $nodeRepo->find($resource->getParentResourceNode());
             $resourceNode->setParent($parent);
         }
@@ -181,8 +184,8 @@ class ResourceListener
         // Use by api platform
         $links = $resource->getResourceLinkListFromEntity();
         if ($links) {
-            $courseRepo = $em->getRepository('ChamiloCoreBundle:Course');
-            $sessionRepo = $em->getRepository('ChamiloCoreBundle:Session');
+            $courseRepo = $em->getRepository(Course::class);
+            $sessionRepo = $em->getRepository(Session::class);
 
             foreach ($links as $link) {
                 $resourceLink = new ResourceLink();

src/CoreBundle/Entity/Listener/SessionListener.php

@@ -40,7 +40,7 @@ class SessionListener
     {
         $em = $args->getEntityManager();
         $id = $this->request->getCurrentRequest()->getSession()->get('access_url_id');
-        $url = $em->getRepository('ChamiloCoreBundle:AccessUrl')->find($id);
+        $url = $em->getRepository(AccessUrl::class)->find($id);
         $session->addUrl($url);
         //$this->checkLimit($repo, $url);
     }

src/CoreBundle/EventListener/CourseListener.php

@@ -5,11 +5,13 @@
 namespace Chamilo\CoreBundle\EventListener;
 
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Security\Authorization\Voter\CourseVoter;
 use Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter;
 use Chamilo\CoreBundle\Security\Authorization\Voter\SessionVoter;
 use Chamilo\CourseBundle\Controller\CourseControllerInterface;
+use Chamilo\CourseBundle\Entity\CGroup;
 use Doctrine\ORM\EntityManager;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -80,7 +82,7 @@ class CourseListener
             if (null === $course) {
                 /** @var EntityManager $em */
                 $em = $container->get('doctrine')->getManager();
-                $course = $em->getRepository('ChamiloCoreBundle:Course')->find($courseId);
+                $course = $em->getRepository(Course::class)->find($courseId);
 
                 //dump("Course loaded from DB $courseId");
                 $courseInfo = api_get_course_info($course->getCode());
@@ -124,7 +126,7 @@ class CourseListener
                 }
             } else {
                 //dump("Load chamilo session from DB");
-                $session = $em->getRepository('ChamiloCoreBundle:Session')->find($sessionId);
+                $session = $em->getRepository(Session::class)->find($sessionId);
                 if ($session) {
                     if (false === $session->hasCourse($course)) {
                         throw new AccessDeniedException($translator->trans('Course is not registered in the Session'));
@@ -155,7 +157,7 @@ class CourseListener
                 $sessionHandler->remove('gid');
             } else {
                 //dump('Load chamilo group from DB');
-                $group = $em->getRepository('CGroup')->find($groupId);
+                $group = $em->getRepository(CGroup::class)->find($groupId);
 
                 if (!$group) {
                     throw new NotFoundHttpException($translator->trans('Group not found'));

src/CoreBundle/EventListener/LocaleListener.php

@@ -6,7 +6,7 @@ namespace Chamilo\CoreBundle\EventListener;
 
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Manager\SettingsManager;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -18,19 +18,20 @@ use Symfony\Component\HttpKernel\KernelEvents;
  */
 class LocaleListener implements EventSubscriberInterface
 {
-    /** @var ContainerInterface */
-    protected $container;
-    private $defaultLocale;
+    protected $settingsManager;
+    protected $defaultLocale;
+    protected $paremeterBag;
 
     /**
      * LocaleListener constructor.
      *
      * @param string $defaultLocale
      */
-    public function __construct($defaultLocale, ContainerInterface $container)
+    public function __construct($defaultLocale, SettingsManager $settingsManager, ParameterBagInterface $paremeterBag)
     {
         $this->defaultLocale = $defaultLocale;
-        $this->container = $container;
+        $this->settingsManager = $settingsManager;
+        $this->paremeterBag = $paremeterBag;
     }
 
     public function onKernelRequest(RequestEvent $event)
@@ -39,9 +40,7 @@ class LocaleListener implements EventSubscriberInterface
         if (!$request->hasPreviousSession()) {
             return;
         }
-
-        $container = $this->container;
-        $installed = $container->get('kernel')->isInstalled();
+        $installed = 1 == $this->paremeterBag->get('installed');
 
         if (!$installed) {
             return;
@@ -65,9 +64,7 @@ class LocaleListener implements EventSubscriberInterface
             $localeList = [];
 
             // 1. Check platform locale
-            /** @var SettingsManager $settings */
-            $settings = $this->container->get('chamilo.settings.manager');
-            $platformLocale = $settings->getSetting('language.platform_language');
+            $platformLocale = $this->settingsManager->getSetting('language.platform_language');
 
             if (!empty($platformLocale)) {
                 $localeList['platform_lang'] = $platformLocale;
@@ -112,7 +109,7 @@ class LocaleListener implements EventSubscriberInterface
 
             $locale = '';
             foreach ($priorityList as $setting) {
-                $priority = $settings->getSetting("language.$setting");
+                $priority = $this->settingsManager->getSetting("language.$setting");
                 if (!empty($priority) && isset($localeList[$priority])) {
                     $locale = $localeList[$priority];
 

src/CoreBundle/Hook/HookManagement.php

@@ -5,7 +5,6 @@
 namespace Chamilo\CoreBundle\Hook;
 
 use Chamilo\CoreBundle\Entity\HookCall;
-use Chamilo\CoreBundle\Hook\Interfaces\HookManagementInterface;
 use Database;
 use Doctrine\ORM\EntityManager;
 
@@ -127,31 +126,29 @@ class HookManagement
      * Update hook observer order by hook event.
      *
      * @param $eventName
-     * @param $type
-     * @param $hookOrders
      *
      * @return int
      */
     //public function orderHook($eventName, $type, $hookOrders)
     //{
-        /*foreach ($this->hookCalls[$eventName] as $observerClassName => $types) {
-            foreach ($hookOrders as $oldOrder => $newOrder) {
-                $res = Database::update(
-                    $this->tables[TABLE_HOOK_CALL],
-                    [
-                        'hook_order ' => $newOrder,
-                    ],
-                    [
-                        'id = ? ' => $types[$type],
-                        'AND hook_order = ? ' => $oldOrder,
-                    ]
-                );
-
-                if ($res) {
-                    break;
-                }
+    /*foreach ($this->hookCalls[$eventName] as $observerClassName => $types) {
+        foreach ($hookOrders as $oldOrder => $newOrder) {
+            $res = Database::update(
+                $this->tables[TABLE_HOOK_CALL],
+                [
+                    'hook_order ' => $newOrder,
+                ],
+                [
+                    'id = ? ' => $types[$type],
+                    'AND hook_order = ? ' => $oldOrder,
+                ]
+            );
+
+            if ($res) {
+                break;
             }
-        }*/
+        }
+    }*/
     //}
 
     /**

src/CoreBundle/Migrations/Schema/V200/Version20170627122900.php

@@ -23,7 +23,7 @@ class Version20170627122900 extends AbstractMigrationChamilo
         }*/
 
         /** @var ExtraField $extraField */
-        $extraField = $em->getRepository('ChamiloCoreBundle:ExtraField')
+        $extraField = $em->getRepository(ExtraField::class)
             ->findOneBy([
                 'variable' => 'is_mandatory',
                 'extraFieldType' => ExtraField::SURVEY_FIELD_TYPE,

src/CoreBundle/Repository/ResourceRepository.php

@@ -309,7 +309,7 @@ class ResourceRepository extends EntityRepository
     public function getResourceType()
     {
         $name = $this->getResourceTypeName();
-        $repo = $this->getEntityManager()->getRepository('ChamiloCoreBundle:ResourceType');
+        $repo = $this->getEntityManager()->getRepository(ResourceType::class);
         $this->resourceType = $repo->findOneBy(['name' => $name]);
 
         return $this->resourceType;
@@ -702,6 +702,25 @@ class ResourceRepository extends EntityRepository
         return false;
     }
 
+    public function setResourceTitle(AbstractResource $resource, $title)
+    {
+        $resource->setTitle($title);
+        $resourceNode = $resource->getResourceNode();
+        $resourceNode->setTitle($title);
+        if ($resourceNode->hasResourceFile()) {
+            //$resourceFile = $resourceNode->getResourceFile();
+            //$resourceFile->setName($title);
+
+            /*$fileName = $this->getResourceNodeRepository()->getFilename($resourceFile);
+            error_log('$fileName');
+            error_log($fileName);
+            error_log($title);
+            $this->getResourceNodeRepository()->getFileSystem()->rename($fileName, $title);
+            $resourceFile->setName($title);
+            $resourceFile->setOriginalName($title);*/
+        }
+    }
+
     /**
      * Change all links visibility to DELETED.
      */
@@ -725,25 +744,6 @@ class ResourceRepository extends EntityRepository
         $this->setLinkVisibility($resource, ResourceLink::VISIBILITY_PENDING);
     }
 
-    public function setResourceTitle(AbstractResource $resource, $title)
-    {
-        $resource->setTitle($title);
-        $resourceNode = $resource->getResourceNode();
-        $resourceNode->setTitle($title);
-        if ($resourceNode->hasResourceFile()) {
-            //$resourceFile = $resourceNode->getResourceFile();
-            //$resourceFile->setName($title);
-
-            /*$fileName = $this->getResourceNodeRepository()->getFilename($resourceFile);
-            error_log('$fileName');
-            error_log($fileName);
-            error_log($title);
-            $this->getResourceNodeRepository()->getFileSystem()->rename($fileName, $title);
-            $resourceFile->setName($title);
-            $resourceFile->setOriginalName($title);*/
-        }
-    }
-
     public function createNodeForResource(ResourceInterface $resource, User $creator, ResourceNode $parentNode = null, UploadedFile $file = null): ResourceNode
     {
         $em = $this->getEntityManager();

src/CoreBundle/Repository/SequenceRepository.php

@@ -4,8 +4,10 @@
 
 namespace Chamilo\CoreBundle\Repository;
 
+use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Sequence;
 use Chamilo\CoreBundle\Entity\SequenceResource;
+use Chamilo\CoreBundle\Entity\Session;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\Query\Expr\Join;
@@ -63,11 +65,11 @@ class SequenceRepository extends ServiceEntityRepository
         $resource = null;
         switch ($type) {
             case SequenceResource::COURSE_TYPE:
-                $repo = $this->getEntityManager()->getRepository('ChamiloCoreBundle:Course');
+                $repo = $this->getEntityManager()->getRepository(Course::class);
 
                 break;
             case SequenceResource::SESSION_TYPE:
-                $repo = $this->getEntityManager()->getRepository('ChamiloCoreBundle:Session');
+                $repo = $this->getEntityManager()->getRepository(Session::class);
 
                 break;
         }

src/CoreBundle/Repository/SequenceResourceRepository.php

@@ -5,7 +5,10 @@
 namespace Chamilo\CoreBundle\Repository;
 
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\GradebookCategory;
 use Chamilo\CoreBundle\Entity\SequenceResource;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Entity\SessionRelUser;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Fhaculty\Graph\Set\Vertices;
@@ -142,12 +145,12 @@ class SequenceResourceRepository extends ServiceEntityRepository
                 $resource = null;
                 switch ($type) {
                     case SequenceResource::SESSION_TYPE:
-                        $repo = $em->getRepository('ChamiloCoreBundle:Session');
+                        $repo = $em->getRepository(Session::class);
                         $resource = $repo->find($vertexId);
 
                         break;
                     case SequenceResource::COURSE_TYPE:
-                        $repo = $em->getRepository('ChamiloCoreBundle:Course');
+                        $repo = $em->getRepository(Course::class);
                         $resource = $repo->find($vertexId);
 
                         break;
@@ -221,12 +224,12 @@ class SequenceResourceRepository extends ServiceEntityRepository
     {
         $sequenceList = [];
         $em = $this->getEntityManager();
-        $gradebookCategoryRepo = $em->getRepository('ChamiloCoreBundle:GradebookCategory');
+        $gradebookCategoryRepo = $em->getRepository(GradebookCategory::class);
 
         $sessionUserList = [];
         if (SequenceResource::COURSE_TYPE == $type) {
             $criteria = ['user' => $userId];
-            $sessions = $em->getRepository('ChamiloCoreBundle:SessionRelUser')->findBy($criteria);
+            $sessions = $em->getRepository(SessionRelUser::class)->findBy($criteria);
             if ($sessions) {
                 foreach ($sessions as $sessionRelUser) {
                     $sessionUserList[] = $sessionRelUser->getSession()->getId();
@@ -318,7 +321,7 @@ class SequenceResourceRepository extends ServiceEntityRepository
         $em = $this->getEntityManager();
         $sessionId = (int) $sessionId;
 
-        $gradebookCategoryRepo = $em->getRepository('ChamiloCoreBundle:GradebookCategory');
+        $gradebookCategoryRepo = $em->getRepository(GradebookCategory::class);
         $gradebooks = $gradebookCategoryRepo->findBy(
             [
                 'courseCode' => $course->getCode(),
@@ -399,11 +402,11 @@ class SequenceResourceRepository extends ServiceEntityRepository
             $vertexId = $supVertex->getId();
             switch ($type) {
                 case SequenceResource::SESSION_TYPE:
-                    $resource = $em->getRepository('ChamiloCoreBundle:Session')->find($vertexId);
+                    $resource = $em->getRepository(Session::class)->find($vertexId);
 
                     break;
                 case SequenceResource::COURSE_TYPE:
-                    $resource = $em->getRepository('ChamiloCoreBundle:Course')->find($vertexId);
+                    $resource = $em->getRepository(Course::class)->find($vertexId);
 
                     break;
             }

src/CoreBundle/Repository/UserRepository.php

@@ -17,6 +17,7 @@ use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUserComment;
 use Chamilo\CoreBundle\Entity\Ticket;
+use Chamilo\CoreBundle\Entity\TicketMessage;
 use Chamilo\CoreBundle\Entity\TrackEAccess;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackECourseAccess;
@@ -736,7 +737,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:GradebookCertificate')->findBy($criteria);
+        $result = $em->getRepository(GradebookCertificate::class)->findBy($criteria);
         $gradebookCertificate = [];
         /** @var GradebookCertificate $item */
         foreach ($result as $item) {
@@ -753,7 +754,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'exeUserId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:TrackEExercises')->findBy($criteria);
+        $result = $em->getRepository(TrackEExercises::class)->findBy($criteria);
         $trackEExercises = [];
         /** @var TrackEExercises $item */
         foreach ($result as $item) {
@@ -772,7 +773,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:TrackEAttempt')->findBy($criteria);
+        $result = $em->getRepository(TrackEAttempt::class)->findBy($criteria);
         $trackEAttempt = [];
         /** @var TrackEAttempt $item */
         foreach ($result as $item) {
@@ -793,7 +794,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:TrackECourseAccess')->findBy($criteria);
+        $result = $em->getRepository(TrackECourseAccess::class)->findBy($criteria);
         $trackECourseAccessList = [];
         /** @var TrackECourseAccess $item */
         foreach ($result as $item) {
@@ -959,7 +960,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:UserCourseCategory')->findBy($criteria);
+        $result = $em->getRepository(UserCourseCategory::class)->findBy($criteria);
         $userCourseCategory = [];
         /** @var UserCourseCategory $item */
         foreach ($result as $item) {
@@ -973,7 +974,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'posterId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CForumPost')->findBy($criteria);
+        $result = $em->getRepository(CForumPost::class)->findBy($criteria);
         $cForumPostList = [];
         /** @var CForumPost $item */
         foreach ($result as $item) {
@@ -989,7 +990,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'threadPosterId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CForumThread')->findBy($criteria);
+        $result = $em->getRepository(CForumThread::class)->findBy($criteria);
         $cForumThreadList = [];
         /** @var CForumThread $item */
         foreach ($result as $item) {
@@ -1020,13 +1021,13 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'user' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CGroupRelUser')->findBy($criteria);
+        $result = $em->getRepository(CGroupRelUser::class)->findBy($criteria);
         $cGroupRelUser = [];
         /** @var CGroupRelUser $item */
         foreach ($result as $item) {
             $list = [
                 'Course # '.$item->getCId(),
-                'Group #'.$item->getGroup()->getId(),
+                'Group #'.$item->getGroup()->getIid(),
                 'Role: '.$item->getStatus(),
             ];
             $cGroupRelUser[] = implode(', ', $list);
@@ -1036,7 +1037,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CAttendanceSheet')->findBy($criteria);
+        $result = $em->getRepository(CAttendanceSheet::class)->findBy($criteria);
         $cAttendanceSheetList = [];
         /** @var CAttendanceSheet $item */
         foreach ($result as $item) {
@@ -1051,7 +1052,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'authorId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CBlogPost')->findBy($criteria);
+        $result = $em->getRepository(CBlogPost::class)->findBy($criteria);
         $cBlog = [];
         /** @var CBlogPost $item */
         foreach ($result as $item) {
@@ -1067,7 +1068,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CAttendanceResult')->findBy($criteria);
+        $result = $em->getRepository(CAttendanceResult::class)->findBy($criteria);
         $cAttendanceResult = [];
         /** @var CAttendanceResult $item */
         foreach ($result as $item) {
@@ -1082,7 +1083,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userSender' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:Message')->findBy($criteria);
+        $result = $em->getRepository(Message::class)->findBy($criteria);
         $messageList = [];
         /** @var Message $item */
         foreach ($result as $item) {
@@ -1104,7 +1105,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'user' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CSurveyAnswer')->findBy($criteria);
+        $result = $em->getRepository(CSurveyAnswer::class)->findBy($criteria);
         $cSurveyAnswer = [];
         /** @var CSurveyAnswer $item */
         foreach ($result as $item) {
@@ -1119,7 +1120,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'uploaderId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CDropboxFile')->findBy($criteria);
+        $result = $em->getRepository(CDropboxFile::class)->findBy($criteria);
         $cDropboxFile = [];
         /** @var CDropboxFile $item */
         foreach ($result as $item) {
@@ -1136,7 +1137,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CDropboxPerson')->findBy($criteria);
+        $result = $em->getRepository(CDropboxPerson::class)->findBy($criteria);
         $cDropboxPerson = [];
         /** @var CDropboxPerson $item */
         foreach ($result as $item) {
@@ -1151,7 +1152,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'authorUserId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CDropboxFeedback')->findBy($criteria);
+        $result = $em->getRepository(CDropboxFeedback::class)->findBy($criteria);
         $cDropboxFeedback = [];
         /** @var CDropboxFeedback $item */
         foreach ($result as $item) {
@@ -1168,7 +1169,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CNotebook')->findBy($criteria);
+        $result = $em->getRepository(CNotebook::class)->findBy($criteria);
         $cNotebook = [];
         /** @var CNotebook $item */
         foreach ($result as $item) {
@@ -1184,7 +1185,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CLpView')->findBy($criteria);
+        $result = $em->getRepository(CLpView::class)->findBy($criteria);
         $cLpView = [];
         /** @var CLpView $item */
         foreach ($result as $item) {
@@ -1202,7 +1203,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CStudentPublication')->findBy($criteria);
+        $result = $em->getRepository(CStudentPublication::class)->findBy($criteria);
         $cStudentPublication = [];
         /** @var CStudentPublication $item */
         foreach ($result as $item) {
@@ -1217,7 +1218,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CStudentPublicationComment')->findBy($criteria);
+        $result = $em->getRepository(CStudentPublicationComment::class)->findBy($criteria);
         $cStudentPublicationComment = [];
         /** @var CStudentPublicationComment $item */
         foreach ($result as $item) {
@@ -1235,7 +1236,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCourseBundle:CWiki')->findBy($criteria);
+        $result = $em->getRepository(CWiki::class)->findBy($criteria);
         $cWiki = [];
         /** @var CWiki $item */
         foreach ($result as $item) {
@@ -1251,7 +1252,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'insertUserId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:Ticket')->findBy($criteria);
+        $result = $em->getRepository(Ticket::class)->findBy($criteria);
         $ticket = [];
         /** @var Ticket $item */
         foreach ($result as $item) {
@@ -1266,7 +1267,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'insertUserId' => $userId,
         ];
-        $result = $em->getRepository('TicketMessage')->findBy($criteria);
+        $result = $em->getRepository(TicketMessage::class)->findBy($criteria);
         $ticketMessage = [];
         /** @var \Chamilo\CoreBundle\Entity\TicketMessage $item */
         foreach ($result as $item) {
@@ -1284,7 +1285,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'feedbackGiver' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:SkillRelUserComment')->findBy($criteria);
+        $result = $em->getRepository(SkillRelUserComment::class)->findBy($criteria);
         $skillRelUserComment = [];
         /** @var SkillRelUserComment $item */
         foreach ($result as $item) {
@@ -1301,7 +1302,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
         $criteria = [
             'userId' => $userId,
         ];
-        $result = $em->getRepository('ChamiloCoreBundle:UserRelCourseVote')->findBy($criteria);
+        $result = $em->getRepository(UserRelCourseVote::class)->findBy($criteria);
         $userRelCourseVote = [];
         /** @var UserRelCourseVote $item */
         foreach ($result as $item) {
@@ -1474,7 +1475,7 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
      */
     public function getLastLogin(User $user)
     {
-        $repo = $this->getEntityManager()->getRepository('ChamiloCoreBundle:TrackELogin');
+        $repo = $this->getEntityManager()->getRepository(TrackELogin::class);
         $qb = $repo->createQueryBuilder('l');
 
         return $qb

src/CoreBundle/Resources/config/services.yml

@@ -151,7 +151,7 @@ services:
     # Locale listener
     chamilo_core.listener.locale:
         class: Chamilo\CoreBundle\EventListener\LocaleListener
-        arguments: ['%kernel.default_locale%', '@service_container']
+        arguments: ['%kernel.default_locale%', '@chamilo.settings.manager', '@parameter_bag']
         tags:
             - {name: kernel.event_subscriber, priority: 15}
 

src/CourseBundle/Manager/SettingsManager.php

@@ -98,7 +98,7 @@ class SettingsManager extends ChamiloSettingsManager
             }
         }
 
-        $repo = $this->manager->getRepository('ChamiloCoreBundle:SettingsCurrent');
+        $repo = $this->manager->getRepository(SettingsCurrent::class);
         $persistedParameters = $repo->findBy(['category' => $settings->getSchemaAlias()]);
 
         $persistedParametersMap = [];
@@ -203,7 +203,7 @@ class SettingsManager extends ChamiloSettingsManager
      */
     private function getParameters($namespace)
     {
-        $repo = $this->manager->getRepository('ChamiloCourseBundle:CCourseSetting');
+        $repo = $this->manager->getRepository(CCourseSetting::class);
         $parameters = [];
         foreach ($repo->findBy(['category' => $namespace]) as $parameter) {
             $parameters[$parameter->getTitle()] = $parameter->getValue();