ZF-6591: correct placement of suppressErrors logic in _autoload() to fix issue with loading resource plugins

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@15473 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Loader/Autoloader.php

@@ -436,15 +436,16 @@ class Zend_Loader_Autoloader
     protected function _autoload($class)
     {
         $callback = $this->getDefaultAutoloader();
-        if ($this->suppressNotFoundWarnings()) {
-            try {
+        try {
+            if ($this->suppressNotFoundWarnings()) {
                 @call_user_func($callback, $class);
-                return $class;
-            } catch (Zend_Exception $e) {
-                return false;
+            } else {
+                call_user_func($callback, $class);
             }
+            return $class;
+        } catch (Zend_Exception $e) {
+            return false;
         }
-        return call_user_func($callback, $class);
     }
 
     /**

tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php

@@ -68,6 +68,7 @@ class Zend_Application_Bootstrap_BootstrapAbstractTest extends PHPUnit_Framework
         $this->autoloader = Zend_Loader_Autoloader::getInstance();
 
         $this->application = new Zend_Application('testing');
+        $this->error = false;
     }
 
     public function tearDown()
@@ -83,6 +84,12 @@ class Zend_Application_Bootstrap_BootstrapAbstractTest extends PHPUnit_Framework
         }
     }
 
+    public function handleError($errno, $errstr)
+    {
+        $this->error = $errstr;
+        return true;
+    }
+
     public function testConstructorShouldPopulateApplication()
     {
         require_once dirname(__FILE__) . '/../_files/ZfAppBootstrap.php';
@@ -583,6 +590,9 @@ class Zend_Application_Bootstrap_BootstrapAbstractTest extends PHPUnit_Framework
         $this->assertTrue($resource2 instanceof Zend_Layout);
     }
 
+    /**
+     * @group ZF-6471
+     */
     public function testBootstrapShouldPassItselfToResourcePluginConstructor()
     {
         $this->application->setOptions(array(
@@ -597,6 +607,25 @@ class Zend_Application_Bootstrap_BootstrapAbstractTest extends PHPUnit_Framework
         $resource = $bootstrap->getPluginResource('layout');
         $this->assertTrue($resource->bootstrapSetInConstructor, var_export(get_object_vars($resource), 1));
     }
+
+    /**
+     * @group ZF-6591
+     */
+    public function testRequestingPluginsByShortNameShouldNotRaiseFatalErrors()
+    {
+        $this->autoloader->setFallbackAutoloader(true)
+                         ->suppressNotFoundWarnings(false);
+        $this->application->setOptions(array(
+            'resources' => array(
+                'FrontController' => array(),
+            ),
+        ));
+        set_error_handler(array($this, 'handleError'));
+        $bootstrap = new Zend_Application_Bootstrap_Bootstrap($this->application);
+        $resource = $bootstrap->getPluginResource('FrontController');
+        restore_error_handler();
+        $this->assertTrue(false !== $this->error);
+    }
 }
 
 class Zend_Application_Bootstrap_BootstrapAbstractTest_View