Internal: Remove unused code, fix psalm errors

public/main/lp/learnpath.class.php

@@ -4347,7 +4347,6 @@ class learnpath
     /**
      * Publishes a learnpath. This basically means show or hide the learnpath
      * on the course homepage
-     * Can be used as abstract.
      *
      * @param int    $id            Learnpath id
      * @param string $setVisibility New visibility (v/i - visible/invisible)
@@ -4367,7 +4366,6 @@ class learnpath
             return false;
         }
         $repoShortcut = Container::getShortcutRepository();
-        $em = $repoShortcut->getEntityManager();
         $courseEntity = api_get_course_entity();
 
         if ($addShortcut) {

src/CoreBundle/Controller/EditorController.php

@@ -70,7 +70,7 @@ class EditorController extends BaseController
      *
      * @param int $parentId
      */
-    public function customEditorFileManager(ResourceFactory $resourceFactory, Request $request, $tool, $type, Grid $grid, $parentId = 0): Response
+    public function customEditorFileManager(ResourceFactory $resourceFactory, Request $request, $tool, $type, $parentId = 0): Response
     {
         $id = $request->get('id');
 

src/CoreBundle/Controller/ResourceController.php

@@ -91,7 +91,7 @@ class ResourceController extends AbstractResourceController implements CourseCon
         );
     }
 
