diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 3e0d6aea22..8c15144e23 100644 --- 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(); }); diff --git a/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthentication.php b/lib/Alchemy/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthentication.php index 0cf42bf1ab..66481fc736 100644 --- 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 diff --git a/lib/Alchemy/Phrasea/Border/Attribute/Factory.php b/lib/Alchemy/Phrasea/Border/Attribute/Factory.php index 741c262281..8ff5853e30 100644 --- a/lib/Alchemy/Phrasea/Border/Attribute/Factory.php +++ b/lib/Alchemy/Phrasea/Border/Attribute/Factory.php @@ -23,11 +23,11 @@ class Factory /** * Build a file package Attribute * - * @param Application $app Application context - * @param string $name The name of the attribute, one of the - * AttributeInterface::NAME_* constants - * @param string $serialized The serialized value of the attribute - * (AttributeInterface::asString result) + * @param Application $app Application context + * @param string $name The name of the attribute, one of the + * AttributeInterface::NAME_* constants + * @param string $serialized The serialized value of the attribute + * (AttributeInterface::asString result) * @return AttributeInterface The attribute * @throws \InvalidArgumentException */ diff --git a/lib/Alchemy/Phrasea/Border/File.php b/lib/Alchemy/Phrasea/Border/File.php index f588d8c14d..3f2f59bbf8 100644 --- a/lib/Alchemy/Phrasea/Border/File.php +++ b/lib/Alchemy/Phrasea/Border/File.php @@ -59,8 +59,8 @@ class File * @param MediaInterface $media The media * @param \collection $collection The destination collection * @param string $originalName The original name of the file - * (if not provided, original name is - * extracted from the pathfile) + * (if not provided, original name is + * extracted from the pathfile) */ public function __construct(Application $app, MediaInterface $media, \collection $collection, $originalName = null) { @@ -276,11 +276,11 @@ class File /** * Build the File package object * - * @param string $pathfile The path to the file - * @param \collection $collection The destination collection - * @param Application $app An application - * @param string $originalName An optionnal original name (if - * different from the $pathfile filename) + * @param string $pathfile The path to the file + * @param \collection $collection The destination collection + * @param Application $app An application + * @param string $originalName An optionnal original name (if + * different from the $pathfile filename) * @throws \InvalidArgumentException * * @return File diff --git a/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php b/lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php index e870d91c7b..e210bbe7d7 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Cache/Factory.php b/lib/Alchemy/Phrasea/Cache/Factory.php index 70a6774d29..df4bfe9a36 100644 --- 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 diff --git a/lib/Alchemy/Phrasea/Cache/Manager.php b/lib/Alchemy/Phrasea/Cache/Manager.php index c3691f9d8d..4f97c3f4c2 100644 --- 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 diff --git a/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php b/lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php index c7c529017d..7054b86fec 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php b/lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php index 293a3fd247..048fd68452 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Command/CreateCollection.php b/lib/Alchemy/Phrasea/Command/CreateCollection.php index 534197405a..a929288986 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Command/RecordAdd.php b/lib/Alchemy/Phrasea/Command/RecordAdd.php index 8c1d92d6d3..26ccd35245 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php b/lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php index bec2563a8f..fe5bdaca58 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php b/lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php index 9006abc3f5..6d14b986e2 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/Controller/Admin/Users.php b/lib/Alchemy/Phrasea/Controller/Admin/Users.php index 4f3cd5c303..b5295f76cf 100644 --- 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']); diff --git a/lib/Alchemy/Phrasea/Controller/Report/Activity.php b/lib/Alchemy/Phrasea/Controller/Report/Activity.php index 1bc3ce747d..f258e92b43 100644 --- 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); }); diff --git a/lib/Alchemy/Phrasea/Controller/Report/Informations.php b/lib/Alchemy/Phrasea/Controller/Report/Informations.php index 3f67be42b7..6a6503f193 100644 --- 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); }); diff --git a/lib/Alchemy/Phrasea/Controller/Report/Root.php b/lib/Alchemy/Phrasea/Controller/Report/Root.php index 2062c5b6c6..252a7481bb 100644 --- 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); }); diff --git a/lib/Alchemy/Phrasea/Controller/Root/Developers.php b/lib/Alchemy/Phrasea/Controller/Root/Developers.php index d4c9b10e15..fd8c2cf7a8 100644 --- 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 * diff --git a/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php b/lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php index 1d1c2960e9..8de286d0d5 100644 --- 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']; diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php index 16747e7dab..0b3481a059 100644 --- 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(); diff --git a/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php index c1be7977a4..540224149f 100644 --- 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('"') diff --git a/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php index 0524371f9b..1fda4c978b 100644 --- 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); }); } diff --git a/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php b/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php index 19863dfcee..da223582a7 100644 --- a/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php +++ b/lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php @@ -40,4 +40,4 @@ class CSVFileResponse extends StreamedResponse false === preg_match('/^[\x20-\x7e]*$/', $filename) ? '' : preg_replace('/[^(x20-x7F)]*$/', '', $filename) )); } -} \ No newline at end of file +} diff --git a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php index 87db6205b0..32a4d43ebc 100644 --- a/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php +++ b/lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php @@ -70,7 +70,7 @@ class H264Factory /** * Creates a new instance of H264 Factory given a configuration. * - * @param Application $app + * @param Application $app * * @return H264Factory */ diff --git a/lib/Alchemy/Phrasea/Notification/Deliverer.php b/lib/Alchemy/Phrasea/Notification/Deliverer.php index a03946a586..79534b4d00 100644 --- 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; diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index c72ba6bd56..a626ae5e93 100644 --- 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; diff --git a/lib/classes/API/Webhook.php b/lib/classes/API/Webhook.php index 47c1984443..413ff913a9 100644 --- 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 diff --git a/lib/classes/Feed/Collection.php b/lib/classes/Feed/Collection.php index 49d86c10d8..071893be9b 100644 --- a/lib/classes/Feed/Collection.php +++ b/lib/classes/Feed/Collection.php @@ -50,9 +50,9 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf /** * - * @param Application $app - * @param User_Adapter $user - * @param array $reduce + * @param Application $app + * @param User_Adapter $user + * @param array $reduce * * @return Feed_Collection */ @@ -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); diff --git a/lib/classes/ZipArchiveImproved.php b/lib/classes/ZipArchiveImproved.php index 09750a58ee..bcb9680f67 100644 --- a/lib/classes/ZipArchiveImproved.php +++ b/lib/classes/ZipArchiveImproved.php @@ -59,7 +59,7 @@ class ZipArchiveImproved extends ZipArchive * * @param string $fileName * @param int $flags - * return mixed + * return mixed */ public function open($fileName, $flags = null) { diff --git a/lib/classes/caption/Field/Value.php b/lib/classes/caption/Field/Value.php index 6e5781f503..81c5e83f66 100644 --- 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; } diff --git a/lib/classes/module/report.php b/lib/classes/module/report.php index f94d66bd07..729bb0e9ab 100644 --- a/lib/classes/module/report.php +++ b/lib/classes/module/report.php @@ -767,12 +767,12 @@ class module_report /** * @desc Set your own configuration for each column displayed in the html table - * @param array $tab contain your conf's variables - * array( 'field' => - * array('title of the colum', '1 = order ON / 0 = order OFF', - * '1 = bound ON / 0 = bound OFF') + * @param array $tab contain your conf's variables + * array( 'field' => + * array('title of the colum', '1 = order ON / 0 = order OFF', + * '1 = bound ON / 0 = bound OFF') * @example $tab = array('user' => array('user list', 1, 0), - * 'id' => array(user id, 0, 0)); etc .. + * 'id' => array(user id, 0, 0)); etc .. * @return void */ protected function setConfigColumn($tab) diff --git a/lib/classes/module/report/connexion.php b/lib/classes/module/report/connexion.php index b5af9171ad..ea7562ebfb 100644 --- a/lib/classes/module/report/connexion.php +++ b/lib/classes/module/report/connexion.php @@ -91,8 +91,8 @@ class module_report_connexion extends module_report /** * @desc build the result from the specified sql - * @param array $champ all the field from the request displayed in a array - * @param string $sql the request from buildreq + * @param array $champ all the field from the request displayed in a array + * @param string $sql the request from buildreq * @return $this->result */ protected function buildResult(Application $app, $rs) diff --git a/lib/classes/module/report/download.php b/lib/classes/module/report/download.php index de06639877..9f0958d6fc 100644 --- a/lib/classes/module/report/download.php +++ b/lib/classes/module/report/download.php @@ -94,8 +94,8 @@ class module_report_download extends module_report /** * @desc build the result from the specified sql - * @param array $champ all the field from the request displayed in a array - * @param string $sql the request from buildreq + * @param array $champ all the field from the request displayed in a array + * @param string $sql the request from buildreq * @return $this->result */ protected function buildResult(Application $app, $rs) diff --git a/lib/classes/patch/384alpha3a.php b/lib/classes/patch/384alpha3a.php index 847edc30a9..ec274b0545 100644 --- 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 { diff --git a/lib/classes/patch/384alpha4a.php b/lib/classes/patch/384alpha4a.php index e9cbcd2528..5f0bf58a36 100644 --- 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 { diff --git a/lib/classes/task/abstract.php b/lib/classes/task/abstract.php index a2280a6754..8bf5a2f3d5 100644 --- a/lib/classes/task/abstract.php +++ b/lib/classes/task/abstract.php @@ -506,8 +506,8 @@ abstract class task_abstract /** * * @return null|integer - * pid (int) of the task - * NULL : the pid file is not locked (task no running) + * pid (int) of the task + * NULL : the pid file is not locked (task no running) */ public function getPID() { diff --git a/lib/classes/task/period/apiwebhooks.php b/lib/classes/task/period/apiwebhooks.php index c5fdef1476..20532cd272 100644 --- 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); } diff --git a/lib/classes/uuid.php b/lib/classes/uuid.php index e5d783fb4a..94655c3059 100644 --- a/lib/classes/uuid.php +++ b/lib/classes/uuid.php @@ -134,7 +134,7 @@ class uuid * @param stiring $uuid1 * @param string $uuid2 * @return int - * -1 uuid1uuid2 + * -1 uuid1uuid2 */ public static function compare($uuid1, $uuid2) { diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml index 089e4bd557..b3e8bb3031 100644 --- a/lib/conf.d/configuration.yml +++ b/lib/conf.d/configuration.yml @@ -158,8 +158,7 @@ api_cors: expose_headers: [] max_age: 0 hosts: [] -session: +session: idle: 0 # 1 week lifetime: 604800 - diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php index 71fa87ae1b..dd27410dfc 100644 --- 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) diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php index a817e84f18..511fcea7d3 100644 --- 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()) diff --git a/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php b/tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php index 39ac6a3f2a..efa77da4f3 100644 --- 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()) diff --git a/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php b/tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php index 8427cd95b6..b695aa041e 100644 --- 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 { /** * diff --git a/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php b/tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php index 7f831f4b9b..4b3077588b 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php index d0a8f3ee22..b299db6665 100644 --- 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 diff --git a/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php b/tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php index 2a3ca54a8e..e9fd8bb64c 100644 --- 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() diff --git a/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php b/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php index 7afc9e44b9..d024291166 100644 --- 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() diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php index 1f0576507e..c486cfcbd3 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php index 509bb1f743..f1bd643a53 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php index 9574fbd3c4..5fd9b07fa2 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php index 5fdf41dd48..47fe106700 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php index 6e982f8a1b..2e98181480 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php index 80351c9789..0772c14c28 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php index 2a3d82dfb1..50e0eca46f 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php index ab18d8a17c..a6ed5482bf 100644 --- 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 { /** * diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php index 2137a323c9..83be4f4d46 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php index f05af7292f..33dd435891 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php index bdc94005c9..288ef14832 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php index 64455f6790..081df2ad2f 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php index 97ebc09f73..f0bef9bb60 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php index e797968daa..4e0b10021d 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php index f88dc50f59..91ca2ada5d 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php index d822d24046..5eeb80d051 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php index 600f61c683..7184a1713f 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php index a186d312ff..f2e89b8db6 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php index 2b1e649824..03dc97a63d 100644 --- 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; diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php index 66024c723b..2359ed0c8b 100644 --- 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); } } diff --git a/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php b/tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php index 685137dd36..d08e5dd8cb 100644 --- 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 { /** * diff --git a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/ComposerSetupServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/ComposerSetupServiceProviderTest.php index c160e92a92..bc1b724fee 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/LessBuilderServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/LessBuilderServiceProviderTest.php index a8f54e87c0..5568e5597a 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/PluginServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/CLIProvider/PluginServiceProviderTest.php index bcbedff10b..06d137b023 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php b/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php index e27747f75d..45a7d1245c 100644 --- 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"); diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php index af9dd08ef3..578e99304a 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php index b141577c4f..a934e6dba2 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php index 9636d5f32e..a049993022 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php index ebc16fcc8d..63072dd1b2 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php index ad3d3a86a6..3e1f675500 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php index 7fce108fe4..d5801f413a 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php index 58c8d70669..9baf86888f 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/JMSSerializerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/JMSSerializerServiceProviderTest.php index 737fb7c922..cbf87a87c1 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php index 0189e5671f..badd61b7d7 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/NotificationDelivererServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/NotificationDelivererServiceProviderTest.php index cdf170d6d2..7c24283a1b 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php index 091c349390..9d4c8eac87 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseaVersionServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseaVersionServiceProviderTest.php index 682a0e1d2a..2952c9bcd4 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php index f28c5f6c3c..7ed4dc6f4f 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php index 9ae4b47101..da93b4a965 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php index 78932d60e7..29014eb79b 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php index 203874a88d..3c43823c06 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php index b3535f5682..14b6bc8da1 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/TokensServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/TokensServiceProviderTest.php index de74d7a645..6bcc2b32dc 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php b/tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php index dff848d312..a5fb7c7577 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php b/tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php index 38685e359f..228de24f3d 100644 --- 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() { diff --git a/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php index 416e18cb56..9958cb1a28 100644 --- 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 { /** diff --git a/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php b/tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php index b2b176f6ab..50001cfca9 100644 --- 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 { /** diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php index 19f1ec5c99..03d39bfac1 100644 --- 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 { diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php index 024250c6f1..655a1f5b7d 100644 --- 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; /** diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php index 8a4ab92015..04e7215867 100644 --- 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 { diff --git a/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php b/tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php index 19fb9595cd..1b35ff7b13 100644 --- 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; diff --git a/tests/classes/PhraseanetPHPUnitAbstract.php b/tests/classes/PhraseanetPHPUnitAbstract.php index 7938bd1f57..e0c14d859b 100644 --- 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