MigrationsExtension: support multiple registrations [closes #94]

Author: JanTvrdik

src/Bridges/NetteDI/MigrationsExtension.php

@@ -16,7 +16,10 @@
 
 class MigrationsExtension extends Nette\DI\CompilerExtension
 {
+	/** attributes = ['for' => names of target migration extensions] */
 	const TAG_GROUP = 'nextras.migrations.group';
+
+	/** attributes = ['for' => names of target migration extensions, 'extension' => name of handled file extension] */
 	const TAG_EXTENSION_HANDLER = 'nextras.migrations.extensionHandler';
 
 	/** @var array */
@@ -123,13 +126,18 @@ public function beforeCompile()
 
 		// configuration
 		$groups = [];
-		foreach ($builder->findByTag(self::TAG_GROUP) as $serviceName => $_) {
-			$groups[] = $builder->getDefinition($serviceName);
+		foreach ($builder->findByTag(self::TAG_GROUP) as $serviceName => $tagAttributes) {
+			if (!isset($tagAttributes['for']) || in_array($this->name, $tagAttributes['for'], true)) {
+				$groups[] = $builder->getDefinition($serviceName);
+			}
 		}
 
 		$extensionHandlers = [];
-		foreach ($builder->findByTag(self::TAG_EXTENSION_HANDLER) as $serviceName => $extensionName) {
-			$extensionHandlers[$extensionName] = $builder->getDefinition($serviceName);
+		foreach ($builder->findByTag(self::TAG_EXTENSION_HANDLER) as $serviceName => $tagAttributes) {
+			if (!isset($tagAttributes['for']) || in_array($this->name, $tagAttributes['for'], true)) {
+				$extensionName = is_string($tagAttributes) ? $tagAttributes : $tagAttributes['extension'];
+				$extensionHandlers[$extensionName] = $builder->getDefinition($serviceName);
+			}
 		}
 
 		$builder->getDefinition($this->prefix('configuration'))
@@ -247,7 +255,7 @@ private function createGroupDefinitions(array $groups)
 
 			$serviceName = lcfirst(str_replace('-', '', ucwords($groupName, '-')));
 			$groupDefinitions[] = $builder->addDefinition($this->prefix("group.$serviceName"))
-				->addTag(self::TAG_GROUP)
+				->addTag(self::TAG_GROUP, ['for' => [$this->name]])
 				->setAutowired(FALSE)
 				->setClass('Nextras\Migrations\Entities\Group')
 				->addSetup('$name', [$groupName])
@@ -266,13 +274,13 @@ private function createExtensionHandlerDefinitions($driver, $phpParams)
 		$builder = $this->getContainerBuilder();
 
 		$sqlHandler = $builder->addDefinition($this->prefix('extensionHandler.sql'))
-			->addTag(self::TAG_EXTENSION_HANDLER, 'sql')
+			->addTag(self::TAG_EXTENSION_HANDLER, ['for' => [$this->name], 'extension' => 'sql'])
 			->setAutowired(FALSE)
 			->setClass('Nextras\Migrations\Extensions\SqlHandler')
 			->setArguments([$driver]);
 
 		$phpHandler = $builder->addDefinition($this->prefix('extensionHandler.php'))
-			->addTag(self::TAG_EXTENSION_HANDLER, 'php')
+			->addTag(self::TAG_EXTENSION_HANDLER, ['for' => [$this->name], 'extension' => 'php'])
 			->setClass('Nextras\Migrations\Extensions\PhpHandler')
 			->setAutowired(FALSE)
 			->setArguments([$phpParams]);

tests/cases/integration/nette-di/MigrationsExtension.multipleRegistrations.neon

@@ -0,0 +1,13 @@
+extensions:
+	migrationsA: Nextras\Migrations\Bridges\NetteDI\MigrationsExtension
+	migrationsB: Nextras\Migrations\Bridges\NetteDI\MigrationsExtension
+
+migrationsA:
+	dir: migrationsA
+	driver: mysql
+	dbal: Nextras\Migrations\Bridges\Dibi\DibiAdapter(Dibi\Connection(%dibiConfig%))
+
+migrationsB:
+	dir: migrationsB
+	driver: mysql
+	dbal: Nextras\Migrations\Bridges\Dibi\DibiAdapter(Dibi\Connection(%dibiConfig%))

tests/cases/integration/nette-di/MigrationsExtension.phpt

@@ -74,6 +74,7 @@ class MigrationsExtensionTest extends TestCase
 		if (!method_exists('Nette\DI\Compiler', 'setDynamicParameterNames')) {
 			Environment::skip('Required Nette >= 2.4.7');
 		}
+
 		Assert::noError(function() {
 			$this->createContainer('dynamicParameters', [
 				'rootDir' => __DIR__,
@@ -82,6 +83,19 @@ class MigrationsExtensionTest extends TestCase
 	}
 
 
+	public function testMultipleRegistrations()
+	{
+		$container = $this->createContainer('multipleRegistrations');
+
+		$configA = $container->getService('migrationsA.configuration');
+		$configB = $container->getService('migrationsB.configuration');
+
+		Assert::notSame($configA, $configB);
+		Assert::count(3, $configA->getGroups());
+		Assert::count(3, $configB->getGroups());
+	}
+
+
 	/**
 	 * @param  string $config
 	 * @return Nette\DI\Container