mirror of
https://github.com/alchemy-fr/Phraseanet.git
synced 2025-10-18 15:33:15 +00:00
Fix CS
This commit is contained in:
@@ -159,6 +159,7 @@ class PropertyAccess
|
|||||||
if (!is_array($conf[$prop])) {
|
if (!is_array($conf[$prop])) {
|
||||||
throw new InvalidArgumentException('Unable to merge an array in a scalar.');
|
throw new InvalidArgumentException('Unable to merge an array in a scalar.');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $conf[$prop] = array_replace($conf[$prop], $value);
|
return $conf[$prop] = array_replace($conf[$prop], $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -14,7 +14,6 @@ namespace Alchemy\Phrasea\Setup\DoctrineMigrations;
|
|||||||
use Alchemy\Phrasea\Exception\RuntimeException;
|
use Alchemy\Phrasea\Exception\RuntimeException;
|
||||||
use Doctrine\DBAL\Migrations\AbstractMigration as BaseMigration;
|
use Doctrine\DBAL\Migrations\AbstractMigration as BaseMigration;
|
||||||
use Doctrine\DBAL\Schema\Schema;
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
use Doctrine\DBAL\Migrations\Configuration;
|
|
||||||
use Doctrine\ORM\EntityManager;
|
use Doctrine\ORM\EntityManager;
|
||||||
|
|
||||||
abstract class AbstractMigration extends BaseMigration
|
abstract class AbstractMigration extends BaseMigration
|
||||||
|
@@ -827,7 +827,7 @@ abstract class base implements cache_cacheableInterface
|
|||||||
$success = true;
|
$success = true;
|
||||||
|
|
||||||
foreach ($list_patches as $patch) {
|
foreach ($list_patches as $patch) {
|
||||||
foreach($patch->getDoctrineMigrations() as $doctrineVersion) {
|
foreach ($patch->getDoctrineMigrations() as $doctrineVersion) {
|
||||||
$version = $app['doctrine-migration.configuration']->getVersion($doctrineVersion);
|
$version = $app['doctrine-migration.configuration']->getVersion($doctrineVersion);
|
||||||
$version->getMigration()->setEntityManager($app['EM']);
|
$version->getMigration()->setEntityManager($app['EM']);
|
||||||
if (false === $version->isMigrated()) {
|
if (false === $version->isMigrated()) {
|
||||||
|
@@ -15,7 +15,6 @@ use Alchemy\Phrasea\Model\Entities\FeedEntry;
|
|||||||
use Alchemy\Phrasea\Model\Entities\FeedItem;
|
use Alchemy\Phrasea\Model\Entities\FeedItem;
|
||||||
use Alchemy\Phrasea\Model\Entities\FeedPublisher;
|
use Alchemy\Phrasea\Model\Entities\FeedPublisher;
|
||||||
use Gedmo\Timestampable\TimestampableListener;
|
use Gedmo\Timestampable\TimestampableListener;
|
||||||
use Doctrine\ORM\Query\ResultSetMapping;
|
|
||||||
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
||||||
|
|
||||||
class patch_320alpha4b implements patchInterface
|
class patch_320alpha4b implements patchInterface
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_320alpha6a implements patchInterface
|
class patch_320alpha6a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_320alpha8a implements patchInterface
|
class patch_320alpha8a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -10,9 +10,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
use Doctrine\DBAL\Migrations\Configuration\Configuration;
|
|
||||||
use Doctrine\DBAL\DriverManager;
|
|
||||||
|
|
||||||
|
|
||||||
class patch_360alpha1a implements patchInterface
|
class patch_360alpha1a implements patchInterface
|
||||||
{
|
{
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_360alpha1b implements patchInterface
|
class patch_360alpha1b implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_360alpha2a implements patchInterface
|
class patch_360alpha2a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_360alpha2b implements patchInterface
|
class patch_360alpha2b implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -12,7 +12,6 @@
|
|||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
use Doctrine\ORM\Tools\Pagination\Paginator;
|
use Doctrine\ORM\Tools\Pagination\Paginator;
|
||||||
|
|
||||||
|
|
||||||
class patch_361alpha1a implements patchInterface
|
class patch_361alpha1a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_370alpha1a implements patchInterface
|
class patch_370alpha1a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -34,6 +34,7 @@ class patch_380alpha15a implements patchInterface
|
|||||||
{
|
{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_380alpha2a implements patchInterface
|
class patch_380alpha2a implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
use Alchemy\Phrasea\Application;
|
use Alchemy\Phrasea\Application;
|
||||||
|
|
||||||
|
|
||||||
class patch_380alpha2b implements patchInterface
|
class patch_380alpha2b implements patchInterface
|
||||||
{
|
{
|
||||||
/** @var string */
|
/** @var string */
|
||||||
|
@@ -52,7 +52,6 @@ class patch_380alpha4a implements patchInterface
|
|||||||
return ['auth-failure'];
|
return ['auth-failure'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user