Browse Source

Closed #77

Frank Brückner 12 years ago
parent
commit
2bfbaf4f62

+ 1 - 2
library/Zend/Application/Bootstrap/Bootstrap.php

@@ -53,7 +53,6 @@ class Zend_Application_Bootstrap_Bootstrap
      * Ensure FrontController resource is registered
      *
      * @param  Zend_Application|Zend_Application_Bootstrap_Bootstrapper $application
-     * @return void
      */
     public function __construct($application)
     {
@@ -120,7 +119,7 @@ class Zend_Application_Bootstrap_Bootstrap
     public function getResourceLoader()
     {
         if ((null === $this->_resourceLoader)
-            && (false != ($namespace = $this->getAppNamespace()))
+            && (false !== ($namespace = $this->getAppNamespace()))
         ) {
             $r    = new ReflectionClass($this);
             $path = $r->getFileName();

+ 23 - 0
tests/Zend/Application/Bootstrap/BootstrapTest.php

@@ -164,6 +164,29 @@ class Zend_Application_Bootstrap_BootstrapTest extends PHPUnit_Framework_TestCas
     }
 
     /**
+     * @group ZF-9435
+     */
+    public function testBootstrapShouldInitializeModuleAutoloaderWhenNamespaceSpecifiedAsEmpty()
+    {
+        $application = new Zend_Application(
+            'testing',
+            array(
+                 'appnamespace' => null,
+            )
+        );
+        $bootstrap   = new Zend_Application_Bootstrap_Bootstrap(
+            $application
+        );
+
+        // Tests
+        $this->assertTrue(
+            $bootstrap->getResourceLoader() instanceof Zend_Application_Module_Autoloader
+        );
+        $al = $bootstrap->getResourceLoader();
+        $this->assertEquals('', $al->getNamespace());
+    }
+
+    /**
      * @group ZF-7367
      */
     public function testBootstrapRunMethodShouldReturnResponseIfFlagEnabled()