Merge PR #5783 to develop

Merge branch 'hotfix/standard-autoloader-stack' of git://github.com/weierophinney/zf2 into weierophinney-hotfix/standard-autoloader-stack * 'hotfix/standard-autoloader-stack' of git://github.com/weierophinney/zf2: [#5783] Assertion on return value Do not exit from loadClass() early
zendframework · Feb 5, 2014 · 2ae43e3 · 2ae43e3
2 parents 18e2f00 + 70cd8a5
commit 2ae43e3
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/library/Zend/Loader/StandardAutoloader.php b/library/Zend/Loader/StandardAutoloader.php
@@ -302,7 +302,6 @@ protected function loadClass($class, $type)
                 if (file_exists($filename)) {
                     return include $filename;
                 }
-                return false;
             }
         }
         return false;

diff --git a/tests/ZendTest/Loader/StandardAutoloaderTest.php b/tests/ZendTest/Loader/StandardAutoloaderTest.php
@@ -190,4 +190,13 @@ public function testCanTellAutoloaderToRegisterZendNamespaceAtInstantiation()
         $this->assertAttributeEquals($expected, 'namespaces', $loader);
     }
 
+    public function testWillLoopThroughAllNamespacesUntilMatchIsFoundWhenAutoloading()
+    {
+        $loader = new StandardAutoloader();
+        $loader->registerNamespace('ZendTest\Loader\TestAsset\Parent', __DIR__ . '/TestAsset/Parent');
+        $loader->registerNamespace('ZendTest\Loader\TestAsset\Parent\Child', __DIR__ . '/TestAsset/Child');
+        $result = $loader->autoload('ZendTest\Loader\TestAsset\Parent\Child\Subclass');
+        $this->assertTrue($result !== false);
+        $this->assertTrue(class_exists('ZendTest\Loader\TestAsset\Parent\Child\Subclass', false));
+    }
 }
diff --git a/tests/ZendTest/Loader/TestAsset/Child/Subclass.php b/tests/ZendTest/Loader/TestAsset/Child/Subclass.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Loader\TestAsset\Parent\Child;
+
+/**
+ * @group      Loader
+ */
+class Subclass
+{
+}
diff --git a/tests/ZendTest/Loader/TestAsset/Parent/.placeholder b/tests/ZendTest/Loader/TestAsset/Parent/.placeholder