Fix bug in classExists when using multiple autoloaders (i.e. ZF2)

lib/Doctrine/Common/ClassLoader.php

@@ -235,9 +235,12 @@ public static function classExists($className)
             } else if (is_string($loader) && $loader($className)) { // "MyClass::loadClass"
                 return true;
             }
+            if (class_exists($className, false) || interface_exists($className, false)) {
+                return true;
+            }
         }
 
-        return class_exists($className, false) || interface_exists($className, false);
+        return false;
     }
 
     /**

tests/Doctrine/Tests/Common/ClassLoaderTest.php

@@ -33,7 +33,26 @@ public function testClassExists()
         $this->assertTrue(ClassLoader::classExists('ClassLoaderTest\ClassD'));
         spl_autoload_unregister($badLoader);
     }
+
+    public function testClassExistsWithMultipleNonReturningAutoloaders()
+    {
+        $this->assertFalse(ClassLoader::classExists('ClassLoaderTest\ClassE'));
+        $nonReturnLoader = function($className) {
+            if (class_exists($className, false)) {
+                \PHPUnit_Framework_Assert::fail('Class load called twice for same class.');
+            }
+            require __DIR__ . '/ClassLoaderTest/ClassE.php';
+        };
+        $nonReturnLoader2 = clone $nonReturnLoader;
 
+        spl_autoload_register($nonReturnLoader);
+        spl_autoload_register($nonReturnLoader2);
+
+        $this->assertTrue(ClassLoader::classExists('ClassLoaderTest\ClassE'));
+        spl_autoload_unregister($nonReturnLoader);
+        spl_autoload_unregister($nonReturnLoader2);
+    }
+
     public function testGetClassLoader()
     {
         $cl = new ClassLoader('ClassLoaderTest', __DIR__);

tests/Doctrine/Tests/Common/ClassLoaderTest/ClassE.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace ClassLoaderTest;
+
+class ClassE {}