hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHP CS fix

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-05-30 15:22:00 +02:00
parent 8dd6512cf8
commit e5b8817c46
99 changed files with 113 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Alchemy/Phrasea/Application.php
View File

@@ -67,16 +67,9 @@ use Alchemy\Phrasea\Controller\Root\Session;
use Alchemy\Phrasea\Controller\Setup as SetupController; use Alchemy\Phrasea\Controller\Setup as SetupController;
use Alchemy\Phrasea\Controller\Thesaurus\Thesaurus; use Alchemy\Phrasea\Controller\Thesaurus\Thesaurus;
use Alchemy\Phrasea\Controller\Thesaurus\Xmlhttp as ThesaurusXMLHttp; 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\Notifications;
use Alchemy\Phrasea\Controller\User\Preferences; use Alchemy\Phrasea\Controller\User\Preferences;
use Alchemy\Phrasea\Core\Event\Subscriber\SessionManagerSubscriber;
use Alchemy\Phrasea\Core\PhraseaExceptionHandler; 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\AuthenticationManagerServiceProvider;
use Alchemy\Phrasea\Core\Provider\BrowserServiceProvider; use Alchemy\Phrasea\Core\Provider\BrowserServiceProvider;
use Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider; 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\TokensServiceProvider;
use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider; use Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider;
use Alchemy\Phrasea\Exception\InvalidArgumentException; use Alchemy\Phrasea\Exception\InvalidArgumentException;
use Alchemy\Phrasea\Exception\LogicException;
use Alchemy\Phrasea\Twig\JSUniqueID; use Alchemy\Phrasea\Twig\JSUniqueID;
use Alchemy\Phrasea\Twig\Fit; use Alchemy\Phrasea\Twig\Fit;
use Alchemy\Phrasea\Twig\Camelize; use Alchemy\Phrasea\Twig\Camelize;
@@ -136,10 +128,8 @@ use XPDF\XPDFServiceProvider;
use Symfony\Component\HttpKernel\Event\FilterResponseEvent; use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGenerator; use Symfony\Component\Routing\Generator\UrlGenerator;
use Symfony\Component\Form\FormFactory; use Symfony\Component\Form\FormFactory;
use Symfony\Component\Form\FormTypeInterface; use Symfony\Component\Form\FormTypeInterface;
@@ -284,7 +274,7 @@ class Application extends SilexApplication
'session.test' => $this->getEnvironment() === static::ENV_TEST, 'session.test' => $this->getEnvironment() === static::ENV_TEST,
'session.storage.options' => array('cookie_lifetime' => 0) '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(); return new MockArraySessionStorage();
}); });

1
lib/Alchemy/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthentication.php
View File

@@ -3,7 +3,6 @@
namespace Alchemy\Phrasea\Authentication\Phrasea; namespace Alchemy\Phrasea\Authentication\Phrasea;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Authentication\Phrasea\FailureManager;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
class FailureHandledNativeAuthentication implements PasswordAuthenticationInterface class FailureHandledNativeAuthentication implements PasswordAuthenticationInterface

10
lib/Alchemy/Phrasea/Border/Attribute/Factory.php
View File

@@ -23,11 +23,11 @@ class Factory
/** /**
* Build a file package Attribute * Build a file package Attribute
* *
* @param Application $app Application context * @param Application $app Application context
* @param string $name The name of the attribute, one of the * @param string $name The name of the attribute, one of the
* AttributeInterface::NAME_* constants * AttributeInterface::NAME_* constants
* @param string $serialized The serialized value of the attribute * @param string $serialized The serialized value of the attribute
* (AttributeInterface::asString result) * (AttributeInterface::asString result)
* @return AttributeInterface The attribute * @return AttributeInterface The attribute
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
*/ */

14
lib/Alchemy/Phrasea/Border/File.php
View File