-    public function getGrid(Request $request, ResourceRepository $repository, Grid $grid, int $resourceNodeId, string $routeName): Grid
+    public function getGrid(Request $request, ResourceRepository $repository, int $resourceNodeId, string $routeName): Grid
     {
         $class = $repository->getRepository()->getClassName();
 

src/CoreBundle/Hook/HookEvent.php

@@ -82,7 +82,7 @@ abstract class HookEvent implements HookEventInterface
      */
     public static function create(EntityManager $entityManager)
     {
-        static $result = null;
+        /*static $result = null;
 
         if ($result) {
             return $result;
@@ -94,7 +94,7 @@ abstract class HookEvent implements HookEventInterface
             return new $class($entityManager);
         } catch (\Exception $e) {
             return null;
-        }
+        }*/
     }
 
     /**

src/CoreBundle/Hook/HookManagement.php

@@ -134,7 +134,7 @@ class HookManagement implements HookManagementInterface
      */
     public function orderHook($eventName, $type, $hookOrders)
     {
-        foreach ($this->hookCalls[$eventName] as $observerClassName => $types) {
+        /*foreach ($this->hookCalls[$eventName] as $observerClassName => $types) {
             foreach ($hookOrders as $oldOrder => $newOrder) {
                 $res = Database::update(
                     $this->tables[TABLE_HOOK_CALL],
@@ -151,7 +151,7 @@ class HookManagement implements HookManagementInterface
                     break;
                 }
             }
-        }
+        }*/
     }
 
     /**

src/CoreBundle/Hook/HookNotificationContent.php

@@ -26,9 +26,8 @@ class HookNotificationContent extends HookEvent implements HookNotificationConte
      */
     public function notifyNotificationContent($type): array
     {
-        /** @var \HookNotificationContentObserverInterface $observer */
         // Check if exists data content
-        if (isset($this->eventData['content'])) {
+        /*if (isset($this->eventData['content'])) {
             // Save data type
             $this->eventData['type'] = $type;
             // Check for hook all registered observers
@@ -44,6 +43,6 @@ class HookNotificationContent extends HookEvent implements HookNotificationConte
             return $this->eventData;
         }
 
-        return [];
+        return [];*/
     }
 }

src/CoreBundle/Hook/HookNotificationTitle.php

@@ -28,9 +28,8 @@ class HookNotificationTitle extends HookEvent implements HookNotificationTitleEv
      */
     public function notifyNotificationTitle($type): array
     {
-        /** @var \HookNotificationTitleObserverInterface $observer */
         // Check if exists data title
-        if (isset($this->eventData['title'])) {
+        /*if (isset($this->eventData['title'])) {
             // Save data type
             $this->eventData['type'] = $type;
             // Check for hook all registered observers
@@ -45,7 +44,7 @@ class HookNotificationTitle extends HookEvent implements HookNotificationTitleEv
             }
 
             return $this->eventData;
-        }
+        }*/
 
         return [];
     }

src/CoreBundle/Hook/HookObserver.php

@@ -54,7 +54,7 @@ abstract class HookObserver implements HookObserverInterface
      */
     public static function create()
     {
-        static $result = null;
+        /*static $result = null;
 
         if ($result) {
             return $result;
@@ -66,7 +66,7 @@ abstract class HookObserver implements HookObserverInterface
             } catch (\Exception $e) {
                 return null;
             }
-        }
+        }*/
     }
 
     /**

src/CoreBundle/Repository/IllustrationRepository.php

@@ -168,11 +168,6 @@ final class IllustrationRepository extends ResourceRepository implements GridInt
         return '';
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('name');
-    }
-
     public function getResourceFormType(): string
     {
         return IllustrationType::class;

src/CoreBundle/Repository/PersonalFileRepository.php

@@ -48,11 +48,6 @@ final class PersonalFileRepository extends ResourceRepository implements GridInt
         return $newResource;
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('name');
-    }
-
     public function getResourceFormType(): string
     {
         return PersonalFileType::class;

src/CoreBundle/Repository/ResourceRepository.php

@@ -579,22 +579,6 @@ class ResourceRepository extends EntityRepository
         return $qb->getQuery()->getOneOrNullResult();
     }
 
-    public function rowCanBeEdited(RowAction $action, Row $row, Session $session = null): ?RowAction
-    {
-        if (null !== $session) {
-            /** @var AbstractResource $entity */
-            $entity = $row->getEntity();
-            $hasSession = $entity->getResourceNode()->hasSession($session);
-            if ($hasSession->count() > 0) {
-                return $action;
-            }
-
-            return null;
-        }
-
-        return $action;
-    }
-
     public function delete(AbstractResource $resource)
     {
         $children = $resource->getResourceNode()->getChildren();

src/CoreBundle/Security/Authorization/Voter/CourseVoter.php

@@ -57,7 +57,7 @@ class CourseVoter extends Voter
         return true;
     }
 
-    protected function voteOnAttribute(string $attribute, $course, TokenInterface $token): bool
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
     {
         /** @var User $user */
         $user = $token->getUser();
@@ -73,6 +73,8 @@ class CourseVoter extends Voter
 
         // Course is active?
         /** @var Course $course */
+        $course = $subject;
+
         switch ($attribute) {
             case self::VIEW:
                 // Course is hidden then is not visible for nobody expect admins.

src/CoreBundle/Security/Authorization/Voter/GroupVoter.php

@@ -60,7 +60,7 @@ class GroupVoter extends Voter
         return true;
     }
 
-    protected function voteOnAttribute(string $attribute, $group, TokenInterface $token): bool
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
     {
         $user = $token->getUser();
 
@@ -69,7 +69,7 @@ class GroupVoter extends Voter
             return false;
         }
 
-        if (false == $group) {
+        if (false == $subject) {
             return false;
         }
 
@@ -77,7 +77,8 @@ class GroupVoter extends Voter
         if ($this->security->isGranted('ROLE_ADMIN')) {
             return true;
         }
-
+        /** @var CGroup $group */
+        $group = $subject;
         $groupInfo = [
             'id' => $group->getId(),
             'session_id' => 0,

src/CoreBundle/Security/Authorization/Voter/ResourceNodeVoter.php

@@ -94,10 +94,7 @@ class ResourceNodeVoter extends Voter
         return true;
     }
 
-    /**
-     * @param ResourceNode $resourceNode
-     */
-    protected function voteOnAttribute(string $attribute, $resourceNode, TokenInterface $token): bool
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
     {
         $user = $token->getUser();
 
@@ -106,6 +103,9 @@ class ResourceNodeVoter extends Voter
             return false;
         }
 
+        /** @var ResourceNode $group */
+        $resourceNode = $subject;
+
         if (!$resourceNode instanceof ResourceNode) {
             return false;
         }

src/CoreBundle/Security/Authorization/Voter/SessionVoter.php

@@ -56,7 +56,7 @@ class SessionVoter extends Voter
      *
      * {@inheritdoc}
      */
-    protected function voteOnAttribute(string $attribute, $session, TokenInterface $token): bool
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
     {
         /** @var User $user */
         $user = $token->getUser();
@@ -74,6 +74,8 @@ class SessionVoter extends Voter
         // Checks if the current course was set up
         // $session->getCurrentCourse() is set in the class CourseListener
         /** @var Session $session */
+        $session = $subject;
+
         $currentCourse = $session->getCurrentCourse();
 
         switch ($attribute) {

src/CourseBundle/DependencyInjection/ChamiloCourseExtension.php

@@ -16,7 +16,7 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
  */
 class ChamiloCourseExtension extends Extension
 {
-    public function load(array $config, ContainerBuilder $container): void
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');

src/CourseBundle/Entity/CShortcut.php

@@ -6,6 +6,7 @@ namespace Chamilo\CourseBundle\Entity;
 
 use Chamilo\CoreBundle\Entity\AbstractResource;
 use Chamilo\CoreBundle\Entity\ResourceInterface;
+use Chamilo\CoreBundle\Entity\ResourceNode;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -56,9 +57,6 @@ class CShortcut extends AbstractResource implements ResourceInterface
         return $this;
     }
 
-    /**
-     * Resource identifier.
-     */
     public function getResourceIdentifier(): int
     {
         return $this->id;
@@ -74,10 +72,7 @@ class CShortcut extends AbstractResource implements ResourceInterface
         return $this->shortCutNode;
     }
 
-    /**
-     * @return CShortcut
-     */
-    public function setShortCutNode($shortCutNode)
+    public function setShortCutNode(ResourceNode $shortCutNode): self
     {
         $this->shortCutNode = $shortCutNode;
 

src/CourseBundle/Repository/CCourseDescriptionRepository.php

@@ -45,11 +45,6 @@ final class CCourseDescriptionRepository extends ResourceRepository implements G
         return $this->getResourcesByCourse($course, $session, $group, $parentNode);
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('title');
-    }
-
     public function setResourceProperties(FormInterface $form, $course, $session, $fileType)
     {
         /** @var CCourseDescription $newResource */

src/CourseBundle/Repository/CDocumentRepository.php

@@ -210,11 +210,6 @@ final class CDocumentRepository extends ResourceRepository implements GridInterf
         return $query->getResult();
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('title');
-    }
-
     public function getResourceFormType(): string
     {
         return CDocumentType::class;

src/CourseBundle/Repository/CGlossaryRepository.php

@@ -45,11 +45,6 @@ final class CGlossaryRepository extends ResourceRepository implements GridInterf
         return $this->getResourcesByCourse($course, $session, $group, $parentNode);
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('name');
-    }
-
     public function setResourceProperties(FormInterface $form, $course, $session, $fileType)
     {
         /** @var CGlossary $newResource */

src/CourseBundle/Repository/CLinkCategoryRepository.php

@@ -49,11 +49,6 @@ final class CLinkCategoryRepository extends ResourceRepository implements GridIn
         return $newResource;
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('title');
-    }
-
     public function getResourceFormType(): string
     {
         return CLinkType::class;

src/CourseBundle/Repository/CLinkRepository.php

@@ -39,11 +39,6 @@ final class CLinkRepository extends ResourceRepository implements GridInterface
         return $newResource;
     }
 
-    public function getTitleColumn(Grid $grid): Column
-    {
-        return $grid->getColumn('title');
-    }
-
     public function getResourceFormType(): string
     {
         return CLinkType::class;

src/CourseBundle/Repository/CQuizRepository.php

@@ -14,9 +14,9 @@ use Symfony\Component\Routing\RouterInterface;
  */
 final class CQuizRepository extends ResourceRepository implements ResourceWithLinkInterface
 {
-    public function getLink(ResourceInterface $exercise, RouterInterface $router, $extraParams = []): string
+    public function getLink(ResourceInterface $resource, RouterInterface $router, $extraParams = []): string
     {
-        $params = ['name' => 'exercise/overview.php', 'exerciseId' => $exercise->getResourceIdentifier()];
+        $params = ['name' => 'exercise/overview.php', 'exerciseId' => $resource->getResourceIdentifier()];
         if (!empty($extraParams)) {
             $params = array_merge($params, $extraParams);
         }

src/CourseBundle/Repository/CShortcutRepository.php

@@ -36,7 +36,7 @@ final class CShortcutRepository extends ResourceRepository
         if (null === $shortcut) {
             $shortcut = new CShortcut();
             $shortcut
-                ->setName($resource->getName())
+                ->setName($resource->getResourceName())
                 ->setShortCutNode($resource->getResourceNode())
                 ->setParent($parent)
                 ->addCourseLink($course, $session);