Minor - rename CI file, flint fixes

7 years ago · 728a0a507c
parent fe92b23c4a
commit 728a0a507c
10 changed files with 40 additions and 48 deletions
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@ -50,7 +50,7 @@ plugins:
    enabled: true
    config:
      file_extensions: "php"
-      rulesets: "codesize.xml"
+      rulesets: "ruleset.xml"

  sonar-php:
    enabled: false
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@ -2108,7 +2108,6 @@ function api_get_group_entity($id = 0)
    return Database::getManager()->getRepository('ChamiloCourseBundle:CGroupInfo')->find($id);
 }

-
 /**
 * @param int $id
 *
--- a/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
+++ b/plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php
@ -17,7 +17,6 @@ use CpChart\Image as pImage;
 * required files for getting data.
 */

-
 /**
 * This class is used like controller for teacher graph block plugin,
 * the class name must be registered inside path.info file (e.g: controller = "BlockTeacherGraph"),
--- a/codesize.xml
+++ b/codesize.xml
--- a/src/CoreBundle/Controller/ResourceController.php
+++ b/src/CoreBundle/Controller/ResourceController.php
@ -3,27 +3,27 @@

 namespace Chamilo\CoreBundle\Controller;

+use APY\DataGridBundle\Grid\Action\MassAction;
+use APY\DataGridBundle\Grid\Action\RowAction;
 use APY\DataGridBundle\Grid\Export\CSVExport;
 use APY\DataGridBundle\Grid\Export\ExcelExport;
 use APY\DataGridBundle\Grid\Grid;
-use Chamilo\CoreBundle\Repository\ResourceRepository;
+use APY\DataGridBundle\Grid\Source\Entity;
 use Chamilo\CoreBundle\Entity\Resource\ResourceRights;
-use Chamilo\CourseBundle\Controller\CourseControllerTrait;
+use Chamilo\CoreBundle\Repository\ResourceRepository;
+use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CourseBundle\Controller\CourseControllerInterface;
+use Chamilo\CourseBundle\Controller\CourseControllerTrait;
 use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Repository\CDocumentRepository;
-use APY\DataGridBundle\Grid\Action\MassAction;
-use APY\DataGridBundle\Grid\Action\RowAction;
+use FOS\RestBundle\View\View;
+use Sylius\Bundle\ResourceBundle\Controller\ResourceController as BaseResourceController;
 use Sylius\Bundle\ResourceBundle\Event\ResourceControllerEvent;
+use Sylius\Component\Resource\Exception\UpdateHandlingException;
+use Sylius\Component\Resource\ResourceActions;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Sylius\Bundle\ResourceBundle\Controller\ResourceController as BaseResourceController;
-use APY\DataGridBundle\Grid\Source\Entity;
-use FOS\RestBundle\View\View;
-use Sylius\Component\Resource\ResourceActions;
-use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Sylius\Component\Resource\Exception\UpdateHandlingException;

 /**
 * Class ResourceController.
@ -240,7 +240,7 @@ class ResourceController extends BaseResourceController implements CourseControl

            // Loops all sharing options
            foreach ($shareList as $share) {
-                $idList = array();
+                $idList = [];
                if (isset($share['search'])) {
                    $idList = explode(',', $share['search']);
                }
@ -367,9 +367,9 @@ class ResourceController extends BaseResourceController implements CourseControl
                $this->metadata->getName() => $newResource,
                'form' => $form->createView(),
                'parent_id' => $parentId,
-                'file_type' => $fileType
+                'file_type' => $fileType,
            ])
-            ->setTemplate($configuration->getTemplate(ResourceActions::CREATE . '.html'))
+            ->setTemplate($configuration->getTemplate(ResourceActions::CREATE.'.html'))
        ;

        return $this->viewHandler->handle($configuration, $view);
@ -421,7 +421,7 @@ class ResourceController extends BaseResourceController implements CourseControl

        if ($configuration->isHtmlRequest()) {
            $view
-                ->setTemplate($configuration->getTemplate(ResourceActions::SHOW . '.html'))
+                ->setTemplate($configuration->getTemplate(ResourceActions::SHOW.'.html'))
                ->setTemplateVar($this->metadata->getName())
                ->setData([
                    'configuration' => $configuration,
@ -525,7 +525,7 @@ class ResourceController extends BaseResourceController implements CourseControl
                $this->metadata->getName() => $resource,
                'form' => $form->createView(),
            ])
-            ->setTemplate($configuration->getTemplate(ResourceActions::UPDATE . '.html'))
+            ->setTemplate($configuration->getTemplate(ResourceActions::UPDATE.'.html'))
        ;

        return $this->viewHandler->handle($configuration, $view);
--- a/src/CoreBundle/Controller/ResourceDownloadController.php
+++ b/src/CoreBundle/Controller/ResourceDownloadController.php
@ -3,24 +3,14 @@

 namespace Chamilo\CoreBundle\Controller;

-use Chamilo\CoreBundle\Repository\ResourceRepository;
-use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
-use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
-use Chamilo\CoreBundle\Entity\Resource\ResourceRights;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
-use APY\DataGridBundle\Grid\Action\MassAction;
-use APY\DataGridBundle\Grid\Action\RowAction;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\File\MimeType\FileinfoMimeTypeGuesser;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
 use Symfony\Component\Routing\Annotation\Route;
-use APY\DataGridBundle\Grid\Source\Entity;
-use FOS\RestBundle\View\View;
-use Sylius\Component\Resource\ResourceActions;
-use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;

 /**
 * Class ResourceController.
@ -34,7 +24,8 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 class ResourceDownloadController extends BaseController
 {
    /**
-     * Upload form
+     * Upload form.
+     *
     * @Route("/upload/{type}/{id}", name="resource_upload", methods={"GET", "POST"}, options={"expose"=true})
     *
     * @return Response
@ -54,7 +45,9 @@ class ResourceDownloadController extends BaseController

    /**
     * Downloads the file courses/MATHS/document/file.jpg to the user.
+     *
     * @Route("/download/{course}/", name="resource_download", methods={"GET"}, options={"expose"=true})
+     *
     * @todo check permissions
     *
     * @param string $course
@ -104,7 +97,6 @@ class ResourceDownloadController extends BaseController
            );

            return $response;
-
        } catch (\InvalidArgumentException $e) {
            return $this->abort();
        }
@ -112,7 +104,9 @@ class ResourceDownloadController extends BaseController

    /**
     * Gets a document in browser courses/MATHS/document/file.jpg to the user.
+     *
     * @Route("/get/{course}/", name="resource_get", methods={"GET"}, options={"expose"=true})
+     *
     * @todo check permissions
     *
     * @param string $course
@ -143,7 +137,6 @@ class ResourceDownloadController extends BaseController
            $filePath = $adapter->getPathPrefix().$path;

            return $this->file($filePath, null, ResponseHeaderBag::DISPOSITION_INLINE);
-
        } catch (\InvalidArgumentException $e) {
            return $this->abort();
        }
--- a/src/CoreBundle/Controller/ResourceUploaderController.php
+++ b/src/CoreBundle/Controller/ResourceUploaderController.php
@ -3,14 +3,15 @@

 namespace Chamilo\CoreBundle\Controller;

-use Symfony\Component\HttpFoundation\File\Exception\UploadException;
-use Symfony\Component\HttpFoundation\JsonResponse;
 use Oneup\UploaderBundle\Controller\BlueimpController;
 use Oneup\UploaderBundle\Uploader\Response\EmptyResponse;
+use Symfony\Component\HttpFoundation\File\Exception\UploadException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
+use Symfony\Component\HttpFoundation\JsonResponse;

 /**
 * Class ResourceUploaderController.
+ *
 * @package Chamilo\CoreBundle\Controller
 */
 class ResourceUploaderController extends BlueimpController
