Minor - Format code + phpstan fixes

src/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -6,6 +6,9 @@ namespace Chamilo\CoreBundle\Component\Editor\CkEditor;
 
 use Chamilo\CoreBundle\Component\Editor\Editor;
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
+use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\SystemTemplate;
+use Chamilo\CoreBundle\Entity\Templates;
 
 /**
  * Class CkEditor.
@@ -89,7 +92,6 @@ class CkEditor extends Editor
         if (empty($templates)) {
             return null;
         }
-        /** @var \Chamilo\CoreBundle\Entity\SystemTemplate $template */
         $templateList = [];
         $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
         $search = ['{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}', '{CSS}'];
@@ -101,6 +103,7 @@ class CkEditor extends Editor
             '',
         ];
 
+        /** @var SystemTemplate $template */
         foreach ($templates as $template) {
             $image = $template->getImage();
             $image = !empty($image) ? $image : 'empty.gif';
@@ -127,7 +130,7 @@ class CkEditor extends Editor
     /**
      * Get the templates in JSON format.
      *
-     * @return string|
+     * @return string|false
      */
     public function simpleFormatTemplates()
     {
@@ -178,7 +181,7 @@ class CkEditor extends Editor
     private function getPlatformTemplates(): array
     {
         $entityManager = \Database::getManager();
-        $systemTemplates = $entityManager->getRepository('ChamiloCoreBundle:SystemTemplate')->findAll();
+        $systemTemplates = $entityManager->getRepository(SystemTemplate::class)->findAll();
         $cssTheme = api_get_path(WEB_CSS_PATH).'themes/'.api_get_visual_theme().'/';
         $search = ['{CSS_THEME}', '{IMG_DIR}', '{REL_PATH}', '{COURSE_DIR}', '{CSS}'];
         $replace = [
@@ -221,9 +224,9 @@ class CkEditor extends Editor
         }
 
         $entityManager = \Database::getManager();
-        $templatesRepo = $entityManager->getRepository('ChamiloCoreBundle:Templates');
+        $templatesRepo = $entityManager->getRepository(Templates::class);
         $user = api_get_user_entity($userId);
-        $course = $entityManager->find('ChamiloCoreBundle:Course', api_get_course_int_id());
+        $course = $entityManager->find(Course::class, api_get_course_int_id());
 
         if (!$user || !$course) {
             return [];

src/CoreBundle/Controller/ResourceController.php

@@ -5,6 +5,7 @@
 namespace Chamilo\CoreBundle\Controller;
 
 use Chamilo\CoreBundle\Entity\AbstractResource;
+use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceLink;
 use Chamilo\CoreBundle\Entity\ResourceNode;
 use Chamilo\CoreBundle\Form\Type\ResourceCommentType;
@@ -102,7 +103,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
         $this->setBreadCrumb($request, $parentResourceNode);*/
 
         //return $grid->getGridResponse(
-        return $this->render(
+        /*return $this->render(
             $repository->getTemplates()->getFromAction(__FUNCTION__),
             [
                 'parent_id' => $resourceNodeId,
@@ -112,7 +113,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
                 'parent_resource_node' => $parentResourceNode,
                 'resource_settings' => $settings,
             ]
-        );
+        );*/
     }
 
     /**
@@ -800,7 +801,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
         if ($form->isSubmitted() && $form->isValid()) {
             $em = $this->getDoctrine()->getManager();
             $course = $this->getCourse()->getId();
-            $course = $this->getDoctrine()->getRepository('ChamiloCoreBundle:Course')->find($course);
+            $course = $this->getDoctrine()->getRepository(Course::class)->find($course);
             $session = $this->getSession();
 
             /** @var AbstractResource $newResource */

src/CoreBundle/Controller/ResourceUploadController.php

@@ -4,7 +4,10 @@
 
 namespace Chamilo\CoreBundle\Controller;
 
+use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\ResourceNode;
+use Chamilo\CoreBundle\Entity\Session;
+use Chamilo\CoreBundle\Repository\ResourceFactory;
 use Chamilo\CoreBundle\Repository\ResourceRepository;
 use Oneup\UploaderBundle\Controller\BlueimpController;
 use Oneup\UploaderBundle\Uploader\File\FileInterface;
@@ -39,19 +42,19 @@ class ResourceUploadController extends BlueimpController
 
         $course = null;
         if (!empty($courseId)) {
-            $course = $doctrine->getRepository('ChamiloCoreBundle:Course')->find($courseId);
+            $course = $doctrine->getRepository(Course::class)->find($courseId);
         }
 
         $session = null;
         if (!empty($sessionId)) {
-            $session = $doctrine->getRepository('ChamiloCoreBundle:Session')->find($sessionId);
+            $session = $doctrine->getRepository(Session::class)->find($sessionId);
         }
 
         $token = $container->get('security.token_storage')->getToken();
         $user = $token->getUser();
 
         // Create repository from tool and type.
-        $factory = $container->get('Chamilo\CoreBundle\Repository\ResourceFactory');
+        $factory = $container->get(ResourceFactory::class);
         $repoService = $factory->getRepositoryService($tool, $type);
 
         /** @var ResourceRepository $repo */

src/CoreBundle/Controller/SessionController.php

@@ -40,12 +40,10 @@ class SessionController extends AbstractController
     public function aboutAction(Request $request, Session $session, IllustrationRepository $illustrationRepo, UserRepository $userRepo): Response
     {
         $requestSession = $request->getSession();
-
         $htmlHeadXtra[] = api_get_asset('readmore-js/readmore.js');
         $em = $this->getDoctrine()->getManager();
 
         $sessionId = $session->getId();
-
         $courses = [];
         $sessionCourses = $session->getCourses();
 
@@ -57,6 +55,7 @@ class SessionController extends AbstractController
         /** @var SequenceRepository $sequenceResourceRepo */
         $sequenceResourceRepo = $em->getRepository(SequenceResource::class);
 
+        /** @var ExtraField $tagField */
         $tagField = $fieldsRepo->findOneBy([
             'extraFieldType' => ExtraField::COURSE_FIELD_TYPE,
             'variable' => 'tags',

src/CoreBundle/Entity/Listener/CourseListener.php

@@ -59,7 +59,6 @@ class CourseListener
     public function postPersist(Course $course, LifecycleEventArgs $args)
     {
         error_log('Course listener postPersist');
-        /** @var AccessUrlRelCourse $urlRelCourse */
         if ($course) {
             error_log('add tools');
             //$this->toolChain->addToolsInCourse($this->toolRepository, $course);

src/CoreBundle/Entity/Listener/ResourceListener.php

@@ -29,6 +29,8 @@ use Symfony\Component\Security\Core\Security;
 class ResourceListener
 {
     protected $slugify;
+    protected $security;
+    protected $toolChain;
     protected $request;
     protected $accessUrl;
 
@@ -62,7 +64,7 @@ class ResourceListener
             }
 
             $id = $sessionRequest->get('access_url_id');
-            $url = $em->getRepository('ChamiloCoreBundle:AccessUrl')->find($id);
+            $url = $em->getRepository(AccessUrl::class)->find($id);
 
             if ($url) {
                 $this->accessUrl = $url;

src/CoreBundle/Entity/Listener/ResourceNodeListener.php

@@ -16,6 +16,8 @@ use Symfony\Component\Security\Core\Security;
 class ResourceNodeListener
 {
     protected $slugify;
+    protected $security;
+    protected $toolChain;
     protected $request;
     protected $accessUrl;
     protected $resourceNodeRepository;

src/CoreBundle/Entity/Listener/SessionListener.php

@@ -18,10 +18,8 @@ use Symfony\Component\Security\Core\Security;
 class SessionListener
 {
     protected $request;
+    protected $security;
 
-    /**
-     * ResourceListener constructor.
-     */
     public function __construct(RequestStack $request, Security $security)
     {
         $this->security = $security;

src/CoreBundle/EventListener/CourseListener.php

@@ -224,8 +224,6 @@ class CourseListener
 
         $request = $event->getRequest();
         $sessionHandler = $request->getSession();
-
-        /** @var ContainerInterface $container */
         //$container = $this->container;
 
         /*if ($course) {
@@ -310,9 +308,9 @@ class CourseListener
         $sessionHandler->remove('origin');
 
         // Remove user temp roles
-        /** @var User $user */
         $token = $this->container->get('security.token_storage')->getToken();
         if (null !== $token) {
+            /** @var User $user */
             $user = $token->getUser();
             if ($user instanceof UserInterface) {
                 $user->removeRole('ROLE_CURRENT_COURSE_GROUP_TEACHER');

src/CoreBundle/EventListener/TwigListener.php

@@ -4,6 +4,7 @@
 
 namespace Chamilo\CoreBundle\EventListener;
 
+use Chamilo\CoreBundle\Entity\User;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -13,6 +14,7 @@ use Twig\Environment;
 
 class TwigListener
 {
+    private $serializer;
     private $twig;
     private $tokenStorage;
 
@@ -35,6 +37,7 @@ class TwigListener
         if (null !== $token) {
             $user = $token->getUser();
             if ($user instanceof UserInterface) {
+                /** @var User $userClone */
                 $userClone = clone $user;
                 $userClone->setPassword('');
                 $data = $this->serializer->serialize($userClone, JsonEncoder::FORMAT);

src/CoreBundle/EventSubscriber/UserLocaleSubscriber.php

@@ -4,6 +4,7 @@
 
 namespace Chamilo\CoreBundle\EventSubscriber;
 
+use Chamilo\CoreBundle\Entity\User;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
@@ -30,6 +31,7 @@ class UserLocaleSubscriber implements EventSubscriberInterface
      */
     public function onInteractiveLogin(InteractiveLoginEvent $event)
     {
+        /** @var User $user */
         $user = $event->getAuthenticationToken()->getUser();
 
         if (null !== $user->getLocale()) {

src/CoreBundle/Repository/AssetRepository.php

@@ -92,7 +92,7 @@ class AssetRepository extends ServiceEntityRepository
         return '/assets'.$helper->asset($asset);
     }
 
-    public function getFileContent(Asset $asset): string
+    /*public function getFileContent(Asset $asset): string
     {
         try {
             if ($asset->hasFile()) {
@@ -106,9 +106,9 @@ class AssetRepository extends ServiceEntityRepository
         } catch (\Throwable $exception) {
             throw new FileNotFoundException($asset);
         }
-    }
+    }*/
 
-    public function getFileStream(Asset $asset)
+    /*public function getFileStream(Asset $asset)
     {
         try {
             if ($asset->hasFile()) {
@@ -122,7 +122,7 @@ class AssetRepository extends ServiceEntityRepository
         } catch (\Throwable $exception) {
             throw new FileNotFoundException($asset);
         }
-    }
+    }*/
 
     public function delete(Asset $asset = null)
     {

src/CoreBundle/Repository/Node/UserRepository.php

@@ -108,13 +108,13 @@ class UserRepository extends ResourceRepository implements UserLoaderInterface,
             : mb_convert_case($string, MB_CASE_LOWER);
     }
 
-    public function updateCanonicalFields(UserInterface $user)
+    public function updateCanonicalFields(User $user)
     {
         $user->setUsernameCanonical($this->canonicalize($user->getUsername()));
         $user->setEmailCanonical($this->canonicalize($user->getEmail()));
     }
 
-    public function updatePassword(UserInterface $user)
+    public function updatePassword(User $user)
     {
         //UserPasswordEncoderInterface $passwordEncoder
         if (0 !== strlen($password = $user->getPlainPassword())) {

src/CoreBundle/Repository/ResourceRepository.php

@@ -18,6 +18,7 @@ use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\User;
 use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CoreBundle\ToolChain;
+use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Entity\CGroup;
 use Cocur\Slugify\SlugifyInterface;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
@@ -978,4 +979,9 @@ abstract class ResourceRepository extends ServiceEntityRepository
 
         return true;
     }
+
+    public function saveUpload(UploadedFile $file)
+    {
+        throw new \Exception('Implement saveUpload');
+    }
 }

src/CoreBundle/Repository/SequenceRepository.php

@@ -18,9 +18,6 @@ use Doctrine\Persistence\ManagerRegistry;
  */
 class SequenceRepository extends ServiceEntityRepository
 {
-    /**
-     * CourseCategoryRepository constructor.
-     */
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Sequence::class);
@@ -63,6 +60,7 @@ class SequenceRepository extends ServiceEntityRepository
     public function getItem($itemId, $type)
     {
         $resource = null;
+        $repo = null;
         switch ($type) {
             case SequenceResource::COURSE_TYPE:
                 $repo = $this->getEntityManager()->getRepository(Course::class);

src/CoreBundle/Repository/SessionRepository.php

@@ -13,21 +13,15 @@ use Doctrine\Persistence\ManagerRegistry;
 /**
  * SessionRepository.
  *
- * @author  Julio Montoya <gugli100@gmail.com>
+ * @author Julio Montoya <gugli100@gmail.com>
  */
 class SessionRepository extends ServiceEntityRepository
 {
-    /**
-     * SessionRepository constructor.
-     */
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Session::class);
     }
 
-    /**
-     * @param $status
-     */
     protected function addUserInCourse(
         int $status,
         User $user,

src/CoreBundle/Security/AccessDeniedHandler.php

@@ -13,6 +13,6 @@ class AccessDeniedHandler implements AccessDeniedHandlerInterface
 {
     public function handle(Request $request, AccessDeniedException $accessDeniedException)
     {
-        //return new Response('$content', 403);
+        return new Response('403', 403);
     }
 }

src/CoreBundle/Settings/AbstractSettingsSchema.php

@@ -4,6 +4,7 @@
 
 namespace Chamilo\CoreBundle\Settings;
 
+use Doctrine\ORM\EntityRepository;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface;
 
@@ -12,6 +13,11 @@ use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface;
  */
 abstract class AbstractSettingsSchema implements SchemaInterface
 {
+    /**
+     * @var EntityRepository
+     */
+    protected $repository;
+
     /**
      * @param array                   $allowedTypes
      * @param AbstractSettingsBuilder $builder

src/CoreBundle/Settings/SettingsManager.php

@@ -58,11 +58,6 @@ class SettingsManager implements SettingsManagerInterface
     protected $schemaList;
     protected $request;
 
-    /**
-     * SettingsManager constructor.
-     *
-     * @param $eventDispatcher
-     */
     public function __construct(
         ServiceRegistryInterface $schemaRegistry,
         EntityManager $manager,
@@ -97,7 +92,6 @@ class SettingsManager implements SettingsManagerInterface
         $schemas = array_keys($this->getSchemas());
 
         /**
-         * @var string
          * @var SchemaInterface $schema
          */
         foreach ($schemas as $schema) {
@@ -245,16 +239,16 @@ class SettingsManager implements SettingsManagerInterface
 
     public function load($schemaAlias, $namespace = null, $ignoreUnknown = true)
     {
+        $settings = new Settings();
         $schemaAliasNoPrefix = $schemaAlias;
         $schemaAlias = 'chamilo_core.settings.'.$schemaAlias;
         if ($this->schemaRegistry->has($schemaAlias)) {
             /** @var SchemaInterface $schema */
             $schema = $this->schemaRegistry->get($schemaAlias);
         } else {
-            return [];
+            return $settings;
         }
 
-        $settings = new Settings();
         $settings->setSchemaAlias($schemaAlias);
 
         // We need to get a plain parameters array since we use the options resolver on it

src/CoreBundle/ToolChain.php

@@ -173,6 +173,7 @@ class ToolChain
         $toolList = array_flip($toolList);
 
         // @todo handle plugin
+        $toolRepo = $manager->getRepository(Tool::class);
 
         /** @var AbstractTool $tool */
         foreach ($tools as $tool) {
@@ -181,7 +182,8 @@ class ToolChain
             if (!isset($toolList[$tool->getName()])) {
                 continue;
             }
-            $toolEntity = $manager->getRepository('ChamiloCoreBundle:Tool')->findOneBy($criteria);
+            /** @var CTool $toolEntity */
+            $toolEntity = $toolRepo->findOneBy($criteria);
             $position = $toolList[$tool->getName()] + 1;
 
             $courseTool = new CTool();

src/CoreBundle/Traits/ResourceControllerTrait.php

@@ -93,7 +93,6 @@ trait ResourceControllerTrait
                 $parentResourceNode = $this->getCourse()->getResourceNode();
             } else {
                 if ($this->container->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_REMEMBERED')) {
-                    /** @var User $user */
                     $parentResourceNode = $this->getUser()->getResourceNode();
                 }
             }
@@ -109,7 +108,7 @@ trait ResourceControllerTrait
         return $parentResourceNode;
     }
 
-    protected function getUser()
+    protected function getUser(): ?User
     {
         if (!$this->container->has('security.token_storage')) {
             throw new \LogicException('The SecurityBundle is not registered in your application. Try running "composer require symfony/security-bundle".');

src/CoreBundle/Twig/SettingsExtension.php

@@ -56,9 +56,6 @@ class SettingsExtension extends AbstractExtension
         return $this->helper->getSettings($namespace);
     }
 
-    /**
-     * @param $name
-     */
     public function getSettingsParameter($name)
     {
         return $this->helper->getSettingsParameter($name);

src/CourseBundle/Manager/SettingsManager.php

@@ -38,16 +38,16 @@ class SettingsManager extends ChamiloSettingsManager
 
     public function load($schemaAlias, $namespace = null, $ignoreUnknown = true)
     {
+        $settings = new Settings();
         $schemaAliasNoPrefix = $schemaAlias;
         $schemaAlias = 'chamilo_course.settings.'.$schemaAlias;
         if ($this->schemaRegistry->has($schemaAlias)) {
             /** @var SchemaInterface $schema */
             $schema = $this->schemaRegistry->get($schemaAlias);
         } else {
-            return [];
+            return $settings;
         }
 
-        $settings = new Settings();
         $settings->setSchemaAlias($schemaAlias);
 
         // We need to get a plain parameters array since we use the options resolver on it
@@ -107,9 +107,7 @@ class SettingsManager extends ChamiloSettingsManager
             $persistedParametersMap[$parameter->getTitle()] = $parameter;
         }
 
-        /** @var SettingsCurrent $url */
         $simpleCategoryName = str_replace('chamilo_course.settings.', '', $namespace);
-
         foreach ($parameters as $name => $value) {
             if (isset($persistedParametersMap[$name])) {
                 $persistedParametersMap[$name]->setValue($value);
@@ -128,9 +126,9 @@ class SettingsManager extends ChamiloSettingsManager
 
         $this->manager->flush();
 
-        return;
+        return true;
 
-        $schema = $this->schemaRegistry->getSchema($namespace);
+        /*$schema = $this->schemaRegistry->getSchema($namespace);
 
         $settingsBuilder = new SettingsBuilder();
         $schema->buildSettings($settingsBuilder);
@@ -161,7 +159,7 @@ class SettingsManager extends ChamiloSettingsManager
             if (isset($persistedParametersMap[$name])) {
                 $persistedParametersMap[$name]->setValue($value);
             } else {
-                /** @var CCourseSetting $parameter */
+                // @var CCourseSetting $parameter
                 //$parameter = $this->parameterFactory->createNew();
                 $parameter = new CCourseSetting();
                 $parameter
@@ -171,7 +169,7 @@ class SettingsManager extends ChamiloSettingsManager
                     ->setCId($this->getCourse()->getId())
                 ;
 
-                /** @var ConstraintViolationListInterface $errors */
+                /// @var ConstraintViolationListInterface $errors
                 $errors = $this->validator->validate($parameter);
                 if (0 < $errors->count()) {
                     throw new ValidatorException($errors->get(0)->getMessage());
@@ -182,7 +180,7 @@ class SettingsManager extends ChamiloSettingsManager
         }
 
         $this->parameterManager->flush();
-        $this->cache->save($namespace, $parameters);
+        $this->cache->save($namespace, $parameters);*/
     }
 
     /**

src/CourseBundle/Repository/CCourseDescriptionRepository.php

@@ -53,7 +53,6 @@ final class CCourseDescriptionRepository extends ResourceRepository implements G
 
     public function setResourceProperties(FormInterface $form, $course, $session, $fileType)
     {
-        /** @var CCourseDescription $newResource */
         return $form->getData();
 
         /*$newResource

src/CourseBundle/Repository/CDocumentRepository.php

@@ -105,10 +105,7 @@ final class CDocumentRepository extends ResourceRepository implements GridInterf
         return $this->getRouter()->generate('chamilo_core_resource_view', $params);
     }
 
-    /**
-     * @return CDocument|null
-     */
-    public function getParent(CDocument $document)
+    public function getParent(CDocument $document): ?CDocument
     {
         $resourceParent = $document->getResourceNode()->getParent();
 

src/CourseBundle/Repository/CLinkCategoryRepository.php

@@ -49,7 +49,7 @@ final class CLinkCategoryRepository extends ResourceRepository implements GridIn
         $newResource = $form->getData();
         $newResource
             ->setDisplayOrder(0)
-            ->setOnHomepage(0)
+            ->setOnHomepage('0')
         ;
 
         return $newResource;

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( $course, $session, $group, $parentNode);
+        return $this->getResourcesByCourse($course, $session, $group, $parentNode);
     }
 }