Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit da30c7a4e856 · 2020-07-23T12:40:15.000+02:00
* 4.4:
  [Messenger] fix computing the id of same-name middleware
diff --git a/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php b/src/Symfony/Component/Messenger/DependencyInjection/MessengerPass.php
@@ -339,14 +339,17 @@ private function registerBusMiddleware(ContainerBuilder $container, string $busI
             if ($container->findDefinition($messengerMiddlewareId)->isAbstract()) {
                 $childDefinition = new ChildDefinition($messengerMiddlewareId);
                 $childDefinition->setArguments($arguments);
-                $container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id.'.'.ContainerBuilder::hash($arguments), $childDefinition);
+                if (isset($middlewareReferences[$messengerMiddlewareId = $busId.'.middleware.'.$id])) {
+                    $messengerMiddlewareId .= '.'.ContainerBuilder::hash($arguments);
+                }
+                $container->setDefinition($messengerMiddlewareId, $childDefinition);
             } elseif ($arguments) {
                 throw new RuntimeException(sprintf('Invalid middleware factory "%s": a middleware factory must be an abstract definition.', $id));
             }
 
-            $middlewareReferences[] = new Reference($messengerMiddlewareId);
+            $middlewareReferences[$messengerMiddlewareId] = new Reference($messengerMiddlewareId);
         }
 
-        $container->getDefinition($busId)->replaceArgument(0, new IteratorArgument($middlewareReferences));
+        $container->getDefinition($busId)->replaceArgument(0, new IteratorArgument(array_values($middlewareReferences)));
     }
 }
diff --git a/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php b/src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
@@ -517,7 +517,7 @@ public function testRegistersMiddlewareFromServices()
         (new ResolveChildDefinitionsPass())->process($container);
 
         $this->assertTrue($container->hasDefinition(
-            $factoryChildMiddlewareArgs1Id = $fooBusId.'.middleware.middleware_with_factory.'.ContainerBuilder::hash($factoryChildMiddlewareArgs1)
+            $factoryChildMiddlewareArgs1Id = $fooBusId.'.middleware.middleware_with_factory'
         ));
         $this->assertEquals(
             ['foo', 'bar'],
@@ -535,7 +535,7 @@ public function testRegistersMiddlewareFromServices()
         );
 
         $this->assertTrue($container->hasDefinition(
-            $factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default.'.ContainerBuilder::hash([])
+            $factoryWithDefaultChildMiddlewareId = $fooBusId.'.middleware.middleware_with_factory_using_default'
         ));
         $this->assertEquals(
             ['some_default'],

Original file line number	Diff line number	Diff line change
`@@ -339,14 +339,17 @@ private function registerBusMiddleware(ContainerBuilder $container, string $busI`
`339`	`339`	`if ($container->findDefinition($messengerMiddlewareId)->isAbstract()) {`
`340`	`340`	`$childDefinition = new ChildDefinition($messengerMiddlewareId);`
`341`	`341`	`$childDefinition->setArguments($arguments);`
`342`		`- $container->setDefinition($messengerMiddlewareId = $busId.'.middleware.'.$id.'.'.ContainerBuilder::hash($arguments), $childDefinition);`
	`342`	`+ if (isset($middlewareReferences[$messengerMiddlewareId = $busId.'.middleware.'.$id])) {`
	`343`	`+ $messengerMiddlewareId .= '.'.ContainerBuilder::hash($arguments);`
	`344`	`+ }`
	`345`	`+ $container->setDefinition($messengerMiddlewareId, $childDefinition);`
`343`	`346`	`} elseif ($arguments) {`
`344`	`347`	`throw new RuntimeException(sprintf('Invalid middleware factory "%s": a middleware factory must be an abstract definition.', $id));`
`345`	`348`	`}`
`346`	`349`
`347`		`- $middlewareReferences[] = new Reference($messengerMiddlewareId);`
	`350`	`+ $middlewareReferences[$messengerMiddlewareId] = new Reference($messengerMiddlewareId);`
`348`	`351`	`}`
`349`	`352`
`350`		`- $container->getDefinition($busId)->replaceArgument(0, new IteratorArgument($middlewareReferences));`
	`353`	`+ $container->getDefinition($busId)->replaceArgument(0, new IteratorArgument(array_values($middlewareReferences)));`
`351`	`354`	`}`
`352`	`355`	`}`