[DI] Fix hidding service in autowiring errors

nicolas-grekas · nicolas-grekas · commit 68eda493229e · 2018-05-16T18:27:27.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -308,7 +308,7 @@ private function populateAvailableType(string $id, Definition $definition)
             return;
         }
 
-        if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) || $definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
+        if ('' === $id || '.' === $id[0] || $definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ private function populateAvailableType(string $id, Definition $definition)`
`308`	`308`	`return;`
`309`	`309`	`}`
`310`	`310`
`311`		`- if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) \|\| $definition->isDeprecated() \|\| !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {`
	`311`	`+ if ('' === $id \|\| '.' === $id[0] \|\| $definition->isDeprecated() \|\| !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {`
`312`	`312`	`return;`
`313`	`313`	`}`
`314`	`314`