diff --git a/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php b/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php
index 29918de41d..9a5d44a1c8 100644
--- a/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php
+++ b/lib/Alchemy/Phrasea/Core/Event/CollectionCreateEvent.php
@@ -11,9 +11,6 @@
 
 namespace Alchemy\Phrasea\Core\Event;
 
-use Alchemy\Phrasea\Authentication\Context;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\EventDispatcher\Event as SfEvent;
 
 class CollectionCreateEvent extends SfEvent
diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php
index a1a1c79b5b..bbdd71deb5 100644
--- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineSubscriber.php
@@ -15,7 +15,6 @@ use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Core\Event\CollectionCreateEvent;
 use Alchemy\Phrasea\Core\Event\PostAuthenticate;
 use Alchemy\Phrasea\Core\PhraseaEvents;
-use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class PhraseaEngineSubscriber implements EventSubscriberInterface
diff --git a/lib/Doctrine/Entities/AuthFailure.php b/lib/Doctrine/Entities/AuthFailure.php
index b2121eee59..669d7a7d50 100644
--- a/lib/Doctrine/Entities/AuthFailure.php
+++ b/lib/Doctrine/Entities/AuthFailure.php
@@ -11,8 +11,6 @@
 
 namespace Entities;
 
-use Doctrine\ORM\Mapping as ORM;
-
 /**
  * AuthFailure
  */
diff --git a/lib/Doctrine/Entities/LazaretAttribute.php b/lib/Doctrine/Entities/LazaretAttribute.php
index 0484aa0df1..441e17ede9 100644
--- a/lib/Doctrine/Entities/LazaretAttribute.php
+++ b/lib/Doctrine/Entities/LazaretAttribute.php
@@ -11,8 +11,6 @@
 
 namespace Entities;
 
-use Alchemy\Phrasea\Application;
-
 /**
  * LazaretAttribute
  */
diff --git a/lib/Doctrine/Entities/LazaretCheck.php b/lib/Doctrine/Entities/LazaretCheck.php
index 4de1fd2c2e..3d1518f4c7 100644
--- a/lib/Doctrine/Entities/LazaretCheck.php
+++ b/lib/Doctrine/Entities/LazaretCheck.php
@@ -11,8 +11,6 @@
 
 namespace Entities;
 
-use Alchemy\Phrasea\Application;
-
 /**
  * LazaretCheck
  */
diff --git a/lib/Doctrine/Entities/SessionModule.php b/lib/Doctrine/Entities/SessionModule.php
index 4422fa6ede..b5e26b5820 100644
--- a/lib/Doctrine/Entities/SessionModule.php
+++ b/lib/Doctrine/Entities/SessionModule.php
@@ -11,8 +11,6 @@
 
 namespace Entities;
 
-use Alchemy\Phrasea\Application;
-
 /**
  * SessionModule
  */