@ -37,7 +38,6 @@ class ResourceUploaderController extends BlueimpController
                    if ($type === 'course') {
                        $courseCode = $request->get('identifier');
                        $this->container->get('');
-
                    }

                    $chunked ?
@ -47,9 +47,9 @@ class ResourceUploaderController extends BlueimpController
                    $this->errorHandler->addException($response, $e);
                }
            }
-        } catch(UploadException $e) {
+        } catch (UploadException $e) {
            // return nothing
-            return new JsonResponse(array());
+            return new JsonResponse([]);
        }

        return $this->createSupportedJsonResponse($response->assemble());
--- a/src/CoreBundle/Entity/Listener/CourseListener.php
+++ b/src/CoreBundle/Entity/Listener/CourseListener.php
@ -22,7 +22,7 @@ class CourseListener
    protected $toolChain;
    protected $settingsManager;

-    /***
+    /**
     * CourseListener constructor.
     *
     * @param ToolChain       $toolChain
--- a/src/CoreBundle/Entity/Resource/ResourceInterface.php
+++ b/src/CoreBundle/Entity/Resource/ResourceInterface.php
@ -11,6 +11,7 @@ namespace Chamilo\CoreBundle\Entity\Resource;
 interface ResourceInterface
 {
    public function setResourceNode(ResourceNode $resourceNode);
+
    public function getResourceNode();

    /**
@ -19,7 +20,10 @@ interface ResourceInterface
     * @return int
     */
    public function getResourceIdentifier(): int;
+
    public function getResourceName(): string;
+
    public function getToolName(): string;
+
    //"getName()", "name()", "isName()", "hasName()", "__get()"
 }
--- a/src/CoreBundle/Repository/ResourceRepository.php
+++ b/src/CoreBundle/Repository/ResourceRepository.php
@ -4,18 +4,16 @@
 namespace Chamilo\CoreBundle\Repository;

 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
+use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
 use Chamilo\CoreBundle\Entity\Resource\ResourceRights;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\Tool;
-use Chamilo\CoreBundle\Entity\ToolResourceRights;
 use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
 use Chamilo\UserBundle\Entity\Group;
 use Chamilo\UserBundle\Entity\User;
-use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
-use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Query\Expr\Join;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;

@ -39,8 +37,7 @@ class ResourceRepository extends EntityRepository
        AbstractResource $resource,
        User $creator,
        AbstractResource $parent = null
-    ): ResourceNode
-    {
+    ): ResourceNode {
        $resourceNode = new ResourceNode();

        $tool = $this->getTool($resource->getToolName());
@ -134,7 +131,7 @@ class ResourceRepository extends EntityRepository

    /**
     * @param ResourceNode $resourceNode
-     * @param array        $userList User id list
+     * @param array        $userList     User id list
     */
    public function addResourceToUserList(ResourceNode $resourceNode, array $userList)
    {
@ -217,8 +214,8 @@ class ResourceRepository extends EntityRepository
    }

    /**
-     * @param ResourceNode $resourceNode
-     * @param Usergroup $group
+     * @param ResourceNode   $resourceNode
+     * @param Usergroup      $group
     * @param ResourceRights $right
     *
     * @return ResourceLink
@ -262,10 +259,10 @@ class ResourceRepository extends EntityRepository
            //->where('node.cId = 0')
            //->orderBy('node');
            ->setParameters(
-                array(
+                [
                    'tool' => $tool,
                    'course' => $course,
-                )
+                ]
            );

        if ($parent !== null) {