@@ -59,8 +59,8 @@ class File
* @param MediaInterface $media The media * @param MediaInterface $media The media
* @param \collection $collection The destination collection * @param \collection $collection The destination collection
* @param string $originalName The original name of the file * @param string $originalName The original name of the file
* (if not provided, original name is * (if not provided, original name is
* extracted from the pathfile) * extracted from the pathfile)
*/ */
public function __construct(Application $app, MediaInterface $media, \collection $collection, $originalName = null) public function __construct(Application $app, MediaInterface $media, \collection $collection, $originalName = null)
{ {
@@ -276,11 +276,11 @@ class File
/** /**
* Build the File package object * Build the File package object
* *
* @param string $pathfile The path to the file * @param string $pathfile The path to the file
* @param \collection $collection The destination collection * @param \collection $collection The destination collection
* @param Application $app An application * @param Application $app An application
* @param string $originalName An optionnal original name (if * @param string $originalName An optionnal original name (if
* different from the $pathfile filename) * different from the $pathfile filename)
* @throws \InvalidArgumentException * @throws \InvalidArgumentException
* *
* @return File * @return File

1
lib/Alchemy/Phrasea/Border/MimeGuesserConfiguration.php
View File

@@ -12,7 +12,6 @@
namespace Alchemy\Phrasea\Border; namespace Alchemy\Phrasea\Border;
use Alchemy\Phrasea\Core\Configuration\Configuration; use Alchemy\Phrasea\Core\Configuration\Configuration;
use Alchemy\Phrasea\Media\MimeTypeGuesser as AlchemyMimeTypeGuesser;
use MediaVorus\Utils\AudioMimeTypeGuesser; use MediaVorus\Utils\AudioMimeTypeGuesser;
use MediaVorus\Utils\PostScriptMimeTypeGuesser; use MediaVorus\Utils\PostScriptMimeTypeGuesser;
use MediaVorus\Utils\RawImageMimeTypeGuesser; use MediaVorus\Utils\RawImageMimeTypeGuesser;

7
lib/Alchemy/Phrasea/Cache/Factory.php
View File

@@ -11,13 +11,6 @@
namespace Alchemy\Phrasea\Cache; 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; use Alchemy\Phrasea\Exception\RuntimeException;
class Factory class Factory

2
lib/Alchemy/Phrasea/Cache/Manager.php
View File

@@ -13,8 +13,6 @@ namespace Alchemy\Phrasea\Cache;
use Alchemy\Phrasea\Exception\RuntimeException; use Alchemy\Phrasea\Exception\RuntimeException;
use Alchemy\Phrasea\Core\Configuration\Compiler; use Alchemy\Phrasea\Core\Configuration\Compiler;
use Alchemy\Phrasea\Cache\Cache;
use Alchemy\Phrasea\Cache\Factory;
use Monolog\Logger; use Monolog\Logger;
class Manager class Manager

1
lib/Alchemy/Phrasea/Command/AbstractCheckCommand.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;

1
lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;

1
lib/Alchemy/Phrasea/Command/CreateCollection.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Alchemy\Phrasea\Core\Event\CollectionCreateEvent; use Alchemy\Phrasea\Core\Event\CollectionCreateEvent;
use Alchemy\Phrasea\Core\PhraseaEvents; use Alchemy\Phrasea\Core\PhraseaEvents;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;

1
lib/Alchemy/Phrasea/Command/RecordAdd.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Alchemy\Phrasea\Border\File; use Alchemy\Phrasea\Border\File;
use Alchemy\Phrasea\Border\Manager; use Alchemy\Phrasea\Border\Manager;
use Entities\LazaretFile; use Entities\LazaretFile;

1
lib/Alchemy/Phrasea/Command/RescanTechnicalDatas.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;

1
lib/Alchemy/Phrasea/Command/UpgradeDBDatas.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Command; namespace Alchemy\Phrasea\Command;
use Alchemy\Phrasea\Command\Command;
use Alchemy\Phrasea\Command\Upgrade\Step31; use Alchemy\Phrasea\Command\Upgrade\Step31;
use Alchemy\Phrasea\Command\Upgrade\Step35; use Alchemy\Phrasea\Command\Upgrade\Step35;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;

6
lib/Alchemy/Phrasea/Controller/Admin/Users.php
View File

@@ -196,7 +196,7 @@ class Users implements ControllerProviderInterface
} }
$filename = sprintf('user_export_%s.csv', date('Ymd')); $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); $app['csv.exporter']->export('php://output', $userTable);
}); });
@@ -343,7 +343,7 @@ class Users implements ControllerProviderInterface
} while (count($results) > 0); } while (count($results) > 0);
$filename = sprintf('user_export_%s.csv', date('Ymd')); $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); $app['csv.exporter']->export('php://output', $buffer);
}); });
@@ -601,7 +601,7 @@ class Users implements ControllerProviderInterface
$nbUsrToAdd = 0; $nbUsrToAdd = 0;
$lines = array(); $lines = array();
$app['csv.interpreter']->addObserver(function(array $row) use (&$lines) { $app['csv.interpreter']->addObserver(function (array $row) use (&$lines) {
$lines[] = $row; $lines[] = $row;
}); });
$app['csv.lexer']->parse($file->getPathname(), $app['csv.interpreter']); $app['csv.lexer']->parse($file->getPathname(), $app['csv.interpreter']);

6
lib/Alchemy/Phrasea/Controller/Report/Activity.php
View File

@@ -307,8 +307,6 @@ class Activity implements ControllerProviderInterface
$activity->setConfig(false); $activity->setConfig(false);
if ($request->request->get('printcsv') == 'on') { if ($request->request->get('printcsv') == 'on') {
$activity->setHasLimit(false); $activity->setHasLimit(false);
$activity->setPrettyString(false); $activity->setPrettyString(false);
@@ -860,13 +858,13 @@ class Activity implements ControllerProviderInterface
$result = $report->getResult(); $result = $report->getResult();
array_unshift($result, $headers); array_unshift($result, $headers);
$collection = new CallbackCollection($result, function($row) use ($report) { $collection = new CallbackCollection($result, function ($row) use ($report) {
// restrict to displayed fields // restrict to displayed fields
return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
}); });
$filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); $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); $app['csv.exporter']->export('php://output', $collection);
}); });

5
lib/Alchemy/Phrasea/Controller/Report/Informations.php
View File

@@ -469,7 +469,6 @@ class Informations implements ControllerProviderInterface
$reportArray = $info->buildTabGrpInfo(false, array(), $request->request->get('user'), $conf, false); $reportArray = $info->buildTabGrpInfo(false, array(), $request->request->get('user'), $conf, false);
if ($request->request->get('printcsv') == 'on') { if ($request->request->get('printcsv') == 'on') {
return $this->getCSVResponse($app, $info, 'info_user'); return $this->getCSVResponse($app, $info, 'info_user');
} }
@@ -518,13 +517,13 @@ class Informations implements ControllerProviderInterface
$result = $report->getResult(); $result = $report->getResult();
array_unshift($result, $headers); 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 // restrict fields to the displayed ones
return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
}); });
$filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); $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); $app['csv.exporter']->export('php://output', $collection);
}); });

19
lib/Alchemy/Phrasea/Controller/Report/Root.php
View File

@@ -18,7 +18,6 @@ use Silex\ControllerProviderInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
class Root implements ControllerProviderInterface class Root implements ControllerProviderInterface
{ {
@@ -89,7 +88,7 @@ class Root implements ControllerProviderInterface
} }
$granted = array(); $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()])) { if (!isset($granted[$collection->get_sbas_id()])) {
$granted[$collection->get_sbas_id()] = array( $granted[$collection->get_sbas_id()] = array(
'id' => $collection->get_sbas_id(), 'id' => $collection->get_sbas_id(),
@@ -483,28 +482,28 @@ class Root implements ControllerProviderInterface
$result = array(); $result = array();
$result[] = array_keys($conf_nav); $result[] = array_keys($conf_nav);
foreach($report['nav']['result'] as $row) { foreach ($report['nav']['result'] as $row) {
$result[] = array_values($row); $result[] = array_values($row);
}; };
$result[] = array_keys($conf_os); $result[] = array_keys($conf_os);
foreach($report['os']['result'] as $row) { foreach ($report['os']['result'] as $row) {
$result[] = array_values($row); $result[] = array_values($row);
}; };
$result[] = array_keys($conf_res); $result[] = array_keys($conf_res);
foreach($report['res']['result'] as $row) { foreach ($report['res']['result'] as $row) {
$result[] = array_values($row); $result[] = array_values($row);
}; };
$result[] = array_keys($conf_mod); $result[] = array_keys($conf_mod);
foreach($report['mod']['result'] as $row) { foreach ($report['mod']['result'] as $row) {
$result[] = array_values($row); $result[] = array_values($row);
}; };
$result[] = array_keys($conf_combo); $result[] = array_keys($conf_combo);
foreach($report['combo']['result'] as $row) { foreach ($report['combo']['result'] as $row) {
$result[] = array_values($row); $result[] = array_values($row);
}; };
$filename = sprintf('report_export_info_%s.csv', date('Ymd')); $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); $app['csv.exporter']->export('php://output', $result);
}); });
@@ -683,13 +682,13 @@ class Root implements ControllerProviderInterface
$result = $report->getResult(); $result = $report->getResult();
array_unshift($result, $headers); 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 // restrict fields to the displayed ones
return array_map('strip_tags', array_intersect_key($row, $report->getDisplay())); return array_map('strip_tags', array_intersect_key($row, $report->getDisplay()));
}); });
$filename = sprintf('report_export_%s_%s.csv', $type, date('Ymd')); $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); $app['csv.exporter']->export('php://output', $collection);
}); });

1
lib/Alchemy/Phrasea/Controller/Root/Developers.php
View File

@@ -230,7 +230,6 @@ class Developers implements ControllerProviderInterface
return $app->json(array('success' => !$error)); return $app->json(array('success' => !$error));
} }
/** /**
* Change application webhook * Change application webhook
* *

3
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
View File

@@ -825,8 +825,7 @@ class Xmlhttp implements ControllerProviderInterface
$lcoll = ''; $lcoll = '';
$collections = $app['authentication']->getUser()->ACL() $collections = $app['authentication']->getUser()->ACL()
->get_granted_base(array(), array($sbid)); // array(), $sbid); ->get_granted_base(array(), array($sbid)); // array(), $sbid);
foreach($collections as $collection) foreach ($collections as $collection) {
{
$lcoll .= ($lcoll?",":"") . $collection->get_coll_id(); $lcoll .= ($lcoll?",":"") . $collection->get_coll_id();
} }
$site = $app['phraseanet.configuration']['main']['key']; $site = $app['phraseanet.configuration']['main']['key'];

2
lib/Alchemy/Phrasea/Core/Event/Subscriber/SessionManagerSubscriber.php
View File

@@ -113,7 +113,7 @@ class SessionManagerSubscriber implements EventSubscriberInterface
$idle = 0; $idle = 0;
if (isset($this->app["phraseanet.configuration"]["session"]["idle"])) { 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(); $now = new \DateTime();
$dt = $now->getTimestamp() - $session->getUpdated()->getTimestamp(); $dt = $now->getTimestamp() - $session->getUpdated()->getTimestamp();

1
lib/Alchemy/Phrasea/Core/Provider/CSVServiceProvider.php
View File

@@ -26,6 +26,7 @@ class CSVServiceProvider implements ServiceProviderInterface
{ {
$app['csv.exporter.config'] = $app->share(function () { $app['csv.exporter.config'] = $app->share(function () {
$config = new ExporterConfig(); $config = new ExporterConfig();
return $config return $config
->setDelimiter(";") ->setDelimiter(";")
->setEnclosure('"') ->setEnclosure('"')

10
lib/Alchemy/Phrasea/Core/Provider/PhraseaEventServiceProvider.php
View File

@@ -23,19 +23,19 @@ class PhraseaEventServiceProvider implements ServiceProviderInterface
{ {
public function register(Application $app) 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(); 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); 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); 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); 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); return new SessionManagerSubscriber($app);
}); });
} }

2
lib/Alchemy/Phrasea/Core/Response/CSVFileResponse.php
View File

@@ -40,4 +40,4 @@ class CSVFileResponse extends StreamedResponse
false === preg_match('/^[\x20-\x7e]*$/', $filename) ? '' : preg_replace('/[^(x20-x7F)]*$/', '', $filename) false === preg_match('/^[\x20-\x7e]*$/', $filename) ? '' : preg_replace('/[^(x20-x7F)]*$/', '', $filename)
)); ));
} }
} }

2
lib/Alchemy/Phrasea/Http/H264PseudoStreaming/H264Factory.php
View File

@@ -70,7 +70,7 @@ class H264Factory
/** /**
* Creates a new instance of H264 Factory given a configuration. * Creates a new instance of H264 Factory given a configuration.
* *
* @param Application $app * @param Application $app
* *
* @return H264Factory * @return H264Factory
*/ */

1
lib/Alchemy/Phrasea/Notification/Deliverer.php
View File

@@ -11,7 +11,6 @@
namespace Alchemy\Phrasea\Notification; namespace Alchemy\Phrasea\Notification;
use Alchemy\Phrasea\Notification\EmitterInterface;
use Alchemy\Phrasea\Notification\Mail\MailInterface; use Alchemy\Phrasea\Notification\Mail\MailInterface;
use Alchemy\Phrasea\Exception\LogicException; use Alchemy\Phrasea\Exception\LogicException;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;

2
lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php
View File

@@ -12,8 +12,6 @@
namespace Alchemy\Phrasea\SearchEngine; namespace Alchemy\Phrasea\SearchEngine;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
use Alchemy\Phrasea\SearchEngine\SearchEngineResult;
use Alchemy\Phrasea\Exception\RuntimeException; use Alchemy\Phrasea\Exception\RuntimeException;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\ArrayCollection;

1
lib/classes/API/Webhook.php
View File

@@ -9,7 +9,6 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\Exception\RuntimeException; use Alchemy\Phrasea\Exception\RuntimeException;
class API_Webhook class API_Webhook

10
lib/classes/Feed/Collection.php
View File

@@ -50,9 +50,9 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf
/** /**
* *
* @param Application $app * @param Application $app
* @param User_Adapter $user * @param User_Adapter $user
* @param array $reduce * @param array $reduce
* *
* @return Feed_Collection * @return Feed_Collection
*/ */
@@ -122,7 +122,7 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf
try { try {
$feedIds = $collection->get_data_from_cache(self::CACHE_PUBLIC); $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); return new \Feed_Adapter($app, $id);
}, $feedIds)); }, $feedIds));
} catch (CacheException $e) { } catch (CacheException $e) {
@@ -140,7 +140,7 @@ class Feed_Collection implements Feed_CollectionInterface, cache_cacheableInterf
$feeds[] = new \Feed_Adapter($app, $row['id']); $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(); return $feed->get_id();
}, $feeds), self::CACHE_PUBLIC); }, $feeds), self::CACHE_PUBLIC);

