updated RegisterControllerArgumentLocatorsPass and fixed CI issues

symfony · Jan 20, 2019 · 328bbfb · 328bbfb
1 parent 958ff16
commit 328bbfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
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/...mfony/Component/HttpKernel/DependencyInjection/RegisterControllerArgumentLocatorsPass.php b/...mfony/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;