Merge pull request #160 from lucchese/patch-2

mikeSimonson · mikeSimonson · commit 326504a3ff74 · 2016-04-11T16:23:32.000+02:00
Update DoctrineCommand.php
diff --git a/Command/DoctrineCommand.php b/Command/DoctrineCommand.php
@@ -59,7 +59,7 @@ public static function configureMigrations(ContainerInterface $container, Config
             $configuration->setName($container->getParameter('doctrine_migrations.name'));
         }
         // For backward compatibility, need use a table from parameters for overwrite the default configuration
-        if (!$configuration->getMigrationsTableName() || !($configuration instanceof AbstractFileConfiguration)) {
+        if (!($configuration instanceof AbstractFileConfiguration) || !$configuration->getMigrationsTableName()) {
             $configuration->setMigrationsTableName($container->getParameter('doctrine_migrations.table_name'));
         }
         // Migrations is not register from configuration loader

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static function configureMigrations(ContainerInterface $container, Config`
`59`	`59`	`$configuration->setName($container->getParameter('doctrine_migrations.name'));`
`60`	`60`	`}`
`61`	`61`	`// For backward compatibility, need use a table from parameters for overwrite the default configuration`
`62`		`- if (!$configuration->getMigrationsTableName() \|\| !($configuration instanceof AbstractFileConfiguration)) {`
	`62`	`+ if (!($configuration instanceof AbstractFileConfiguration) \|\| !$configuration->getMigrationsTableName()) {`
`63`	`63`	`$configuration->setMigrationsTableName($container->getParameter('doctrine_migrations.table_name'));`
`64`	`64`	`}`
`65`	`65`	`// Migrations is not register from configuration loader`