2
lib/classes/ZipArchiveImproved.php
View File

@@ -59,7 +59,7 @@ class ZipArchiveImproved extends ZipArchive
* *
* @param string $fileName * @param string $fileName
* @param int $flags * @param int $flags
* return mixed * return mixed
*/ */
public function open($fileName, $flags = null) public function open($fileName, $flags = null)
{ {

6
lib/classes/caption/Field/Value.php
View File

@@ -397,14 +397,13 @@ class caption_Field_Value implements cache_cacheableInterface
$note += ($node->getAttribute("w") == $term_noacc) ? 2 : 0; $note += ($node->getAttribute("w") == $term_noacc) ? 2 : 0;
if($context_noacc != "") if($context_noacc != "")
$note += ($node->getAttribute("k") == $context_noacc) ? 1 : 0; $note += ($node->getAttribute("k") == $context_noacc) ? 1 : 0;
if($note > $bestnote) if ($note > $bestnote) {
{
$bestnote = $note; $bestnote = $note;
$bestnode = $node; $bestnode = $node;
} }
} }
if($bestnode) { if ($bestnode) {
list($term, $context) = $this->splitTermAndContext(str_replace(array("[[em]]", "[[/em]]"), array("", ""), $value)); 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 // a value has been found in thesaurus, update value & set the query to bounce to the value
$this->value = $bestnode->getAttribute('v'); $this->value = $bestnode->getAttribute('v');
@@ -414,7 +413,6 @@ class caption_Field_Value implements cache_cacheableInterface
$this->isThesaurusValue = false; $this->isThesaurusValue = false;
} }
return $this; return $this;
} }

