PHP CS fix

2025-10-12 12:33:26 +00:00 · 2014-05-30 15:22:00 +02:00
parent 8dd6512cf8
commit e5b8817c46
99 changed files with 113 additions and 166 deletions
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -67,16 +67,9 @@ use Alchemy\Phrasea\Controller\Root\Session;
 use Alchemy\Phrasea\Controller\Setup as SetupController;
 use Alchemy\Phrasea\Controller\Thesaurus\Thesaurus;
 use Alchemy\Phrasea\Controller\Thesaurus\Xmlhttp as ThesaurusXMLHttp;
-use Alchemy\Phrasea\Controller\Utils\ConnectionTest;
-use Alchemy\Phrasea\Controller\Utils\PathFileTest;
 use Alchemy\Phrasea\Controller\User\Notifications;
 use Alchemy\Phrasea\Controller\User\Preferences;
-use Alchemy\Phrasea\Core\Event\Subscriber\SessionManagerSubscriber;
 use Alchemy\Phrasea\Core\PhraseaExceptionHandler;
-use Alchemy\Phrasea\Core\Event\Subscriber\LogoutSubscriber;
-use Alchemy\Phrasea\Core\Event\Subscriber\PhraseaLocaleSubscriber;
-use Alchemy\Phrasea\Core\Event\Subscriber\MaintenanceSubscriber;
-use Alchemy\Phrasea\Core\Event\Subscriber\CookiesDisablerSubscriber;
 use Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider;
 use Alchemy\Phrasea\Core\Provider\BrowserServiceProvider;
 use Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider;
@@ -103,7 +96,6 @@ use Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider;
 use Alchemy\Phrasea\Core\Provider\TokensServiceProvider;
 use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider;
 use Alchemy\Phrasea\Exception\InvalidArgumentException;
-use Alchemy\Phrasea\Exception\LogicException;
 use Alchemy\Phrasea\Twig\JSUniqueID;
 use Alchemy\Phrasea\Twig\Fit;
 use Alchemy\Phrasea\Twig\Camelize;
@@ -136,10 +128,8 @@ use XPDF\XPDFServiceProvider;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\Form\FormTypeInterface;
@@ -284,7 +274,7 @@ class Application extends SilexApplication
            'session.test' => $this->getEnvironment() === static::ENV_TEST,
            'session.storage.options' => array('cookie_lifetime' => 0)
        ));
