bug #18596 [DI] Fix internal caching in AutowirePass (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d1038c34219a · 2016-04-20T13:30:10.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- [DI] Fix internal caching in AutowirePass | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - ping @dunglas Commits ------- ed2e236 [DI] Fix internal caching in AutowirePass
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -228,7 +228,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)
      * @param string     $id
      * @param Definition $definition
      *
-     * @return \ReflectionClass|null
+     * @return \ReflectionClass|false
      */
     private function getReflectionClass($id, Definition $definition)
     {
@@ -238,15 +238,17 @@ private function getReflectionClass($id, Definition $definition)
 
         // Cannot use reflection if the class isn't set
         if (!$class = $definition->getClass()) {
-            return;
+            return false;
         }
 
         $class = $this->container->getParameterBag()->resolveValue($class);
 
         try {
-            return $this->reflectionClasses[$id] = new \ReflectionClass($class);
+            $reflector = new \ReflectionClass($class);
         } catch (\ReflectionException $reflectionException) {
-            // return null
+            $reflector = false;
         }
+
+        return $this->reflectionClasses[$id] = $reflector;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ private function createAutowiredDefinition(\ReflectionClass $typeHint, $id)`
`228`	`228`	`* @param string $id`
`229`	`229`	`* @param Definition $definition`
`230`	`230`	`*`
`231`		`- * @return \ReflectionClass\|null`
	`231`	`+ * @return \ReflectionClass\|false`
`232`	`232`	`*/`
`233`	`233`	`private function getReflectionClass($id, Definition $definition)`
`234`	`234`	`{`
`@@ -238,15 +238,17 @@ private function getReflectionClass($id, Definition $definition)`
`238`	`238`
`239`	`239`	`// Cannot use reflection if the class isn't set`
`240`	`240`	`if (!$class = $definition->getClass()) {`
`241`		`- return;`
	`241`	`+ return false;`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`$class = $this->container->getParameterBag()->resolveValue($class);`
`245`	`245`
`246`	`246`	`try {`
`247`		`- return $this->reflectionClasses[$id] = new \ReflectionClass($class);`
	`247`	`+ $reflector = new \ReflectionClass($class);`
`248`	`248`	`} catch (\ReflectionException $reflectionException) {`
`249`		`- // return null`
	`249`	`+ $reflector = false;`
`250`	`250`	`}`
	`251`	`+`
	`252`	`+ return $this->reflectionClasses[$id] = $reflector;`
`251`	`253`	`}`
`252`	`254`	`}`