10
lib/classes/module/report.php
View File

@@ -767,12 +767,12 @@ class module_report
/** /**
* @desc Set your own configuration for each column displayed in the html table * @desc Set your own configuration for each column displayed in the html table
* @param array $tab contain your conf's variables * @param array $tab contain your conf's variables
* array( 'field' => * array( 'field' =>
* array('title of the colum', '1 = order ON / 0 = order OFF', * array('title of the colum', '1 = order ON / 0 = order OFF',
* '1 = bound ON / 0 = bound OFF') * '1 = bound ON / 0 = bound OFF')
* @example $tab = array('user' => array('user list', 1, 0), * @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 * @return void
*/ */
protected function setConfigColumn($tab) protected function setConfigColumn($tab)

4
lib/classes/module/report/connexion.php
View File

@@ -91,8 +91,8 @@ class module_report_connexion extends module_report
/** /**
* @desc build the result from the specified sql * @desc build the result from the specified sql
* @param array $champ all the field from the request displayed in a array * @param array $champ all the field from the request displayed in a array
* @param string $sql the request from buildreq * @param string $sql the request from buildreq
* @return $this->result * @return $this->result
*/ */
protected function buildResult(Application $app, $rs) protected function buildResult(Application $app, $rs)

4
lib/classes/module/report/download.php
View File

