Minor - format code, remove unused code.

main/document/downloadfolder.inc.php

@@ -4,8 +4,6 @@
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
 use Chamilo\CoreBundle\Framework\Container;
 use ChamiloSession as Session;
-use ZipStream\Option\Archive;
-use ZipStream\ZipStream;
 
 /**
  * Functions and main code for the download folder feature.

main/exercise/exercice.php

@@ -1,10 +0,0 @@
-<?php
-// This file serves the only purpose of maintaining backwards compatibility
-// with previous content of Chamilo that might have pointed directly to
-// exercise.php as it was called before.
-// The *previous* exercise.php was renamed to exercise.php, which is the file
-// included here. All new links to the main exercises page should point
-// directly to exercise.php. This redirection is enabled for 1.10.x (2015-04-21)
-// The final goal of this file is to be removed in a few years time, if
-// considered realistically not harmful
-require __DIR__.'/exercise.php';

main/inc/lib/document.lib.php

@@ -3,9 +3,7 @@
 
 use Chamilo\CoreBundle\Entity\Resource\ResourceFile;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
-use Chamilo\CoreBundle\Entity\Resource\ResourceRight;
 use Chamilo\CoreBundle\Framework\Container;
-use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
 use Chamilo\UserBundle\Entity\User;

main/install/index.php

@@ -39,10 +39,9 @@ define('FORM_FIELD_DISPLAY_LENGTH', 40);
 define('DATABASE_FORM_FIELD_DISPLAY_LENGTH', 25);
 define('MAX_FORM_FIELD_LENGTH', 80);
 
-require_once '../inc/lib/api.lib.php';
-require_once '../inc/lib/text.lib.php';
+require_once __DIR__.'/../../public/legacy.php';
 
-api_check_php_version('../inc/');
+api_check_php_version();
 ob_implicit_flush(true);
 
 // Defaults settings
@@ -59,7 +58,6 @@ putenv('APP_DEBUG=1');
 
 session_start();
 
-require_once __DIR__.'/../../public/legacy.php';
 require_once 'install.lib.php';
 
 

src/CoreBundle/Controller/ResourceController.php

@@ -20,20 +20,15 @@ use FOS\RestBundle\View\View;
 use League\Flysystem\MountManager;
 use Liip\ImagineBundle\Service\FilterService;
 use Sonata\MediaBundle\Provider\ImageProvider;
-use Sonata\MediaBundle\Provider\MediaProviderInterface;
 use Sylius\Bundle\ResourceBundle\Event\ResourceControllerEvent;
 use Sylius\Component\Resource\Exception\UpdateHandlingException;
 use Sylius\Component\Resource\ResourceActions;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Vich\UploaderBundle\Handler\DownloadHandler;
-use Vich\UploaderBundle\Storage\FlysystemStorage;
-use Symfony\Component\HttpFoundation\File\File;
 use Vich\UploaderBundle\Util\Transliterator;
 
 /**

src/CoreBundle/Entity/Resource/ResourceInterface.php

@@ -36,5 +36,4 @@ interface ResourceInterface
      * @return string
      */
     public function getToolName(): string;
-    //"getName()", "name()", "isName()", "hasName()", "__get()"
 }

src/CoreBundle/Framework/Container.php

@@ -330,7 +330,6 @@ class Container
         return self::$container->get('Chamilo\CourseBundle\Repository\CDocumentRepository');
     }
 
-
     /**
      * @return CQuizRepository
      */
@@ -340,7 +339,7 @@ class Container
     }
 
     /**
-     * @param UserManager
+     * @param $manager UserManager
      */
     public static function setUserManager($manager)
     {
@@ -356,7 +355,7 @@ class Container
     }
 
     /**
-     * @param UserManager
+     * @param $manager UserManager
      */
     public static function setSiteManager($manager)
     {

src/CoreBundle/Repository/ResourceRepository.php

@@ -120,7 +120,6 @@ class ResourceRepository
      * @param Course       $course
      * @param Session      $session
      * @param CGroupInfo   $group
-     *
      */
     public function addResourceToCourse(ResourceNode $resourceNode, $visibility, $course, $session, $group): void
     {
@@ -172,7 +171,7 @@ class ResourceRepository
      *
      * @return ResourceLink
      */
-    private function addResourceToCourse2(ResourceNode $resourceNode, Course $course, ResourceRight $right): ResourceLink
+    public function addResourceToCourse2(ResourceNode $resourceNode, Course $course, ResourceRight $right): ResourceLink
     {
         $resourceLink = new ResourceLink();
         $resourceLink
@@ -191,20 +190,21 @@ class ResourceRepository
      *
      * @return ResourceLink
      */
-    private function addResourceToUser(ResourceNode $resourceNode, User $toUser): ResourceLink
+    public function addResourceToUser(ResourceNode $resourceNode, User $toUser): ResourceLink
     {
         $resourceLink = $this->addResourceNodeToUser($resourceNode, $toUser);
         $this->getEntityManager()->persist($resourceLink);
 
         return $resourceLink;
     }
+
     /**
      * @param ResourceNode $resourceNode
      * @param User         $toUser
      *
      * @return ResourceLink
      */
-    private function addResourceNodeToUser(ResourceNode $resourceNode, User $toUser): ResourceLink
+    public function addResourceNodeToUser(ResourceNode $resourceNode, User $toUser): ResourceLink
     {
         $resourceLink = new ResourceLink();
         $resourceLink
@@ -222,7 +222,7 @@ class ResourceRepository
      *
      * @return ResourceLink
      */
-    private function addResourceToSession(
+    public function addResourceToSession(
         ResourceNode $resourceNode,
         Course $course,
         Session $session,
@@ -247,7 +247,7 @@ class ResourceRepository
      *
      * @return ResourceLink
      */
-    private function addResourceToCourseGroup(
+    public function addResourceToCourseGroup(
         ResourceNode $resourceNode,
         Course $course,
         CGroupInfo $group,
@@ -271,7 +271,7 @@ class ResourceRepository
      *
      * @return ResourceLink
      */
-    private function addResourceToGroup(
+    public function addResourceToGroup(
         ResourceNode $resourceNode,
         Usergroup $group,
         ResourceRight $right

src/CourseBundle/Controller/Home/HomeController.php

@@ -620,7 +620,7 @@ class HomeController extends ToolBaseController
                     $sessionData = Session::read($session_key);
                     if (!isset($sessionData)) {
                         //redirecting to the Exercise
-                        $url = api_get_path(WEB_CODE_PATH).'exercise/exercice.php?'.api_get_cidreq().'&id_session='.$session_id;
+                        $url = api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'&id_session='.$session_id;
                         $_SESSION[$session_key] = true;
 
                         header("Location: $url");

src/CourseBundle/Repository/CQuizRepository.php

@@ -3,15 +3,10 @@
 
 namespace Chamilo\CourseBundle\Repository;
 
-use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
-use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
-use Chamilo\CoreBundle\Entity\Resource\ResourceRight;
 use Chamilo\CoreBundle\Repository\ResourceRepository;
-use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CourseBundle\Entity\CQuiz;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
-use Gaufrette\Exception\FileNotFound;
 use League\Flysystem\FilesystemInterface;
 use League\Flysystem\MountManager;