This commit is contained in:
Romain Neutron
2013-11-18 17:09:21 +01:00
parent 1b64a1f0a7
commit a0a2fc8d41
16 changed files with 3 additions and 16 deletions

View File

@@ -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);
}

View File

@@ -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

View File

@@ -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()) {

View File

@@ -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

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_320alpha6a implements patchInterface
{
/** @var string */

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_320alpha8a implements patchInterface
{
/** @var string */

View File

@@ -10,9 +10,6 @@
*/
use Alchemy\Phrasea\Application;
use Doctrine\DBAL\Migrations\Configuration\Configuration;
use Doctrine\DBAL\DriverManager;
class patch_360alpha1a implements patchInterface
{

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_360alpha1b implements patchInterface
{
/** @var string */

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_360alpha2a implements patchInterface
{
/** @var string */

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_360alpha2b implements patchInterface
{
/** @var string */

View File

@@ -12,7 +12,6 @@
use Alchemy\Phrasea\Application;
use Doctrine\ORM\Tools\Pagination\Paginator;
class patch_361alpha1a implements patchInterface
{
/** @var string */

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_370alpha1a implements patchInterface
{
/** @var string */

View File

@@ -34,6 +34,7 @@ class patch_380alpha15a implements patchInterface
{
return [];
}
/**
* {@inheritdoc}
*/

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_380alpha2a implements patchInterface
{
/** @var string */

View File

@@ -11,7 +11,6 @@
use Alchemy\Phrasea\Application;
class patch_380alpha2b implements patchInterface
{
/** @var string */

View File

@@ -52,7 +52,6 @@ class patch_380alpha4a implements patchInterface
return ['auth-failure'];
}
/**
* {@inheritdoc}
*/