diff --git a/config/routes.yaml b/config/routes.yaml
index 6caf64a860..51ede9959b 100644
--- a/config/routes.yaml
+++ b/config/routes.yaml
@@ -27,7 +27,7 @@ app_document:
 
 app_document_index:
     path: /courses/{course}/resource/documents/
-    methods: [GET,POST]
+    methods: [GET, POST]
     defaults:
         _controller: app.controller.document:indexAction
         _sylius:
@@ -35,7 +35,7 @@ app_document_index:
 
 app_document_create:
     path: /courses/{course}/resource/documents/new
-    methods: [GET,POST]
+    methods: [GET, POST]
     defaults:
         _controller: app.controller.document:createAction
         _sylius:
@@ -44,7 +44,7 @@ app_document_create:
 
 app_document_create_document:
     path: /courses/{course}/resource/documents/new_document
-    methods: [GET,POST]
+    methods: [GET, POST]
     defaults:
         _controller: app.controller.document:createDocumentAction
         _sylius:
@@ -61,7 +61,7 @@ app_document_show:
 
 app_document_update:
     path: /courses/{course}/resource/documents/{id}/edit
-    methods: [GET,PUT,PATCH]
+    methods: [GET, PUT, PATCH]
     defaults:
         _controller: app.controller.document:updateAction
         _sylius:
@@ -74,10 +74,6 @@ app_document_delete:
     defaults:
         _controller: app.controller.document:deleteAction
 
-
-
-
-
 #admin_dashboard:
 #    pattern: /administration/
 #    defaults:
diff --git a/src/CoreBundle/Entity/Listener/CourseListener.php b/src/CoreBundle/Entity/Listener/CourseListener.php
index ea245143f7..1ed96a1f9a 100644
--- a/src/CoreBundle/Entity/Listener/CourseListener.php
+++ b/src/CoreBundle/Entity/Listener/CourseListener.php
@@ -12,7 +12,7 @@ use Chamilo\SettingsBundle\Manager\SettingsManager;
 use Doctrine\ORM\Event\LifecycleEventArgs;
 
 /**
- * Class CourseListener
+ * Class CourseListener.
  * Course entity listener, when a course is created/edited and when the tool chain is loaded.
  *
  * @package Chamilo\CoreBundle\EventListener
diff --git a/src/CoreBundle/Entity/Tool.php b/src/CoreBundle/Entity/Tool.php
index 4f6434cc06..26e681cf76 100644
--- a/src/CoreBundle/Entity/Tool.php
+++ b/src/CoreBundle/Entity/Tool.php
@@ -120,7 +120,7 @@ class Tool
      *
      * @return int
      */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