-        $this['session.storage.test'] = $this->share(function($app) {
+        $this['session.storage.test'] = $this->share(function ($app) {
            return new MockArraySessionStorage();
        });

--- a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthentication.php
+++ b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthentication.php
@@ -3,7 +3,6 @@
 namespace Alchemy\Phrasea\Authentication\Phrasea;

 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\Authentication\Phrasea\FailureManager;
 use Symfony\Component\HttpFoundation\Request;

 class FailureHandledNativeAuthentication implements PasswordAuthenticationInterface
--- a/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php
+++ b/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php
@@ -12,7 +12,6 @@
 namespace Alchemy\Phrasea\Border;

 use Alchemy\Phrasea\Core\Configuration\Configuration;
-use Alchemy\Phrasea\Media\MimeTypeGuesser as AlchemyMimeTypeGuesser;
 use MediaVorus\Utils\AudioMimeTypeGuesser;
 use MediaVorus\Utils\PostScriptMimeTypeGuesser;
 use MediaVorus\Utils\RawImageMimeTypeGuesser;
--- a/lib/Alchemy/Phrasea/Cache/Factory.php
+++ b/lib/Alchemy/Phrasea/Cache/Factory.php
@@ -11,13 +11,6 @@

 namespace Alchemy\Phrasea\Cache;

-use Alchemy\Phrasea\Cache\ApcCache;
-use Alchemy\Phrasea\Cache\ArrayCache;
-use Alchemy\Phrasea\Cache\Cache;
-use Alchemy\Phrasea\Cache\MemcacheCache;
-use Alchemy\Phrasea\Cache\RedisCache;
-use Alchemy\Phrasea\Cache\WinCacheCache;
-use Alchemy\Phrasea\Cache\XcacheCache;
 use Alchemy\Phrasea\Exception\RuntimeException;

 class Factory
--- a/lib/Alchemy/Phrasea/Cache/Manager.php
+++ b/lib/Alchemy/Phrasea/Cache/Manager.php
@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Cache;

 use Alchemy\Phrasea\Exception\RuntimeException;
 use Alchemy\Phrasea\Core\Configuration\Compiler;
-use Alchemy\Phrasea\Cache\Cache;
-use Alchemy\Phrasea\Cache\Factory;
 use Monolog\Logger;

 class Manager
--- a/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php
+++ b/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

--- a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
+++ b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
--- a/lib/Alchemy/Phrasea/Command/CreateCollection.php
+++ b/lib/Alchemy/Phrasea/Command/CreateCollection.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Alchemy\Phrasea\Core\Event\CollectionCreateEvent;
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Symfony\Component\Console\Input\InputArgument;
--- a/lib/Alchemy/Phrasea/Command/RecordAdd.php
+++ b/lib/Alchemy/Phrasea/Command/RecordAdd.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Alchemy\Phrasea\Border\File;
 use Alchemy\Phrasea\Border\Manager;
 use Entities\LazaretFile;
--- a/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php
+++ b/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

--- a/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php
+++ b/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Command;

-use Alchemy\Phrasea\Command\Command;
 use Alchemy\Phrasea\Command\Upgrade\Step31;
 use Alchemy\Phrasea\Command\Upgrade\Step35;
 use Symfony\Component\Console\Input\InputOption;
--- a/lib/Alchemy/Phrasea/Controller/Admin/Users.php
+++ b/lib/Alchemy/Phrasea/Controller/Admin/Users.php
@@ -196,7 +196,7 @@ class Users implements ControllerProviderInterface
            }

            $filename = sprintf('user_export_%s.csv', date('Ymd'));
-            $response = new CSVFileResponse($filename, function() use ($app, $userTable) {
+            $response = new CSVFileResponse($filename, function () use ($app, $userTable) {
                $app['csv.exporter']->export('php://output', $userTable);
            });

@@ -343,7 +343,7 @@ class Users implements ControllerProviderInterface
            } while (count($results) > 0);

            $filename = sprintf('user_export_%s.csv', date('Ymd'));
-            $response = new CSVFileResponse($filename, function() use ($app, $buffer) {
+            $response = new CSVFileResponse($filename, function () use ($app, $buffer) {
                $app['csv.exporter']->export('php://output', $buffer);
            });

@@ -601,7 +601,7 @@ class Users implements ControllerProviderInterface
            $nbUsrToAdd = 0;

            $lines = array();
-            $app['csv.interpreter']->addObserver(function(array $row) use (&$lines) {
+            $app['csv.interpreter']->addObserver(function (array $row) use (&$lines) {
                $lines[] = $row;
            });
            $app['csv.lexer']->parse($file->getPathname(), $app['csv.interpreter']);
--- a/lib/Alchemy/Phrasea/Controller/Report/Activity.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Activity.php
@@ -307,8 +307,6 @@ class Activity implements ControllerProviderInterface

        $activity->setConfig(false);

-
-
        if ($request->request->get('printcsv') == 'on') {
            $activity->setHasLimit(false);
            $activity->setPrettyString(false);
@@ -860,13 +858,13 @@ class Activity implements ControllerProviderInterface
        $result = $report->getResult();
        array_unshift($result, $headers);

-        $collection = new CallbackCollection($result, function($row) use ($report) {
+        $collection = new CallbackCollection($result, function ($row) use ($report) {
            // restrict to displayed fields
            return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
        });

        $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd'));
-        $response = new CSVFileResponse($filename, function() use ($app, $collection) {
+        $response = new CSVFileResponse($filename, function () use ($app, $collection) {
            $app['csv.exporter']->export('php://output', $collection);
        });

--- a/lib/Alchemy/Phrasea/Controller/Report/Informations.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Informations.php
@@ -469,7 +469,6 @@ class Informations implements ControllerProviderInterface
            $reportArray = $info->buildTabGrpInfo(false, array(),  $request->request->get('user'), $conf, false);

            if ($request->request->get('printcsv') == 'on') {
-
                return $this->getCSVResponse($app, $info, 'info_user');
            }

@@ -518,13 +517,13 @@ class Informations implements ControllerProviderInterface
        $result = $report->getResult();
        array_unshift($result, $headers);

-        $collection = new CallbackCollection($result, function($row) use ($report) {
+        $collection = new CallbackCollection($result, function ($row) use ($report) {
            // restrict fields to the displayed ones
            return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
        });

        $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd'));
-        $response = new CSVFileResponse($filename, function() use ($app, $collection) {
+        $response = new CSVFileResponse($filename, function () use ($app, $collection) {
            $app['csv.exporter']->export('php://output', $collection);
        });

--- a/lib/Alchemy/Phrasea/Controller/Report/Root.php
+++ b/lib/Alchemy/Phrasea/Controller/Report/Root.php
@@ -18,7 +18,6 @@ use Silex\ControllerProviderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\ResponseHeaderBag;

 class Root implements ControllerProviderInterface
 {
@@ -89,7 +88,7 @@ class Root implements ControllerProviderInterface
        }

        $granted = array();
-        foreach($app['authentication']->getUser()->acl()->get_granted_base(array('canreport')) as $collection) {
+        foreach ($app['authentication']->getUser()->acl()->get_granted_base(array('canreport')) as $collection) {
            if (!isset($granted[$collection->get_sbas_id()])) {
                $granted[$collection->get_sbas_id()] = array(
                    'id' => $collection->get_sbas_id(),
@@ -483,28 +482,28 @@ class Root implements ControllerProviderInterface
            $result = array();

            $result[] = array_keys($conf_nav);
-            foreach($report['nav']['result'] as $row) {
+            foreach ($report['nav']['result'] as $row) {
                $result[] =  array_values($row);
            };
            $result[] = array_keys($conf_os);
-            foreach($report['os']['result'] as $row) {
+            foreach ($report['os']['result'] as $row) {
                $result[] =  array_values($row);
            };
            $result[] = array_keys($conf_res);
-            foreach($report['res']['result'] as $row) {
+            foreach ($report['res']['result'] as $row) {
                $result[] =  array_values($row);
            };
            $result[] = array_keys($conf_mod);
-            foreach($report['mod']['result'] as $row) {
+            foreach ($report['mod']['result'] as $row) {
                $result[] =  array_values($row);
            };
            $result[] = array_keys($conf_combo);
-            foreach($report['combo']['result'] as $row) {
+            foreach ($report['combo']['result'] as $row) {
                $result[] =  array_values($row);
            };

            $filename = sprintf('report_export_info_%s.csv', date('Ymd'));
-            $response = new CSVFileResponse($filename, function() use ($app, $result) {
+            $response = new CSVFileResponse($filename, function () use ($app, $result) {
                $app['csv.exporter']->export('php://output', $result);
            });

@@ -683,13 +682,13 @@ class Root implements ControllerProviderInterface
        $result = $report->getResult();
        array_unshift($result, $headers);

-        $collection = new CallbackCollection($result, function($row) use ($report) {
+        $collection = new CallbackCollection($result, function ($row) use ($report) {
            // restrict fields to the displayed ones
            return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
        });

        $filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd'));
-        $response = new CSVFileResponse($filename, function() use ($app, $collection) {
+        $response = new CSVFileResponse($filename, function () use ($app, $collection) {
            $app['csv.exporter']->export('php://output', $collection);
        });

--- a/lib/Alchemy/Phrasea/Controller/Root/Developers.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/Developers.php
@@ -230,7 +230,6 @@ class Developers implements ControllerProviderInterface
        return $app->json(array('success' => !$error));
    }

-
    /**
     * Change application webhook
     *
--- a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
+++ b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
@@ -825,8 +825,7 @@ class Xmlhttp implements ControllerProviderInterface
        $lcoll = '';
        $collections = $app['authentication']->getUser()->ACL()
            ->get_granted_base(array(), array($sbid)); // array(), $sbid);
-        foreach($collections as $collection)
-        {
+        foreach ($collections as $collection) {
            $lcoll .= ($lcoll?",":"") . $collection->get_coll_id();
        }
        $site = $app['phraseanet.configuration']['main']['key'];
--- a/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php
+++ b/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php
@@ -113,7 +113,7 @@ class SessionManagerSubscriber implements EventSubscriberInterface

        $idle = 0;
        if (isset($this->app["phraseanet.configuration"]["session"]["idle"])) {
-            $idle = (int)($this->app["phraseanet.configuration"]["session"]["idle"]);
+            $idle = (int) ($this->app["phraseanet.configuration"]["session"]["idle"]);
        }
        $now = new \DateTime();
        $dt = $now->getTimestamp() - $session->getUpdated()->getTimestamp();
--- a/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php
@@ -26,6 +26,7 @@ class CSVServiceProvider implements ServiceProviderInterface
    {
        $app['csv.exporter.config'] = $app->share(function () {
            $config = new ExporterConfig();
+
            return $config
                ->setDelimiter(";")
                ->setEnclosure('"')
--- a/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php
@@ -23,19 +23,19 @@ class PhraseaEventServiceProvider implements ServiceProviderInterface
 {
    public function register(Application $app)
    {
-        $app['phraseanet.logout-subscriber'] = $app->share(function(Application $app) {
+        $app['phraseanet.logout-subscriber'] = $app->share(function (Application $app) {
            return new LogoutSubscriber();
        });
-        $app['phraseanet.locale-subscriber'] = $app->share(function(Application $app) {
+        $app['phraseanet.locale-subscriber'] = $app->share(function (Application $app) {
            return new PhraseaLocaleSubscriber($app);
        });
-        $app['phraseanet.maintenance-subscriber'] = $app->share(function(Application $app) {
+        $app['phraseanet.maintenance-subscriber'] = $app->share(function (Application $app) {
            return new MaintenanceSubscriber($app);
        });
-        $app['phraseanet.cookie-disabler-subscriber'] = $app->share(function(Application $app) {
+        $app['phraseanet.cookie-disabler-subscriber'] = $app->share(function (Application $app) {
            return new CookiesDisablerSubscriber($app);
        });
-        $app['phraseanet.session-manager-subscriber'] = $app->share(function(Application $app) {
+        $app['phraseanet.session-manager-subscriber'] = $app->share(function (Application $app) {
            return new SessionManagerSubscriber($app);
        });
    }
--- a/lib/Alchemy/Phrasea/Notification/Deliverer.php
+++ b/lib/Alchemy/Phrasea/Notification/Deliverer.php
@@ -11,7 +11,6 @@

 namespace Alchemy\Phrasea\Notification;

-use Alchemy\Phrasea\Notification\EmitterInterface;
 use Alchemy\Phrasea\Notification\Mail\MailInterface;
 use Alchemy\Phrasea\Exception\LogicException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
--- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
+++ b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
@@ -12,8 +12,6 @@
 namespace Alchemy\Phrasea\SearchEngine;

 use Alchemy\Phrasea\Application;
-use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
-use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
 use Alchemy\Phrasea\Exception\RuntimeException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Doctrine\Common\Collections\ArrayCollection;
--- a/lib/classes/API/Webhook.php
+++ b/lib/classes/API/Webhook.php
@@ -9,7 +9,6 @@
 * file that was distributed with this source code.
 */

-use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\Exception\RuntimeException;

 class API_Webhook
--- a/lib/classes/Feed/Collection.php
+++ b/lib/classes/Feed/Collection.php
@@ -122,7 +122,7 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf
        try {
            $feedIds = $collection->get_data_from_cache(self::CACHE_PUBLIC);

-            return new self($app, array_map(function($id) use ($app) {
+            return new self($app, array_map(function ($id) use ($app) {
                return new \Feed_Adapter($app, $id);
            }, $feedIds));
        } catch (CacheException $e) {
@@ -140,7 +140,7 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf
            $feeds[] = new \Feed_Adapter($app, $row['id']);
        }

-        $collection->set_data_to_cache(array_map(function($feed) {
+        $collection->set_data_to_cache(array_map(function ($feed) {
            return $feed->get_id();
        }, $feeds), self::CACHE_PUBLIC);

--- a/lib/classes/caption/Field/Value.php
+++ b/lib/classes/caption/Field/Value.php
@@ -397,14 +397,13 @@ class caption_Field_Value implements cache_cacheableInterface
            $note += ($node->getAttribute("w") == $term_noacc) ? 2 : 0;
            if($context_noacc != "")
                $note += ($node->getAttribute("k") == $context_noacc) ? 1 : 0;
-            if($note > $bestnote)
-            {
+            if ($note > $bestnote) {
                $bestnote = $note;
                $bestnode = $node;
            }
        }

-        if($bestnode) {
+        if ($bestnode) {
            list($term, $context) = $this->splitTermAndContext(str_replace(array("[[em]]", "[[/em]]"), array("", ""), $value));
            // a value has been found in thesaurus, update value & set the query to bounce to the value
            $this->value = $bestnode->getAttribute('v');
@@ -414,7 +413,6 @@ class caption_Field_Value implements cache_cacheableInterface
            $this->isThesaurusValue = false;
        }

-
        return $this;
    }

--- a/lib/classes/patch/384alpha3a.php
+++ b/lib/classes/patch/384alpha3a.php
@@ -10,8 +10,6 @@
 */

 use Alchemy\Phrasea\Application;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Filesystem\Filesystem;

 class patch_384alpha3a implements patchInterface
 {
--- a/lib/classes/patch/384alpha4a.php
+++ b/lib/classes/patch/384alpha4a.php
@@ -10,8 +10,6 @@
 */

 use Alchemy\Phrasea\Application;
-use Symfony\Component\Finder\Finder;
-use Symfony\Component\Filesystem\Filesystem;

 class patch_384alpha4a implements patchInterface
 {
--- a/lib/classes/task/period/apiwebhooks.php
+++ b/lib/classes/task/period/apiwebhooks.php
@@ -65,7 +65,7 @@ class task_period_apiwebhooks extends task_appboxAbstract
        $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
        $stmt->closeCursor();

-        return array_map(function($row) {
+        return array_map(function ($row) {
            return $row['webhook_url'];
        }, $rows);
    }
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -162,4 +162,3 @@ session:
  idle: 0
  # 1 week
  lifetime: 604800
-
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Application;

 use Symfony\Component\HttpFoundation\Response;

-class ApiJSONPApplication extends ApiAbstract
+class ApiJSONPTest extends ApiAbstract
 {

    protected function evaluateResponseBadRequest(Response $response)
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Application;

-class ApiJsonApplication extends ApiAbstract
+class ApiJsonTest extends ApiAbstract
 {

    public function getParameters(array $parameters = array())
--- a/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Application;

-class ApiYamlApplication extends ApiAbstract
+class ApiYamlTest extends ApiAbstract
 {

    public function getParameters(array $parameters = array())
--- a/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
@@ -9,7 +9,7 @@ use Alchemy\Phrasea\Authentication\Context;
 * Test oauthv2 flow based on ietf authv2 spec
 * @link http://tools.ietf.org/html/draft-ietf-oauth-v2-18
 */
-class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class OAuth2Test extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    /**
     *
--- a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Application;
 use Alchemy\Phrasea\Border\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

-class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class OverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    public function testDatafilesRouteAuthenticated()
    {
--- a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
@@ -2,7 +2,6 @@

 namespace Alchemy\Phrasea\Authentication\PersistentCookie;

-use Alchemy\Phrasea\Authentication\PersistentCookie\Manager;
 use Entities\Session;

 class ManagerTest extends \PHPUnit_Framework_TestCase
--- a/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Cache;

 use \Alchemy\Phrasea\Cache\RedisCache;

-class RedisTest extends \PhraseanetPHPUnitAbstract
+class RedisCacheTest extends \PhraseanetPHPUnitAbstract
 {

    public function testBasics()
--- a/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
@@ -2,8 +2,6 @@

 namespace Alchemy\Phrasea\Command\Compile;

-use Alchemy\Phrasea\Command\Compile\Configuration;
-
 class ConfigurationTest extends \PhraseanetPHPUnitAbstract
 {
    public function testExecute()
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin;
 use PHPExiftool\Driver\Tag\IPTC\ObjectName;
 use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;

-class ControllerFieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class FieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    public function testRoot()
    {
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Admin;

-class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class PublicationTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    public static $account = null;
    public static $api = null;
--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin;

 use Alchemy\Phrasea\Media\Subdef\Image;

-class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class SubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Admin;

-class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class UsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;
    protected $usersParameters;
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;

 use Alchemy\Phrasea\Application;

-class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class BasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;

 require_once __DIR__ . '/../../../../../classes/Bridge/Bridge_datas.inc';

-class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class BridgeTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    public static $account = null;
    public static $api = null;
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerEditTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class EditTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
 use Alchemy\Phrasea\Application;
 use Symfony\Component\CssSelector\CssSelector;

-class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    /**
     *
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerLanguageTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class LanguageTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
@@ -3,7 +3,6 @@
 namespace Alchemy\Tests\Phrasea\Controller\Prod;

 use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
-use Alchemy\Phrasea\Core\Event\Subscriber\SessionManagerSubscriber;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\HttpFoundation\Response;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerMoveCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class MoveCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerPrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class PrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerPushTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class PushTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerRootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;

 use Symfony\Component\HttpKernel\Client;

-class ControllerStoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class StoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    public function testRootPost()
    {
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;

 use Symfony\Component\HttpFoundation\File\UploadedFile;

-class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class ToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;
    protected $tmpFile;
--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;

 use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;

-class ControllerTooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class TooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class UsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {
    protected $client;

--- a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Controller\Prod;

-class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
+class WorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
 {

    protected $client;
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
@@ -1838,7 +1838,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
            foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
                self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();

-                foreach( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
+                foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
                    $databox->update_cgus($lng, '', false);
                }
            }
@@ -1852,7 +1852,7 @@ class LoginTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
            foreach (self::$DI['app']['phraseanet.appbox']->get_databoxes() as $databox) {
                self::$termsOfUse[$databox->get_sbas_id()] = $databox->get_cgus();

-                foreach( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
+                foreach ( self::$termsOfUse[$databox->get_sbas_id()]as $lng => $tou) {
                    $databox->update_cgus($lng, 'something', false);
                }
            }
--- a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
@@ -7,7 +7,7 @@ require_once __DIR__ . '/../../../../../classes/FeedValidator.inc';
 use Alchemy\Phrasea\Application;
 use Symfony\Component\HttpFoundation\Response;

-class RssFeedTest extends \PhraseanetWebTestCaseAbstract
+class RSSFeedTest extends \PhraseanetWebTestCaseAbstract
 {
    /**
     *
--- a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/ComposerSetupServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/ComposerSetupServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\CLIProvider;
 /**
 * @covers Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider
 */
-class ComposerSetupServiceProvidertest extends ServiceProviderTestCase
+class ComposerSetupServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/LessBuilderServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/LessBuilderServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\CLIProvider;
 /**
 * @covers Alchemy\Phrasea\Core\CLIProvider\LessBuilderServiceProvider
 */
-class LessBuilderServiceProvidertest extends ServiceProviderTestCase
+class LessBuilderServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/PluginServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/PluginServiceProviderTest.php
@@ -8,7 +8,7 @@ use Symfony\Component\Process\ExecutableFinder;
 /**
 * @covers Alchemy\Phrasea\Core\CLIProvider\PluginServiceProvider
 */
-class PluginServiceProvidertest extends ServiceProviderTestCase
+class PluginServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php
@@ -200,7 +200,6 @@ class SessionManagerSubscriberTest extends \PhraseanetWebTestCaseAuthenticatedAb
        $app['EM'] = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock();
        $app['EM']->expects($this->never())->method('flush');

-
        $app->get('/login', function () {
            return '';
        })->bind("homepage");
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php
@@ -11,7 +11,7 @@ use Silex\Application;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider
 */
-class AuthenticationManagerServiceProvidertest extends ServiceProviderTestCase
+class AuthenticationManagerServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
@@ -11,7 +11,7 @@ use XPDF\XPDFServiceProvider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider
 */
-class BorderManagerServiceProvidertest extends ServiceProviderTestCase
+class BorderManagerServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\BrowserServiceProvider
 */
-class BrowserServiceProvidertest extends ServiceProviderTestCase
+class BrowserServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\CacheServiceProvider
 */
-class CacheServiceProvidertest extends ServiceProviderTestCase
+class CacheServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
@@ -10,7 +10,7 @@ use Symfony\Component\HttpKernel\Client;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider
 */
-class ConfigurationServiceProvidertest extends ServiceProviderTestCase
+class ConfigurationServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\ConfigurationTesterServiceProvider
 */
-class ConfigurationTesterServiceProvidertest extends ServiceProviderTestCase
+class ConfigurationTesterServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;

 use Alchemy\Phrasea\Core\Provider\FtpServiceProvider;

-class FTPServiceProvidertest extends \PhraseanetPHPUnitAbstract
+class FTPServiceProviderTest extends \PhraseanetPHPUnitAbstract
 {
    public function testGetInstantiate()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/JMSSerializerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/JMSSerializerServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\JMSServiceProviderServiceProvider
 */
-class JMSServiceProviderServiceProvidertest extends ServiceProviderTestCase
+class JMSSerializerServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
@@ -8,7 +8,7 @@ use Alchemy\Phrasea\Core\Provider\LocaleServiceProvider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\LocaleServiceProvider
 */
-class LocaleServiceProvidertest extends \PhraseanetPHPUnitAbstract
+class LocaleServiceProviderTest extends \PhraseanetPHPUnitAbstract
 {
    public function testLocalesAvailable()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/NotificationDelivererServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/NotificationDelivererServiceProviderTest.php
@@ -7,7 +7,7 @@ use Alchemy\Phrasea\Core\Provider\NotificationDelivererServiceProvider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\NotificationDelivererServiceProvider
 */
-class NotificationDelivererServiceProvidertest extends ServiceProviderTestCase
+class NotificationDelivererServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\ORMServiceProvider
 */
-class ORMServiceProvidertest extends ServiceProviderTestCase
+class ORMServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseaVersionServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseaVersionServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\PhraseaVersionServiceProvider
 */
-class PhraseaVersionServiceProvidertest extends ServiceProviderTestCase
+class PhraseaVersionServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
@@ -2,7 +2,7 @@

 namespace Alchemy\Tests\Phrasea\Core\Provider;

-class PhraseanetServiceProvidertest extends ServiceProviderTestCase
+class PhraseanetServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
@@ -7,7 +7,7 @@ use Alchemy\Phrasea\Core\Provider\RegistrationServiceProvider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\RegistrationServiceProvider
 */
-class RegistrationServiceProvidertest extends \PhraseanetPHPUnitAbstract
+class RegistrationServiceProviderTest extends \PhraseanetPHPUnitAbstract
 {
    public function testSameInstanceShouldBereturnedEveryTime()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\SearchEngineServiceProvider
 */
-class SearchEngineServiceProvidertest extends ServiceProviderTestCase
+class SearchEngineServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\TaskManagerServiceProvider
 */
-class TaskManagerServiceProvidertest extends ServiceProviderTestCase
+class TaskManagerServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider
 */
-class TemporaryFilesystemServiceProvidertest extends ServiceProviderTestCase
+class TemporaryFilesystemServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/TokensServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/TokensServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\TokensServiceProvider
 */
-class TokensServiceProvidertest extends ServiceProviderTestCase
+class TokensServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
 /**
 * @covers Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider
 */
-class UnicodeServiceProvidertest extends ServiceProviderTestCase
+class UnicodeServiceProviderTest extends ServiceProviderTestCase
 {
    public function provideServiceDescription()
    {
--- a/tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Http\XSendFile;
 use Alchemy\Phrasea\Http\XSendFile\NginxMode;
 use Symfony\Component\HttpFoundation\Request;

-class XSendFileModeNginxTest extends \PhraseanetPHPUnitAbstract
+class NginxModeTest extends \PhraseanetPHPUnitAbstract
 {
    public function testGetVirtualHost()
    {
--- a/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Metadata\Tag;

 use Alchemy\Phrasea\Metadata\Tag\TfEditdate;

-class TfEditdateTest extends \PHPUnit_Framework_TestCase
+class TfEditDateTest extends \PHPUnit_Framework_TestCase
 {

    /**
--- a/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Metadata\Tag;

 use Alchemy\Phrasea\Metadata\Tag\TfMimetype;

-class TfMimetypeTest extends \PHPUnit_Framework_TestCase
+class TfMimeTypeTest extends \PHPUnit_Framework_TestCase
 {

    /**
--- a/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;

 use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
 use Alchemy\Phrasea\SearchEngine\Phrasea\ConfigurationPanel;
-use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;

 class PhraseaConfigurationPanelTest extends ConfigurationPanelAbstractTest
 {
--- a/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
@@ -3,7 +3,6 @@
 namespace Alchemy\Tests\Phrasea\SearchEngine;

 use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
-use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
 use Symfony\Component\Process\Process;

 /**
--- a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;

 use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\ConfigurationPanel;
-use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;

 class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest
 {
--- a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
+++ b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;

 use Alchemy\Phrasea\Application;
 use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
-use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
 use Symfony\Component\Process\ExecutableFinder;
 use Symfony\Component\Process\Process;

--- a/tests/classes/PhraseanetPHPUnitAbstract.php
+++ b/tests/classes/PhraseanetPHPUnitAbstract.php
@@ -8,7 +8,6 @@ use Silex\WebTestCase;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Client;
 use Symfony\Component\DomCrawler\Crawler;
-use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
 use Symfony\Component\Routing\RequestContext;

 abstract class PhraseanetPHPUnitAbstract extends WebTestCase