[Config] Always protect ClassExistenceResource against bad parents

Author: nicolas-grekas

Compiler/AutowirePass.php

@@ -388,7 +388,7 @@ private function populateAvailableType($id, Definition $definition)
             unset($this->ambiguousServiceTypes[$type]);
         }
 
-        if ($definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), true)) {
+        if ($definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass())) {
             return;
         }
 
@@ -444,7 +444,7 @@ private function set($type, $id)
      */
     private function createAutowiredDefinition($type)
     {
-        if (!($typeHint = $this->container->getReflectionClass($type, true)) || !$typeHint->isInstantiable()) {
+        if (!($typeHint = $this->container->getReflectionClass($type)) || !$typeHint->isInstantiable()) {
             return;
         }
 
@@ -478,7 +478,7 @@ private function createAutowiredDefinition($type)
 
     private function createTypeNotFoundMessage(TypedReference $reference, $label)
     {
-        if (!$r = $this->container->getReflectionClass($type = $reference->getType(), true)) {
+        if (!$r = $this->container->getReflectionClass($type = $reference->getType())) {
             $message = sprintf('has type "%s" but this class does not exist.', $type);
         } else {
             $message = $this->container->has($type) ? 'this service is abstract' : 'no such service exists';

ContainerBuilder.php

@@ -337,13 +337,12 @@ public function addClassResource(\ReflectionClass $class)
      * Retrieves the requested reflection class and registers it for resource tracking.
      *
      * @param string $class
-     * @param bool   $koWithThrowingAutoloader Whether autoload should be protected against bad parents or not
      *
      * @return \ReflectionClass|null
      *
      * @final
      */
-    public function getReflectionClass($class, $koWithThrowingAutoloader = false)
+    public function getReflectionClass($class)
     {
         if (!$class = $this->getParameterBag()->resolveValue($class)) {
             return;
@@ -353,20 +352,17 @@ public function getReflectionClass($class, $koWithThrowingAutoloader = false)
         try {
             if (isset($this->classReflectors[$class])) {
                 $classReflector = $this->classReflectors[$class];
-            } elseif ($koWithThrowingAutoloader) {
-                $resource = new ClassExistenceResource($class, ClassExistenceResource::EXISTS_KO_WITH_THROWING_AUTOLOADER);
-
-                $classReflector = $resource->isFresh(0) ? false : new \ReflectionClass($class);
             } else {
-                $classReflector = new \ReflectionClass($class);
+                $resource = new ClassExistenceResource($class, false);
+                $classReflector = $resource->isFresh(0) ? false : new \ReflectionClass($class);
             }
         } catch (\ReflectionException $e) {
             $classReflector = false;
         }
 
         if ($this->trackResources) {
             if (!$classReflector) {
-                $this->addResource($resource ?: new ClassExistenceResource($class, ClassExistenceResource::EXISTS_KO));
+                $this->addResource($resource ?: new ClassExistenceResource($class, false));
             } elseif (!$classReflector->isInternal()) {
                 $path = $classReflector->getFileName();
 

composer.json

@@ -32,7 +32,7 @@
         "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
     },
     "conflict": {
-        "symfony/config": "<3.3",
+        "symfony/config": "<3.3.1",
         "symfony/finder": "<3.3",
         "symfony/yaml": "<3.3"
     },