updated RegisterControllerArgumentLocatorsPass and fixed CI issues

przemyslaw-bogusz · przemyslaw-bogusz · commit 328bbfb07135 · 2019-01-20T15:10:20.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php b/src/Symfony/Component/DependencyInjection/Argument/BoundArgument.php
@@ -20,7 +20,7 @@ final class BoundArgument implements ArgumentInterface
     const DEFAULTS_BIND = 1;
     const INSTANCEOF_BIND = 2;
 
-    const MESSAGES = [
+    public static $messages = [
         1 => 'under "_defaults"',
         2 => 'under "_instanceof"',
     ];
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -41,7 +41,7 @@ public function process(ContainerBuilder $container)
                 $message = sprintf('You have a "bind" configured for an argument named "%s" ', $key);
 
                 if ($type) {
-                    $message .= BoundArgument::MESSAGES[$type];
+                    $message .= BoundArgument::$messages[$type];
                 } else {
                     $message .= sprintf('in service "%s"', $serviceId);
                 }
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\HttpKernel\DependencyInjection;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\DependencyInjection\Argument\BoundArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\Compiler\ServiceLocatorTagPass;
@@ -141,7 +142,7 @@ public function process(ContainerBuilder $container)
                             continue;
                         }
 
-                        $binding->setValues([$bindingValue, $bindingId, true]);
+                        $binding->setValues([$bindingValue, $bindingId, true, BoundArgument::SERVICE_BIND, null]);
                         $args[$p->name] = $bindingValue;
 
                         continue;

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function process(ContainerBuilder $container)`
`41`	`41`	`$message = sprintf('You have a "bind" configured for an argument named "%s" ', $key);`
`42`	`42`
`43`	`43`	`if ($type) {`
`44`		`- $message .= BoundArgument::MESSAGES[$type];`
	`44`	`+ $message .= BoundArgument::$messages[$type];`
`45`	`45`	`} else {`
`46`	`46`	`$message .= sprintf('in service "%s"', $serviceId);`
`47`	`47`	`}`