ZF-8809: fix errors in Barcode, Zend_Controller_Action tests

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

library/Zend/Controller/Action/Helper/Abstract.php

@@ -75,11 +75,7 @@ abstract class Zend_Controller_Action_Helper_Abstract
      */
     public function getFrontController()
     {
-        if (null === $this->_frontController) {
-            $this->_frontController = Zend_Controller_Front::getInstance();
-        }
-
-        return $this->_frontController;
+        return Zend_Controller_Front::getInstance();
     }
 
     /**

library/Zend/Controller/Action/Helper/ViewRenderer.php

@@ -85,12 +85,6 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
     protected $_delimiters;
 
     /**
-     * Front controller instance
-     * @var Zend_Controller_Front
-     */
-    protected $_frontController;
-
-    /**
      * @var Zend_Filter_Inflector
      */
     protected $_inflector;
@@ -252,7 +246,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
              * @see Zend_Controller_Action_Exception
              */
             require_once 'Zend/Controller/Action/Exception.php';
-            throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory');
+            throw new Zend_Controller_Action_Exception('ViewRenderer cannot locate module directory for module "' . $module . '"');
         }
         $this->_moduleDir = dirname($moduleDir);
         return $this->_moduleDir;
@@ -387,7 +381,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
         $inflector = $this->getInflector();
         $this->_setInflectorTarget($this->getViewBasePathSpec());
 
-        $dispatcher = $this->_frontController->getDispatcher();
+        $dispatcher = $this->getFrontController()->getDispatcher();
         $request = $this->getRequest();
 
         $parts = array(
@@ -843,7 +837,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
     {
         $inflector  = $this->getInflector();
         $request    = $this->getRequest();
-        $dispatcher = $this->_frontController->getDispatcher();
+        $dispatcher = $this->getFrontController()->getDispatcher();
         $module     = $dispatcher->formatModuleName($request->getModuleName());
         $controller = $request->getControllerName();
         $action     = $dispatcher->formatActionName($request->getActionName());

tests/Zend/Barcode/Renderer/ImageTest.php

@@ -43,6 +43,7 @@ class Zend_Barcode_Renderer_ImageTest extends Zend_Barcode_Renderer_TestCommon
         if (!function_exists('gd_info')) {
             $this->markTestSkipped('Zend_Barcode_Renderer_ImageTest requires the GD extension');
         }
+        parent::setUp();
     }
 
     protected function _getRendererObject($options = null)

tests/Zend/Controller/ActionTest.php

@@ -62,6 +62,11 @@ class Zend_Controller_ActionTest extends PHPUnit_Framework_TestCase
 
     public function setUp()
     {
+        Zend_Controller_Action_HelperBroker::resetHelpers();
+        $front = Zend_Controller_Front::getInstance();
+        $front->resetInstance();
+        $front->setControllerDirectory('.', 'default');
+
         $this->_controller = new Zend_Controller_ActionTest_TestController(
             new Zend_Controller_Request_Http(),
             new Zend_Controller_Response_Cli(),
@@ -70,10 +75,7 @@ class Zend_Controller_ActionTest extends PHPUnit_Framework_TestCase
                 'bar' => 'baz'
             )
         );
-        $front = Zend_Controller_Front::getInstance();
-        $front->resetInstance();
-        $front->setControllerDirectory('.');
-        Zend_Controller_Action_HelperBroker::resetHelpers();
+
         $redirector = $this->_controller->getHelper('redirector');
         $redirector->setExit(false);
     }