diff --git a/lib/Doctrine/Entities/UsrList.php b/lib/Doctrine/Entities/UsrList.php
index 06dd1e7d98..8af2208937 100644
--- a/lib/Doctrine/Entities/UsrList.php
+++ b/lib/Doctrine/Entities/UsrList.php
@@ -238,7 +238,7 @@ class UsrList
     public function has(\User_Adapter $user, Application $app)
     {
         return $this->entries->exists(
-            function($key, $entry) use ($user, $app) {
+            function ($key, $entry) use ($user, $app) {
                 return $entry->getUser($app)->get_id() === $user->get_id();
             }
         );
diff --git a/lib/Doctrine/Entities/ValidationData.php b/lib/Doctrine/Entities/ValidationData.php
index 64474e687c..6f503a1e3e 100644
--- a/lib/Doctrine/Entities/ValidationData.php
+++ b/lib/Doctrine/Entities/ValidationData.php
@@ -11,8 +11,6 @@
 
 namespace Entities;
 
-use Alchemy\Phrasea\Application;
-
 /**
  * ValidationData
  */
diff --git a/lib/Doctrine/Repositories/BasketRepository.php b/lib/Doctrine/Repositories/BasketRepository.php
index 395314a79e..4e89ab620e 100644
--- a/lib/Doctrine/Repositories/BasketRepository.php
+++ b/lib/Doctrine/Repositories/BasketRepository.php
@@ -124,8 +124,8 @@ class BasketRepository extends EntityRepository
      *
      * @throws NotFoundHttpException
      * @throws AccessDeniedHttpException
-     * @param  type                 $basket_id
-     * @param  \User_Adapter        $user
+     * @param  type                      $basket_id
+     * @param  \User_Adapter             $user
      * @return \Entities\Basket
      */
     public function findUserBasket(Application $app, $basket_id, \User_Adapter $user, $requireOwner)
diff --git a/lib/Doctrine/Repositories/LazaretFileRepository.php b/lib/Doctrine/Repositories/LazaretFileRepository.php
index 237c4b98fa..7651642dfa 100644
--- a/lib/Doctrine/Repositories/LazaretFileRepository.php
+++ b/lib/Doctrine/Repositories/LazaretFileRepository.php
@@ -15,7 +15,7 @@ class LazaretFileRepository extends EntityRepository
 
     public function findPerPage(array $base_ids, $offset = 0, $perPage = 10)
     {
-        $base_ids = implode(', ', array_map(function($int) {
+        $base_ids = implode(', ', array_map(function ($int) {
                     return (int) $int;
                 }, $base_ids));
 
diff --git a/lib/Doctrine/Repositories/StoryWZRepository.php b/lib/Doctrine/Repositories/StoryWZRepository.php
index a0f5ddd1d0..d104c8f73e 100644
--- a/lib/Doctrine/Repositories/StoryWZRepository.php
+++ b/lib/Doctrine/Repositories/StoryWZRepository.php
@@ -46,7 +46,7 @@ class StoryWZRepository extends EntityRepository
                 $sortedStories[] = $story->getRecord($app)->get_title();
             }
 
-            uasort($sortedStories, function($a, $b) {
+            uasort($sortedStories, function ($a, $b) {
                     if ($a == $b) {
                         return 0;
                     }
diff --git a/lib/classes/module/console/checkExtension.php b/lib/classes/module/console/checkExtension.php
index 326aa16434..13c6c306d3 100644
--- a/lib/classes/module/console/checkExtension.php
+++ b/lib/classes/module/console/checkExtension.php
@@ -202,11 +202,9 @@ class module_console_checkExtension extends Command
             return 1;
         }
 
-
         // test disconnected mode if available
         // prepare the test before closing session
-        if(function_exists("phrasea_public_query"))
-        {
+        if (function_exists("phrasea_public_query")) {
             // fill an array for each sbas to query
             $tbases = array();
             foreach ($phSession["bases"] as $phbase) {
@@ -231,7 +229,6 @@ class module_console_checkExtension extends Command
             }
         }
 
-
         $output->writeln("\n-- phrasea_close_session --");
 
         $rs = phrasea_close_session($sessid);
@@ -244,11 +241,8 @@ class module_console_checkExtension extends Command
             return 1;
         }
 
-
-
         // session is closed, test disconnected mode if available
-        if(function_exists("phrasea_public_query"))
-        {
+        if (function_exists("phrasea_public_query")) {
             $output->writeln("\n-- phrasea_public_query(...0, 5,...) --");
 
             $ret = phrasea_public_query(
@@ -262,7 +256,7 @@ class module_console_checkExtension extends Command
                 , true                          // verbose output (chrono, sql...)
             );
 
-            if(is_array($ret) && array_key_exists("results", $ret) && is_array($ret["results"])) {
+            if (is_array($ret) && array_key_exists("results", $ret) && is_array($ret["results"])) {
                 $output->writeln( sprintf("<info>Succes ! </info> returned %d answers", count($ret["results"])) );
             } else {
                 $output->writeln("<error>Failed ! </error>");
@@ -270,9 +264,7 @@ class module_console_checkExtension extends Command
                 return 1;
             }
 
-
-            foreach($ret['results'] as $result)
-            {
+            foreach ($ret['results'] as $result) {
                 $sbid = $result["sbid"];
                 $rid  = $result["rid"];
                 $q = $tbases["S".$sbid]["arrayq"];  // query tree
diff --git a/lib/conf.d/Doctrine/Entities.Session.dcm.yml b/lib/conf.d/Doctrine/Entities.Session.dcm.yml
index cd93bcb07d..3e6b7cec81 100644
--- a/lib/conf.d/Doctrine/Entities.Session.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.Session.dcm.yml
@@ -63,4 +63,4 @@ Entities\Session:
       mappedBy: session
       cascade: ["ALL"]
       orderBy:
-        module_id: ASC
\ No newline at end of file
+        module_id: ASC
diff --git a/lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml b/lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
index fd82c27ebc..0623697180 100644
--- a/lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
@@ -22,8 +22,3 @@ Entities\StoryWZ:
       gedmo:
         timestampable:
           on: create
-
-
-
-
-
diff --git a/lib/conf.d/Doctrine/Entities.UsrList.dcm.yml b/lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
index 6eb3597d9e..07c28376a1 100644
--- a/lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
@@ -29,5 +29,3 @@ Entities\UsrList:
       targetEntity: UsrListEntry
       mappedBy: list
       cascade: ["ALL"]
-
-
diff --git a/lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml b/lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
index a9bab397a9..1ce3439cb0 100644
--- a/lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
@@ -31,5 +31,3 @@ Entities\UsrListEntry:
         name: list_id
         referencedColumnName: id
       cascade: ["persist"]
-
-
diff --git a/lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml b/lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
index 9fb72bc084..6a94728351 100644
--- a/lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
@@ -33,6 +33,3 @@ Entities\UsrListOwner:
         name: list_id
         referencedColumnName: id
       cascade: ["persist"]
-
-
-
diff --git a/lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml b/lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
index 1c3c901c27..bb30a30a52 100644
--- a/lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
+++ b/lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
@@ -35,7 +35,3 @@ Entities\ValidationSession:
       targetEntity: ValidationParticipant
       mappedBy: session
       cascade: ["ALL"]
-
-
-
-
diff --git a/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php b/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
index 882a051118..5431aeb40f 100644
--- a/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
+++ b/lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
@@ -29,7 +29,7 @@ class LoadFiveBaskets extends \PhraseaFixture\AbstractWZ implements FixtureInter
 
     public function load(ObjectManager $manager)
     {
-        for ($i = 0; $i < 5; $i ++ ) {
+        for ($i = 0; $i < 5; $i ++) {
             $basket = new \Entities\Basket();
 
             $basket->setName('test ' . $i);
diff --git a/lib/conf.d/plugins/commands.php b/lib/conf.d/plugins/commands.php
index 1e38b339db..2b98740306 100644
--- a/lib/conf.d/plugins/commands.php
+++ b/lib/conf.d/plugins/commands.php
@@ -6,6 +6,5 @@
 use Alchemy\Phrasea\CLI;
 
 return call_user_func(function (CLI $cli) {
-
     return $cli;
 }, $cli);
diff --git a/lib/conf.d/plugins/services.php b/lib/conf.d/plugins/services.php
index e1edd7ca84..f0cb0b4f90 100644
--- a/lib/conf.d/plugins/services.php
+++ b/lib/conf.d/plugins/services.php
@@ -6,6 +6,5 @@
 use Alchemy\Phrasea\Application;
 
 return call_user_func(function (Application $app) {
-
     return $app;
 }, $app);