diff --git a/src/CoreBundle/Entity/ToolResourceRights.php b/src/CoreBundle/Entity/ToolResourceRights.php
index 6ed6292bae..860a81eabc 100644
--- a/src/CoreBundle/Entity/ToolResourceRights.php
+++ b/src/CoreBundle/Entity/ToolResourceRights.php
@@ -14,6 +14,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class ToolResourceRights
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer", nullable=false, unique=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    protected $id;
+
     /**
      * @var string
      *
@@ -33,14 +42,6 @@ class ToolResourceRights
      * @ORM\JoinColumn(name="tool_id", referencedColumnName="id")
      */
     protected $tool;
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer", nullable=false, unique=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue
-     */
-    protected $id;
 
     /**
      * @return string
@@ -127,7 +128,7 @@ class ToolResourceRights
     {
         return [
             'Students' => 'ROLE_STUDENT',
-            'Teachers'=> 'ROLE_TEACHER',
+            'Teachers' => 'ROLE_TEACHER',
         ];
     }
 
@@ -141,7 +142,7 @@ class ToolResourceRights
 
         return [
             'Can read' => $readerMask,
-            'Can edit' => $editorMask ,
+            'Can edit' => $editorMask,
         ];
     }
 }
diff --git a/src/CoreBundle/Form/Type/DocumentType.php b/src/CoreBundle/Form/Type/DocumentType.php
index 94a80218f5..7a5f87cf70 100644
--- a/src/CoreBundle/Form/Type/DocumentType.php
+++ b/src/CoreBundle/Form/Type/DocumentType.php
@@ -3,12 +3,8 @@
 
 namespace Chamilo\CoreBundle\Form\Type;
 
-use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CourseBundle\Entity\CDocument;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -16,7 +12,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
  * Class DocumentType
- * @package Chamilo\NotebookBundle\Form\Type
+ * @package Chamilo\CoreBundle\Form\Type
  */
 class DocumentType extends AbstractType
 {
diff --git a/src/CoreBundle/Form/Type/ResourceLinkType.php b/src/CoreBundle/Form/Type/ResourceLinkType.php
index 01f6122870..c11aa21403 100644
--- a/src/CoreBundle/Form/Type/ResourceLinkType.php
+++ b/src/CoreBundle/Form/Type/ResourceLinkType.php
@@ -11,7 +11,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class ResourceLinkType
+ * Class ResourceLinkType.
  * @package Chamilo\CoreBundle\Form\Type
  */
 class ResourceLinkType extends AbstractType
diff --git a/src/CoreBundle/Form/Type/ResourceNodeType.php b/src/CoreBundle/Form/Type/ResourceNodeType.php
index 45968e6adc..5cec733580 100644
--- a/src/CoreBundle/Form/Type/ResourceNodeType.php
+++ b/src/CoreBundle/Form/Type/ResourceNodeType.php
@@ -8,8 +8,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class ResourceNodeType
- * @package Chamilo\NotebookBundle\Form\Type
+ * Class ResourceNodeType.
+ *
+ * @package Chamilo\CoreBundle\Form\Type
  */
 class ResourceNodeType extends AbstractType
 {
@@ -23,9 +24,9 @@ class ResourceNodeType extends AbstractType
             ->add(
                 'links',
                 'collection',
-                array(
+                [
                     'type' => new ResourceLinkType(),
-                )
+                ]
             );
     }
 
diff --git a/src/CoreBundle/Form/Type/ResourceRightsType.php b/src/CoreBundle/Form/Type/ResourceRightsType.php
index e7915487b5..c170cda217 100644
--- a/src/CoreBundle/Form/Type/ResourceRightsType.php
+++ b/src/CoreBundle/Form/Type/ResourceRightsType.php
@@ -9,8 +9,9 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
- * Class ResourceRightsType
- * @package Chamilo\NotebookBundle\Form\Type
+ * Class ResourceRightsType.
+ *
+ * @package Chamilo\CoreBundle\Form\Type
  */
 class ResourceRightsType extends AbstractType
 {
diff --git a/src/CoreBundle/Repository/ResourceRepository.php b/src/CoreBundle/Repository/ResourceRepository.php
index a2397ada43..119f8ece12 100644
--- a/src/CoreBundle/Repository/ResourceRepository.php
+++ b/src/CoreBundle/Repository/ResourceRepository.php
@@ -27,7 +27,7 @@ use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 class ResourceRepository extends EntityRepository
 {
     /**
-     * Creates a ResourceNode
+     * Creates a ResourceNode.
      *
      * @param AbstractResource $resource
      * @param User             $creator
@@ -220,6 +220,7 @@ class ResourceRepository extends EntityRepository
      * @param ResourceNode $resourceNode
      * @param Usergroup $group
      * @param ResourceRights $right
+     *
      * @return ResourceLink
      */
     public function addResourceToGroup(
@@ -296,7 +297,7 @@ class ResourceRepository extends EntityRepository
     }
 
     /**
-     * @param $tool
+     * @param string $tool
      *
      * @return Tool|null
      */
diff --git a/src/CoreBundle/Resources/config/services.yml b/src/CoreBundle/Resources/config/services.yml
index 97d54fc433..549a2f220f 100644
--- a/src/CoreBundle/Resources/config/services.yml
+++ b/src/CoreBundle/Resources/config/services.yml
@@ -201,7 +201,7 @@ services:
         class: Chamilo\CoreBundle\EventListener\CourseUploadListener
         arguments: ['@doctrine.orm.entity_manager']
         tags:
-        - {name: kernel.event_listener, event: oneup_uploader.post_persist, method: onUpload }
+            - {name: kernel.event_listener, event: oneup_uploader.post_persist, method: onUpload}
 
 #    chamilo_core.menu.simple_menu:
 #        class: Chamilo\CoreBundle\Menu\SimpleMenuBuilder
diff --git a/src/CourseBundle/EventListener/CourseListener.php b/src/CourseBundle/EventListener/CourseListener.php
index 0bf43b5ee3..f521b23789 100644
--- a/src/CourseBundle/EventListener/CourseListener.php
+++ b/src/CourseBundle/EventListener/CourseListener.php
@@ -36,6 +36,7 @@ class CourseListener
 
     /**
      * Get request from the URL cidReq, c_id or the "ABC" in the courses url (courses/ABC/index.php).
+     *
      * @param GetResponseEvent $event
      */
     public function onKernelRequest(GetResponseEvent $event)
@@ -203,6 +204,7 @@ class CourseListener
 
     /**
      * Once the onKernelRequest was fired, we check if the session object were set and we inject them in the controller.
+     *
      * @param FilterControllerEvent $event
      */
     public function onKernelController(FilterControllerEvent $event)
diff --git a/src/CourseBundle/Repository/CDocumentRepository.php b/src/CourseBundle/Repository/CDocumentRepository.php
index ca4dc2b647..77849b6789 100644
--- a/src/CourseBundle/Repository/CDocumentRepository.php
+++ b/src/CourseBundle/Repository/CDocumentRepository.php
@@ -3,10 +3,7 @@
 
 namespace Chamilo\CourseBundle\Repository;
 
-use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Repository\ResourceRepository;
-use Chamilo\CoreBundle\Entity\Session;
-use Chamilo\UserBundle\Entity\User;
 
 /**
  * Class CDocumentRepository.