@@ -94,8 +94,8 @@ class module_report_download extends module_report
/** /**
* @desc build the result from the specified sql * @desc build the result from the specified sql
* @param array $champ all the field from the request displayed in a array * @param array $champ all the field from the request displayed in a array
* @param string $sql the request from buildreq * @param string $sql the request from buildreq
* @return $this->result * @return $this->result
*/ */
protected function buildResult(Application $app, $rs) protected function buildResult(Application $app, $rs)

2
lib/classes/patch/384alpha3a.php
View File

@@ -10,8 +10,6 @@
*/ */
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Filesystem\Filesystem;
class patch_384alpha3a implements patchInterface class patch_384alpha3a implements patchInterface
{ {

2
lib/classes/patch/384alpha4a.php
View File

@@ -10,8 +10,6 @@
*/ */
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\Finder\Finder;
use Symfony\Component\Filesystem\Filesystem;
class patch_384alpha4a implements patchInterface class patch_384alpha4a implements patchInterface
{ {

4
lib/classes/task/abstract.php
View File

@@ -506,8 +506,8 @@ abstract class task_abstract
/** /**
* *
* @return null|integer * @return null|integer
* pid (int) of the task * pid (int) of the task
* NULL : the pid file is not locked (task no running) * NULL : the pid file is not locked (task no running)
*/ */
public function getPID() public function getPID()
{ {

2
lib/classes/task/period/apiwebhooks.php
View File

@@ -65,7 +65,7 @@ class task_period_apiwebhooks extends task_appboxAbstract
$rows = $stmt->fetchAll(\PDO::FETCH_ASSOC); $rows = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$stmt->closeCursor(); $stmt->closeCursor();
return array_map(function($row) { return array_map(function ($row) {
return $row['webhook_url']; return $row['webhook_url'];
}, $rows); }, $rows);
} }

2
lib/classes/uuid.php
View File

@@ -134,7 +134,7 @@ class uuid
* @param stiring $uuid1 * @param stiring $uuid1
* @param string $uuid2 * @param string $uuid2
* @return int * @return int
* -1 uuid1<uuid2 0 uuid1==uuid2 +1 uuid1>uuid2 * -1 uuid1<uuid2 0 uuid1==uuid2 +1 uuid1>uuid2
*/ */
public static function compare($uuid1, $uuid2) public static function compare($uuid1, $uuid2)
{ {

3
lib/conf.d/configuration.yml
View File

@@ -158,8 +158,7 @@ api_cors:
expose_headers: [] expose_headers: []
max_age: 0 max_age: 0
hosts: [] hosts: []
session: session:
idle: 0 idle: 0
# 1 week # 1 week
lifetime: 604800 lifetime: 604800

2
tests/Alchemy/Tests/Phrasea/Application/ApiJSONPTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Application;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
class ApiJSONPApplication extends ApiAbstract class ApiJSONPTest extends ApiAbstract
{ {
protected function evaluateResponseBadRequest(Response $response) protected function evaluateResponseBadRequest(Response $response)

2
tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Application; namespace Alchemy\Tests\Phrasea\Application;
class ApiJsonApplication extends ApiAbstract class ApiJsonTest extends ApiAbstract
{ {
public function getParameters(array $parameters = array()) public function getParameters(array $parameters = array())

2
tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Application; namespace Alchemy\Tests\Phrasea\Application;
class ApiYamlApplication extends ApiAbstract class ApiYamlTest extends ApiAbstract
{ {
public function getParameters(array $parameters = array()) public function getParameters(array $parameters = array())

2
tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
View File

@@ -9,7 +9,7 @@ use Alchemy\Phrasea\Authentication\Context;
* Test oauthv2 flow based on ietf authv2 spec * Test oauthv2 flow based on ietf authv2 spec
* @link http://tools.ietf.org/html/draft-ietf-oauth-v2-18 * @link http://tools.ietf.org/html/draft-ietf-oauth-v2-18
*/ */
class oauthv2_application_test extends \PhraseanetWebTestCaseAuthenticatedAbstract class OAuth2Test extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
/** /**
* *

2
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Application;
use Alchemy\Phrasea\Border\File; use Alchemy\Phrasea\Border\File;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
class ApplicationOverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class OverviewTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
public function testDatafilesRouteAuthenticated() public function testDatafilesRouteAuthenticated()
{ {

1
tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
View File

@@ -2,7 +2,6 @@
namespace Alchemy\Phrasea\Authentication\PersistentCookie; namespace Alchemy\Phrasea\Authentication\PersistentCookie;
use Alchemy\Phrasea\Authentication\PersistentCookie\Manager;
use Entities\Session; use Entities\Session;
class ManagerTest extends \PHPUnit_Framework_TestCase class ManagerTest extends \PHPUnit_Framework_TestCase

2
tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Cache;
use \Alchemy\Phrasea\Cache\RedisCache; use \Alchemy\Phrasea\Cache\RedisCache;
class RedisTest extends \PhraseanetPHPUnitAbstract class RedisCacheTest extends \PhraseanetPHPUnitAbstract
{ {
public function testBasics() public function testBasics()

2
tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
View File

@@ -2,8 +2,6 @@
namespace Alchemy\Phrasea\Command\Compile; namespace Alchemy\Phrasea\Command\Compile;
use Alchemy\Phrasea\Command\Compile\Configuration;
class ConfigurationTest extends \PhraseanetPHPUnitAbstract class ConfigurationTest extends \PhraseanetPHPUnitAbstract
{ {
public function testExecute() public function testExecute()

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin;
use PHPExiftool\Driver\Tag\IPTC\ObjectName; use PHPExiftool\Driver\Tag\IPTC\ObjectName;
use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController; use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;
class ControllerFieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class FieldsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
public function testRoot() public function testRoot()
{ {

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Admin; namespace Alchemy\Tests\Phrasea\Controller\Admin;
class Module_Admin_Route_PublicationTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class PublicationTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
public static $account = null; public static $account = null;
public static $api = null; public static $api = null;

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Admin;
use Alchemy\Phrasea\Media\Subdef\Image; use Alchemy\Phrasea\Media\Subdef\Image;
class ControllerSubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class SubdefsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Admin; namespace Alchemy\Tests\Phrasea\Controller\Admin;
class ControllerUsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class UsersTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;
protected $usersParameters; protected $usersParameters;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
class ControllerBasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class BasketTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
require_once __DIR__ . '/../../../../../classes/Bridge/Bridge_datas.inc'; require_once __DIR__ . '/../../../../../classes/Bridge/Bridge_datas.inc';
class BridgeApplication extends \PhraseanetWebTestCaseAuthenticatedAbstract class BridgeTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
public static $account = null; public static $account = null;
public static $api = null; public static $api = null;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerEditTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class EditTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\CssSelector\CssSelector; use Symfony\Component\CssSelector\CssSelector;
class ControllerFeedApp extends \PhraseanetWebTestCaseAuthenticatedAbstract class FeedTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
/** /**
* *

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerLanguageTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class LanguageTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

1
tests/Alchemy/Tests/Phrasea/Controller/Prod/LazaretTest.php
View File

@@ -3,7 +3,6 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\Border\Attribute\AttributeInterface; use Alchemy\Phrasea\Border\Attribute\AttributeInterface;
use Alchemy\Phrasea\Core\Event\Subscriber\SessionManagerSubscriber;
use Symfony\Component\HttpKernel\Client; use Symfony\Component\HttpKernel\Client;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerMoveCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class MoveCollectionTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerPrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class PrinterTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerPushTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class PushTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerRootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class RootTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Symfony\Component\HttpKernel\Client; use Symfony\Component\HttpKernel\Client;
class ControllerStoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class StoryTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
public function testRootPost() public function testRootPost()
{ {

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\File\UploadedFile;
class ControllerToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class ToolsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;
protected $tmpFile; protected $tmpFile;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Controller\Prod;
use Alchemy\Phrasea\SearchEngine\SearchEngineOptions; use Alchemy\Phrasea\SearchEngine\SearchEngineOptions;
class ControllerTooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class TooltipTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerUsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class UsrListsTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

2
tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Controller\Prod; namespace Alchemy\Tests\Phrasea\Controller\Prod;
class ControllerWorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract class WorkZoneTest extends \PhraseanetWebTestCaseAuthenticatedAbstract
{ {
protected $client; protected $client;

4
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
View File

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

2
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
View File

@@ -7,7 +7,7 @@ require_once __DIR__ . '/../../../../../classes/FeedValidator.inc';
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
class RssFeedTest extends \PhraseanetWebTestCaseAbstract class RSSFeedTest extends \PhraseanetWebTestCaseAbstract
{ {
/** /**
* *

2
tests/Alchemy/Tests/Phrasea/Core/CLIProvider/ComposerSetupServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\CLIProvider;
/** /**
* @covers Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider * @covers Alchemy\Phrasea\Core\CLIProvider\ComposerSetupServiceProvider
*/ */
class ComposerSetupServiceProvidertest extends ServiceProviderTestCase class ComposerSetupServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/CLIProvider/LessBuilderServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\CLIProvider;
/** /**
* @covers Alchemy\Phrasea\Core\CLIProvider\LessBuilderServiceProvider * @covers Alchemy\Phrasea\Core\CLIProvider\LessBuilderServiceProvider
*/ */
class LessBuilderServiceProvidertest extends ServiceProviderTestCase class LessBuilderServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/CLIProvider/PluginServiceProviderTest.php
View File

@@ -8,7 +8,7 @@ use Symfony\Component\Process\ExecutableFinder;
/** /**
* @covers Alchemy\Phrasea\Core\CLIProvider\PluginServiceProvider * @covers Alchemy\Phrasea\Core\CLIProvider\PluginServiceProvider
*/ */
class PluginServiceProvidertest extends ServiceProviderTestCase class PluginServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

1
tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/SessionManagerSubscriberTest.php
View File

@@ -200,7 +200,6 @@ class SessionManagerSubscriberTest extends \PhraseanetWebTestCaseAuthenticatedAb
$app['EM'] = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock(); $app['EM'] = $this->getMockBuilder('Doctrine\ORM\EntityManager')->disableOriginalConstructor()->getMock();
$app['EM']->expects($this->never())->method('flush'); $app['EM']->expects($this->never())->method('flush');
$app->get('/login', function () { $app->get('/login', function () {
return ''; return '';
})->bind("homepage"); })->bind("homepage");

2
tests/Alchemy/Tests/Phrasea/Core/Provider/AuthenticationManagerServiceProviderTest.php
View File

@@ -11,7 +11,7 @@ use Silex\Application;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider * @covers Alchemy\Phrasea\Core\Provider\AuthenticationManagerServiceProvider
*/ */
class AuthenticationManagerServiceProvidertest extends ServiceProviderTestCase class AuthenticationManagerServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
View File

@@ -11,7 +11,7 @@ use XPDF\XPDFServiceProvider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider * @covers Alchemy\Phrasea\Core\Provider\BorderManagerServiceProvider
*/ */
class BorderManagerServiceProvidertest extends ServiceProviderTestCase class BorderManagerServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/BrowserServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\BrowserServiceProvider * @covers Alchemy\Phrasea\Core\Provider\BrowserServiceProvider
*/ */
class BrowserServiceProvidertest extends ServiceProviderTestCase class BrowserServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/CacheServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\CacheServiceProvider * @covers Alchemy\Phrasea\Core\Provider\CacheServiceProvider
*/ */
class CacheServiceProvidertest extends ServiceProviderTestCase class CacheServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationServiceProviderTest.php
View File

@@ -10,7 +10,7 @@ use Symfony\Component\HttpKernel\Client;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider * @covers Alchemy\Phrasea\Core\Provider\ConfigurationServiceProvider
*/ */
class ConfigurationServiceProvidertest extends ServiceProviderTestCase class ConfigurationServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/ConfigurationTesterServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\ConfigurationTesterServiceProvider * @covers Alchemy\Phrasea\Core\Provider\ConfigurationTesterServiceProvider
*/ */
class ConfigurationTesterServiceProvidertest extends ServiceProviderTestCase class ConfigurationTesterServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
use Alchemy\Phrasea\Core\Provider\FtpServiceProvider; use Alchemy\Phrasea\Core\Provider\FtpServiceProvider;
class FTPServiceProvidertest extends \PhraseanetPHPUnitAbstract class FTPServiceProviderTest extends \PhraseanetPHPUnitAbstract
{ {
public function testGetInstantiate() public function testGetInstantiate()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/JMSSerializerServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\JMSServiceProviderServiceProvider * @covers Alchemy\Phrasea\Core\Provider\JMSServiceProviderServiceProvider
*/ */
class JMSServiceProviderServiceProvidertest extends ServiceProviderTestCase class JMSSerializerServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
View File

@@ -8,7 +8,7 @@ use Alchemy\Phrasea\Core\Provider\LocaleServiceProvider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\LocaleServiceProvider * @covers Alchemy\Phrasea\Core\Provider\LocaleServiceProvider
*/ */
class LocaleServiceProvidertest extends \PhraseanetPHPUnitAbstract class LocaleServiceProviderTest extends \PhraseanetPHPUnitAbstract
{ {
public function testLocalesAvailable() public function testLocalesAvailable()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/NotificationDelivererServiceProviderTest.php
View File

@@ -7,7 +7,7 @@ use Alchemy\Phrasea\Core\Provider\NotificationDelivererServiceProvider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\NotificationDelivererServiceProvider * @covers Alchemy\Phrasea\Core\Provider\NotificationDelivererServiceProvider
*/ */
class NotificationDelivererServiceProvidertest extends ServiceProviderTestCase class NotificationDelivererServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/ORMServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\ORMServiceProvider * @covers Alchemy\Phrasea\Core\Provider\ORMServiceProvider
*/ */
class ORMServiceProvidertest extends ServiceProviderTestCase class ORMServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseaVersionServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\PhraseaVersionServiceProvider * @covers Alchemy\Phrasea\Core\Provider\PhraseaVersionServiceProvider
*/ */
class PhraseaVersionServiceProvidertest extends ServiceProviderTestCase class PhraseaVersionServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
View File

@@ -2,7 +2,7 @@
namespace Alchemy\Tests\Phrasea\Core\Provider; namespace Alchemy\Tests\Phrasea\Core\Provider;
class PhraseanetServiceProvidertest extends ServiceProviderTestCase class PhraseanetServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
View File

@@ -7,7 +7,7 @@ use Alchemy\Phrasea\Core\Provider\RegistrationServiceProvider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\RegistrationServiceProvider * @covers Alchemy\Phrasea\Core\Provider\RegistrationServiceProvider
*/ */
class RegistrationServiceProvidertest extends \PhraseanetPHPUnitAbstract class RegistrationServiceProviderTest extends \PhraseanetPHPUnitAbstract
{ {
public function testSameInstanceShouldBereturnedEveryTime() public function testSameInstanceShouldBereturnedEveryTime()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/SearchEngineServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\SearchEngineServiceProvider * @covers Alchemy\Phrasea\Core\Provider\SearchEngineServiceProvider
*/ */
class SearchEngineServiceProvidertest extends ServiceProviderTestCase class SearchEngineServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\TaskManagerServiceProvider * @covers Alchemy\Phrasea\Core\Provider\TaskManagerServiceProvider
*/ */
class TaskManagerServiceProvidertest extends ServiceProviderTestCase class TaskManagerServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/TemporaryFilesystemServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider * @covers Alchemy\Phrasea\Core\Provider\TemporaryFilesystemServiceProvider
*/ */
class TemporaryFilesystemServiceProvidertest extends ServiceProviderTestCase class TemporaryFilesystemServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/TokensServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\TokensServiceProvider * @covers Alchemy\Phrasea\Core\Provider\TokensServiceProvider
*/ */
class TokensServiceProvidertest extends ServiceProviderTestCase class TokensServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Core/Provider/UnicodeServiceProviderTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Core\Provider;
/** /**
* @covers Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider * @covers Alchemy\Phrasea\Core\Provider\UnicodeServiceProvider
*/ */
class UnicodeServiceProvidertest extends ServiceProviderTestCase class UnicodeServiceProviderTest extends ServiceProviderTestCase
{ {
public function provideServiceDescription() public function provideServiceDescription()
{ {

2
tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
View File

@@ -5,7 +5,7 @@ namespace Alchemy\Tests\Phrasea\Http\XSendFile;
use Alchemy\Phrasea\Http\XSendFile\NginxMode; use Alchemy\Phrasea\Http\XSendFile\NginxMode;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
class XSendFileModeNginxTest extends \PhraseanetPHPUnitAbstract class NginxModeTest extends \PhraseanetPHPUnitAbstract
{ {
public function testGetVirtualHost() public function testGetVirtualHost()
{ {

2
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Metadata\Tag;
use Alchemy\Phrasea\Metadata\Tag\TfEditdate; use Alchemy\Phrasea\Metadata\Tag\TfEditdate;
class TfEditdateTest extends \PHPUnit_Framework_TestCase class TfEditDateTest extends \PHPUnit_Framework_TestCase
{ {
/** /**

2
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
View File

@@ -4,7 +4,7 @@ namespace Alchemy\Tests\Phrasea\Metadata\Tag;
use Alchemy\Phrasea\Metadata\Tag\TfMimetype; use Alchemy\Phrasea\Metadata\Tag\TfMimetype;
class TfMimetypeTest extends \PHPUnit_Framework_TestCase class TfMimeTypeTest extends \PHPUnit_Framework_TestCase
{ {
/** /**

1
tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaConfigurationPanelTest.php
View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;
use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine; use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
use Alchemy\Phrasea\SearchEngine\Phrasea\ConfigurationPanel; use Alchemy\Phrasea\SearchEngine\Phrasea\ConfigurationPanel;
use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;
class PhraseaConfigurationPanelTest extends ConfigurationPanelAbstractTest class PhraseaConfigurationPanelTest extends ConfigurationPanelAbstractTest
{ {

1
tests/Alchemy/Tests/Phrasea/SearchEngine/PhraseaEngineTest.php
View File

@@ -3,7 +3,6 @@
namespace Alchemy\Tests\Phrasea\SearchEngine; namespace Alchemy\Tests\Phrasea\SearchEngine;
use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine; use Alchemy\Phrasea\SearchEngine\Phrasea\PhraseaEngine;
use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
/** /**

1
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchConfigurationPanelTest.php
View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;
use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine; use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
use Alchemy\Phrasea\SearchEngine\SphinxSearch\ConfigurationPanel; use Alchemy\Phrasea\SearchEngine\SphinxSearch\ConfigurationPanel;
use Alchemy\Tests\Phrasea\SearchEngine\ConfigurationPanelAbstractTest;
class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest class SphinxSearchConfigurationPanelTest extends ConfigurationPanelAbstractTest
{ {

1
tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
View File

@@ -4,7 +4,6 @@ namespace Alchemy\Tests\Phrasea\SearchEngine;
use Alchemy\Phrasea\Application; use Alchemy\Phrasea\Application;
use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine; use Alchemy\Phrasea\SearchEngine\SphinxSearch\SphinxSearchEngine;
use Alchemy\Tests\Phrasea\SearchEngine\SearchEngineAbstractTest;
use Symfony\Component\Process\ExecutableFinder; use Symfony\Component\Process\ExecutableFinder;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;

1
tests/classes/PhraseanetPHPUnitAbstract.php
View File

@@ -8,7 +8,6 @@ use Silex\WebTestCase;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Client; use Symfony\Component\HttpKernel\Client;
use Symfony\Component\DomCrawler\Crawler; use Symfony\Component\DomCrawler\Crawler;
use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface;
use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RequestContext;
abstract class PhraseanetPHPUnitAbstract extends WebTestCase abstract class PhraseanetPHPUnitAbstract extends WebTestCase