Register default store as service to be accessible by the AddConsoleCommandPass

Jelle van Oosterbosch · Jelle van Oosterbosch · commit bd46276f6971 · 2019-06-07T00:24:36.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1606,7 +1606,8 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont
                 $combinedDefinition->replaceArgument(0, $storeDefinitions);
                 $container->setDefinition('lock.'.$resourceName.'.store', $combinedDefinition);
             } else {
-                $container->setAlias('lock.'.$resourceName.'.store', new Alias((string) $storeDefinitions[0], false));
+                $storeDefinition = new ChildDefinition($storeDefinitions[0]);
+                $container->setDefinition('lock.'.$resourceName.'.store', $storeDefinition);
             }
 
             // Generate factories for each resource
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -87,7 +87,7 @@ public function process(ContainerBuilder $container)
                 $definition->addMethodCall('setAliases', [$aliases]);
             }
 
-            $storeDefinition = 'lock.store';
+            $storeDefinition = 'lock.default.store';
             if ($container->hasDefinition($storeDefinition)) {
                 if (\method_exists($definition->getClass(), 'setStore')) {
                     $definition->addMethodCall('setStore', [$container->getDefinition($storeDefinition)]);
diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -254,7 +254,7 @@ public function testProcessRegistersStoreInCommand()
 
         $container = new ContainerBuilder();
         $container
-            ->register('lock.store', $this->createMock($storeClassName))
+            ->register('lock.default.store', $this->createMock($storeClassName))
             ->setPublic(false)
         ;
         $container

Original file line number	Diff line number	Diff line change
`@@ -1606,7 +1606,8 @@ private function registerLockConfiguration(array $config, ContainerBuilder $cont`
`1606`	`1606`	`$combinedDefinition->replaceArgument(0, $storeDefinitions);`
`1607`	`1607`	`$container->setDefinition('lock.'.$resourceName.'.store', $combinedDefinition);`
`1608`	`1608`	`} else {`
`1609`		`- $container->setAlias('lock.'.$resourceName.'.store', new Alias((string) $storeDefinitions[0], false));`
	`1609`	`+ $storeDefinition = new ChildDefinition($storeDefinitions[0]);`
	`1610`	`+ $container->setDefinition('lock.'.$resourceName.'.store', $storeDefinition);`
`1610`	`1611`	`}`
`1611`	`1612`
`1612`	`1613`	`// Generate factories for each resource`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function process(ContainerBuilder $container)`
`87`	`87`	`$definition->addMethodCall('setAliases', [$aliases]);`
`88`	`88`	`}`
`89`	`89`
`90`		`- $storeDefinition = 'lock.store';`
	`90`	`+ $storeDefinition = 'lock.default.store';`
`91`	`91`	`if ($container->hasDefinition($storeDefinition)) {`
`92`	`92`	`if (\method_exists($definition->getClass(), 'setStore')) {`
`93`	`93`	`$definition->addMethodCall('setStore', [$container->getDefinition($storeDefinition)]);`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ public function testProcessRegistersStoreInCommand()`
`254`	`254`
`255`	`255`	`$container = new ContainerBuilder();`
`256`	`256`	`$container`
`257`		`- ->register('lock.store', $this->createMock($storeClassName))`
	`257`	`+ ->register('lock.default.store', $this->createMock($storeClassName))`
`258`	`258`	`->setPublic(false)`
`259`	`259`	`;`
`260`	`260`	`$container`