Merge branch '3.3' into 3.4

* 3.3:
  [Config] Always protect ClassExistenceResource against bad parents

Author: fabpot

Resource/ClassExistenceResource.php

@@ -21,25 +21,21 @@
  */
 class ClassExistenceResource implements SelfCheckingResourceInterface, \Serializable
 {
-    const EXISTS_OK = 1;
-    const EXISTS_KO = 0;
-    const EXISTS_KO_WITH_THROWING_AUTOLOADER = -1;
-
     private $resource;
-    private $existsStatus;
+    private $exists;
 
     private static $autoloadLevel = 0;
     private static $existsCache = array();
 
     /**
-     * @param string   $resource     The fully-qualified class name
-     * @param int|null $existsStatus One of the self::EXISTS_* const if the existency check has already been done
+     * @param string    $resource The fully-qualified class name
+     * @param bool|null $exists   Boolean when the existency check has already been done
      */
-    public function __construct($resource, $existsStatus = null)
+    public function __construct($resource, $exists = null)
     {
         $this->resource = $resource;
-        if (null !== $existsStatus) {
-            $this->existsStatus = (int) $existsStatus;
+        if (null !== $exists) {
+            $this->exists = (bool) $exists;
         }
     }
 
@@ -64,11 +60,13 @@ public function getResource()
      */
     public function isFresh($timestamp)
     {
+        $loaded = class_exists($this->resource, false) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
+
         if (null !== $exists = &self::$existsCache[$this->resource]) {
-            $exists = $exists || class_exists($this->resource, false) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
-        } elseif (self::EXISTS_KO_WITH_THROWING_AUTOLOADER === $this->existsStatus) {
+            $exists = $exists || $loaded;
+        } elseif (!$exists = $loaded) {
             if (!self::$autoloadLevel++) {
-                spl_autoload_register('Symfony\Component\Config\Resource\ClassExistenceResource::throwOnRequiredClass');
+                spl_autoload_register(__CLASS__.'::throwOnRequiredClass');
             }
 
             try {
@@ -77,38 +75,36 @@ public function isFresh($timestamp)
                 $exists = false;
             } finally {
                 if (!--self::$autoloadLevel) {
-                    spl_autoload_unregister('Symfony\Component\Config\Resource\ClassExistenceResource::throwOnRequiredClass');
+                    spl_autoload_unregister(__CLASS__.'::throwOnRequiredClass');
                 }
             }
-        } else {
-            $exists = class_exists($this->resource) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
         }
 
-        if (null === $this->existsStatus) {
-            $this->existsStatus = $exists ? self::EXISTS_OK : self::EXISTS_KO;
+        if (null === $this->exists) {
+            $this->exists = $exists;
         }
 
-        return self::EXISTS_OK === $this->existsStatus xor !$exists;
+        return $this->exists xor !$exists;
     }
 
     /**
      * {@inheritdoc}
      */
     public function serialize()
     {
-        if (null === $this->existsStatus) {
+        if (null === $this->exists) {
             $this->isFresh(0);
         }
 
-        return serialize(array($this->resource, $this->existsStatus));
+        return serialize(array($this->resource, $this->exists));
     }
 
     /**
      * {@inheritdoc}
      */
     public function unserialize($serialized)
     {
-        list($this->resource, $this->existsStatus) = unserialize($serialized);
+        list($this->resource, $this->exists) = unserialize($serialized);
     }
 
     /**

Tests/Resource/ClassExistenceResourceTest.php

@@ -66,7 +66,7 @@ public function testExistsKo()
 
             $loadedClass = 123;
 
-            $res = new ClassExistenceResource('MissingFooClass', ClassExistenceResource::EXISTS_KO);
+            $res = new ClassExistenceResource('MissingFooClass', false);
 
             $this->assertSame(123, $loadedClass);
         } finally {
@@ -76,7 +76,7 @@ public function testExistsKo()
 
     public function testConditionalClass()
     {
-        $res = new ClassExistenceResource(ConditionalClass::class, ClassExistenceResource::EXISTS_KO_WITH_THROWING_AUTOLOADER);
+        $res = new ClassExistenceResource(ConditionalClass::class, false);
 
         $this->assertFalse($res->isFresh(0));
     }