diff --git a/lib/Alchemy/Phrasea/Core/Configuration/PropertyAccess.php b/lib/Alchemy/Phrasea/Core/Configuration/PropertyAccess.php index ac1bb6ddc6..b0b6d51832 100644 --- a/lib/Alchemy/Phrasea/Core/Configuration/PropertyAccess.php +++ b/lib/Alchemy/Phrasea/Core/Configuration/PropertyAccess.php @@ -159,6 +159,7 @@ class PropertyAccess if (!is_array($conf[$prop])) { throw new InvalidArgumentException('Unable to merge an array in a scalar.'); } + return $conf[$prop] = array_replace($conf[$prop], $value); } diff --git a/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/AbstractMigration.php b/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/AbstractMigration.php index 030df5faaf..3eb03dcc9a 100644 --- a/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/AbstractMigration.php +++ b/lib/Alchemy/Phrasea/Setup/DoctrineMigrations/AbstractMigration.php @@ -14,7 +14,6 @@ namespace Alchemy\Phrasea\Setup\DoctrineMigrations; use Alchemy\Phrasea\Exception\RuntimeException; use Doctrine\DBAL\Migrations\AbstractMigration as BaseMigration; use Doctrine\DBAL\Schema\Schema; -use Doctrine\DBAL\Migrations\Configuration; use Doctrine\ORM\EntityManager; abstract class AbstractMigration extends BaseMigration diff --git a/lib/classes/base.php b/lib/classes/base.php index e1c0af08cf..629d460a48 100644 --- a/lib/classes/base.php +++ b/lib/classes/base.php @@ -827,7 +827,7 @@ abstract class base implements cache_cacheableInterface $success = true; foreach ($list_patches as $patch) { - foreach($patch->getDoctrineMigrations() as $doctrineVersion) { + foreach ($patch->getDoctrineMigrations() as $doctrineVersion) { $version = $app['doctrine-migration.configuration']->getVersion($doctrineVersion); $version->getMigration()->setEntityManager($app['EM']); if (false === $version->isMigrated()) { diff --git a/lib/classes/patch/320alpha4b.php b/lib/classes/patch/320alpha4b.php index 8489ea0cf3..f5398272bc 100644 --- a/lib/classes/patch/320alpha4b.php +++ b/lib/classes/patch/320alpha4b.php @@ -15,7 +15,6 @@ use Alchemy\Phrasea\Model\Entities\FeedEntry; use Alchemy\Phrasea\Model\Entities\FeedItem; use Alchemy\Phrasea\Model\Entities\FeedPublisher; use Gedmo\Timestampable\TimestampableListener; -use Doctrine\ORM\Query\ResultSetMapping; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class patch_320alpha4b implements patchInterface diff --git a/lib/classes/patch/320alpha6a.php b/lib/classes/patch/320alpha6a.php index 2179b34a86..dba28c91f6 100644 --- a/lib/classes/patch/320alpha6a.php +++ b/lib/classes/patch/320alpha6a.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_320alpha6a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/320alpha8a.php b/lib/classes/patch/320alpha8a.php index d08dd2023d..95f2e59974 100644 --- a/lib/classes/patch/320alpha8a.php +++ b/lib/classes/patch/320alpha8a.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_320alpha8a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/360alpha1a.php b/lib/classes/patch/360alpha1a.php index 415053b490..c37fef5859 100644 --- a/lib/classes/patch/360alpha1a.php +++ b/lib/classes/patch/360alpha1a.php @@ -10,9 +10,6 @@ */ use Alchemy\Phrasea\Application; -use Doctrine\DBAL\Migrations\Configuration\Configuration; -use Doctrine\DBAL\DriverManager; - class patch_360alpha1a implements patchInterface { diff --git a/lib/classes/patch/360alpha1b.php b/lib/classes/patch/360alpha1b.php index 995d3774dc..0ab8229fd1 100644 --- a/lib/classes/patch/360alpha1b.php +++ b/lib/classes/patch/360alpha1b.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_360alpha1b implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/360alpha2a.php b/lib/classes/patch/360alpha2a.php index b8e9a874b9..d69ec53f1a 100644 --- a/lib/classes/patch/360alpha2a.php +++ b/lib/classes/patch/360alpha2a.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_360alpha2a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/360alpha2b.php b/lib/classes/patch/360alpha2b.php index 4df22bf5c4..8de22e21fa 100644 --- a/lib/classes/patch/360alpha2b.php +++ b/lib/classes/patch/360alpha2b.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_360alpha2b implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/361alpha1a.php b/lib/classes/patch/361alpha1a.php index bbaf6d1381..747af43d62 100644 --- a/lib/classes/patch/361alpha1a.php +++ b/lib/classes/patch/361alpha1a.php @@ -12,7 +12,6 @@ use Alchemy\Phrasea\Application; use Doctrine\ORM\Tools\Pagination\Paginator; - class patch_361alpha1a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/370alpha1a.php b/lib/classes/patch/370alpha1a.php index 34b85f0fd7..814efc0cd4 100644 --- a/lib/classes/patch/370alpha1a.php +++ b/lib/classes/patch/370alpha1a.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_370alpha1a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/380alpha15a.php b/lib/classes/patch/380alpha15a.php index 0a9a65dc48..c54d8d9c6c 100644 --- a/lib/classes/patch/380alpha15a.php +++ b/lib/classes/patch/380alpha15a.php @@ -34,6 +34,7 @@ class patch_380alpha15a implements patchInterface { return []; } + /** * {@inheritdoc} */ diff --git a/lib/classes/patch/380alpha2a.php b/lib/classes/patch/380alpha2a.php index 3e28912f0a..b6f407ee20 100644 --- a/lib/classes/patch/380alpha2a.php +++ b/lib/classes/patch/380alpha2a.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_380alpha2a implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/380alpha2b.php b/lib/classes/patch/380alpha2b.php index 26b68bedbf..74759e7077 100644 --- a/lib/classes/patch/380alpha2b.php +++ b/lib/classes/patch/380alpha2b.php @@ -11,7 +11,6 @@ use Alchemy\Phrasea\Application; - class patch_380alpha2b implements patchInterface { /** @var string */ diff --git a/lib/classes/patch/380alpha4a.php b/lib/classes/patch/380alpha4a.php index 91ec94ef12..abcb0dcf5a 100644 --- a/lib/classes/patch/380alpha4a.php +++ b/lib/classes/patch/380alpha4a.php @@ -52,7 +52,6 @@ class patch_380alpha4a implements patchInterface return ['auth-failure']; } - /** * {@inheritdoc} */