[PHP-5.3-COMPAT] Backported r17060 to trunk

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

tests/Zend/Controller/Action/Helper/AjaxContextTest.php

@@ -50,7 +50,7 @@ class Zend_Controller_Action_Helper_AjaxContextTest extends PHPUnit_Framework_Te
             unset($_SERVER['HTTP_X_REQUESTED_WITH']);
         }
 
-        Zend_Controller_Action_Helper_AjaxContextTest_LayoutOverride::$_mvcInstance = null;
+        Zend_Controller_Action_Helper_AjaxContextTest_LayoutOverride::resetMvcInstance();
         Zend_Controller_Action_HelperBroker::resetHelpers();
 
         $this->front = Zend_Controller_Front::getInstance();
@@ -184,7 +184,10 @@ class Zend_Controller_Action_Helper_AjaxContextTestController extends Zend_Contr
 
 class Zend_Controller_Action_Helper_AjaxContextTest_LayoutOverride extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_Controller_Action_Helper_AjaxContextTest::main() if this source file is executed directly.

tests/Zend/Controller/Action/Helper/AutoCompleteTest.php

@@ -46,7 +46,7 @@ class Zend_Controller_Action_Helper_AutoCompleteTest extends PHPUnit_Framework_T
      */
     public function setUp()
     {
-        Zend_Controller_Action_Helper_AutoCompleteTest_LayoutOverride::$_mvcInstance = null;
+        Zend_Controller_Action_Helper_AutoCompleteTest_LayoutOverride::resetMvcInstance();
         Zend_Controller_Action_HelperBroker::resetHelpers();
         Zend_Controller_Action_HelperBroker::setPluginLoader(null);
 
@@ -218,7 +218,10 @@ class Zend_Controller_Action_Helper_AutoCompleteTest extends PHPUnit_Framework_T
 
 class Zend_Controller_Action_Helper_AutoCompleteTest_LayoutOverride extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_Controller_Action_Helper_AutoCompleteTest::main() if this source file is executed directly.

tests/Zend/Controller/Action/Helper/ContextSwitchTest.php

@@ -48,7 +48,7 @@ class Zend_Controller_Action_Helper_ContextSwitchTest extends PHPUnit_Framework_
      */
     public function setUp()
     {
-        Zend_Controller_Action_Helper_ContextSwitchTest_LayoutOverride::$_mvcInstance = null;
+        Zend_Controller_Action_Helper_ContextSwitchTest_LayoutOverride::resetMvcInstance();
         Zend_Controller_Action_HelperBroker::resetHelpers();
 
         $this->front = Zend_Controller_Front::getInstance();
@@ -932,7 +932,10 @@ class Zend_Controller_Action_Helper_ContextSwitchTestController extends Zend_Con
 
 class Zend_Controller_Action_Helper_ContextSwitchTest_LayoutOverride extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 class Zend_Controller_Action_Helper_ContextSwitchText_CustomView implements Zend_View_Interface

tests/Zend/Controller/Action/Helper/JsonTest.php

@@ -43,7 +43,7 @@ class Zend_Controller_Action_Helper_JsonTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        Zend_Controller_Action_Helper_JsonTest_Layout::$_mvcInstance = null;
+        Zend_Controller_Action_Helper_JsonTest_Layout::resetMvcInstance();
 
         $this->response = new Zend_Controller_Response_Http();
         $this->response->headersSentThrowsException = false;
@@ -156,7 +156,10 @@ class Zend_Controller_Action_Helper_JsonTest extends PHPUnit_Framework_TestCase
  */
 class Zend_Controller_Action_Helper_JsonTest_Layout extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_Controller_Action_Helper_JsonTest::main() if this source file is executed directly.

tests/Zend/Layout/HelperTest.php

@@ -39,7 +39,7 @@ class Zend_Layout_HelperTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        Zend_Layout_HelperTest_Layout::$_mvcInstance = null;
+        Zend_Layout_HelperTest_Layout::resetMvcInstance();
         Zend_Controller_Front::getInstance()->resetInstance();
         if (Zend_Controller_Action_HelperBroker::hasHelper('Layout')) {
             Zend_Controller_Action_HelperBroker::removeHelper('Layout');
@@ -123,7 +123,10 @@ class Zend_Layout_HelperTest extends PHPUnit_Framework_TestCase
  */
 class Zend_Layout_HelperTest_Layout extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_Layout_HelperTest::main() if this source file is executed directly.

tests/Zend/Layout/LayoutTest.php

@@ -43,7 +43,7 @@ class Zend_Layout_LayoutTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        Zend_Layout_LayoutTest_Override::$_mvcInstance = null;
+        Zend_Layout_LayoutTest_Override::resetMvcInstance();
 
         Zend_Controller_Front::getInstance()->resetInstance();
         if (Zend_Controller_Action_HelperBroker::hasHelper('Layout')) {
@@ -526,7 +526,10 @@ class Zend_Layout_LayoutTest extends PHPUnit_Framework_TestCase
  */
 class Zend_Layout_LayoutTest_Override extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 class Zend_Layout_LayoutTest_Controller_Plugin_Layout extends Zend_Layout_Controller_Plugin_Layout

tests/Zend/Layout/PluginTest.php

@@ -43,7 +43,7 @@ class Zend_Layout_PluginTest extends PHPUnit_Framework_TestCase
     {
         Zend_Controller_Front::getInstance()->resetInstance();
 
-        Zend_Layout_PluginTest_Layout::$_mvcInstance = null;
+        Zend_Layout_PluginTest_Layout::resetMvcInstance();
 
         if (Zend_Controller_Action_HelperBroker::hasHelper('Layout')) {
             Zend_Controller_Action_HelperBroker::removeHelper('Layout');
@@ -181,7 +181,10 @@ class Zend_Layout_PluginTest extends PHPUnit_Framework_TestCase
  */
 class Zend_Layout_PluginTest_Layout extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_Layout_PluginTest::main() if this source file is executed directly.

tests/Zend/View/Helper/JsonTest.php

@@ -40,7 +40,7 @@ class Zend_View_Helper_JsonTest extends PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        Zend_View_Helper_JsonTest_Layout::$_mvcInstance = null;
+        Zend_View_Helper_JsonTest_Layout::resetMvcInstance();
 
         $this->response = new Zend_Controller_Response_Http();
         $this->response->headersSentThrowsException = false;
@@ -113,7 +113,10 @@ class Zend_View_Helper_JsonTest extends PHPUnit_Framework_TestCase
  */
 class Zend_View_Helper_JsonTest_Layout extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_View_Helper_JsonTest::main() if this source file is executed directly.

tests/Zend/View/Helper/LayoutTest.php

@@ -47,7 +47,7 @@ class Zend_View_Helper_LayoutTest extends PHPUnit_Framework_TestCase
             Zend_Controller_Action_HelperBroker::removeHelper('viewRenderer');
         }
 
-        Zend_View_Helper_LayoutTest_Layout::$_mvcInstance = null;
+        Zend_View_Helper_LayoutTest_Layout::resetMvcInstance();
     }
 
     /**
@@ -102,7 +102,10 @@ class Zend_View_Helper_LayoutTest extends PHPUnit_Framework_TestCase
  */
 class Zend_View_Helper_LayoutTest_Layout extends Zend_Layout
 {
-    public static $_mvcInstance;
+    public static function resetMvcInstance()
+    {
+        self::$_mvcInstance = null;
+    }
 }
 
 // Call Zend_View_Helper_LayoutTest::main() if this source file is executed directly.