Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #38 Multiple entity managers support #46

Closed
wants to merge 1 commit into from
Closed

Issue #38 Multiple entity managers support #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 24 additions & 6 deletions Command/DoctrineCommand.php
View file
Open in desktop
Expand Up @@ -27,19 +27,37 @@
*/
abstract class DoctrineCommand extends BaseCommand
{
public static function configureMigrations(ContainerInterface $container, Configuration $configuration)
public static function configureMigrations(ContainerInterface $container, Configuration $configuration, $em)
{
$dir = $container->getParameter('doctrine_migrations.dir_name');
if ($container->hasParameter('doctrine_migrations.default_entity_manager')) {
$configurationPrefix = 'doctrine_migrations.default_entity_manager';
} elseif ($container->hasParameter('doctrine_migrations.' . $em)) {
$configurationPrefix = 'doctrine_migrations.' . $em;
} else {
if (null === $em) {
$message = 'There is no doctrine migrations configuration available for the default entity manager';
} else {
$message = sprintf(
'There is no doctrine migrations configuration available for the %s entity manager',
$em
);
}
throw new \InvalidArgumentException($message);
}

$containerParameters = $container->getParameter($configurationPrefix);

$dir = $containerParameters['dir_name'];
if (!file_exists($dir)) {
mkdir($dir, 0777, true);
}

$configuration->setMigrationsNamespace($container->getParameter('doctrine_migrations.namespace'));
$configuration->setMigrationsNamespace($containerParameters['namespace']);
$configuration->setMigrationsDirectory($dir);
$configuration->registerMigrationsFromDirectory($dir);
$configuration->setName($container->getParameter('doctrine_migrations.name'));
$configuration->setMigrationsTableName($container->getParameter('doctrine_migrations.table_name'));
$configuration->setName($containerParameters['name']);
$configuration->setMigrationsTableName($containerParameters['table_name']);

self::injectContainerToMigrations($container, $configuration->getMigrations());
}

Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsDiffDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -44,7 +44,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsExecuteDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -43,7 +43,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsGenerateDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -43,7 +43,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsMigrateDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -43,7 +43,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsStatusDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -43,7 +43,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
6 changes: 5 additions & 1 deletion Command/MigrationsVersionDoctrineCommand.php
View file
Open in desktop
Expand Up @@ -43,7 +43,11 @@ public function execute(InputInterface $input, OutputInterface $output)
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

$configuration = $this->getMigrationConfiguration($input, $output);
DoctrineCommand::configureMigrations($this->getApplication()->getKernel()->getContainer(), $configuration);
DoctrineCommand::configureMigrations(
$this->getApplication()->getKernel()->getContainer(),
$configuration,
$input->getOption('em')
);

parent::execute($input, $output);
}
Expand Down
17 changes: 17 additions & 0 deletions DependencyInjection/Configuration.php
View file
Open in desktop
Expand Up @@ -35,6 +35,23 @@ public function getConfigTreeBuilder()
$rootNode = $treeBuilder->root('doctrine_migrations', 'array');

$rootNode
->beforeNormalization()
->ifTrue(function($v) {
if(empty($v)) {
return true;
}
$firstConfigValue = array_shift($v);

return !is_array($firstConfigValue);
})
->then(function($v) {
$v = array('default_entity_manager' => $v);

return $v;
})
->end()
->useAttributeAsKey('name')
->prototype('array')
->children()
->scalarNode('dir_name')->defaultValue('%kernel.root_dir%/DoctrineMigrations')->cannotBeEmpty()->end()
->scalarNode('namespace')->defaultValue('Application\Migrations')->cannotBeEmpty()->end()
Expand Down