[DependencyInjection] Refactor ServiceLocatorTagPass service matching

codedmonkey · codedmonkey · commit e58293bdafec · 2018-09-23T22:11:34.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -15,10 +15,12 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\ServiceLocator;
+use Symfony\Component\DependencyInjection\TypedReference;
 
 /**
  * Applies the "container.service_locator" tag by wrapping references into ServiceClosureArgument instances.
@@ -42,15 +44,31 @@ protected function processValue($value, $isRoot = false)
 
         $arguments = $value->getArguments();
         if (!isset($arguments[0]) || !\is_array($arguments[0])) {
-            throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
+            throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references or service types is expected as first argument when the "container.service_locator" tag is set.', $this->currentId));
         }
 
         foreach ($arguments[0] as $k => $v) {
             if ($v instanceof ServiceClosureArgument) {
                 continue;
             }
+
+            if (\is_string($type = $v) && preg_match('/^\??[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+$/', $type)) {
+                if ($optionalBehavior = '?' === $type[0]) {
+                    $type = substr($type, 1);
+                    $optionalBehavior = ContainerInterface::IGNORE_ON_INVALID_REFERENCE;
+                }
+
+                $v = new TypedReference((string) new Reference($type), $type, $optionalBehavior ?: ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);
+            }
+
             if (!$v instanceof Reference) {
-                throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k));
+                throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": an array of references or service types is expected as first argument when the "container.service_locator" tag is set, "%s" found for key "%s".', $this->currentId, \is_object($v) ? \get_class($v) : \gettype($v), $k));
+            }
+
+            if (\is_int($k)) {
+                unset($arguments[0][$k]);
+
+                $k = (string) $v;
             }
             $arguments[0][$k] = new ServiceClosureArgument($v);
         }
