Merge branch 'hotfix/4783'

Close zendframework#4783
candelibas · Jul 17, 2013 · 9421166 · 9421166
2 parents 6bc8d0f + 698d5a5
commit 9421166
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -53,7 +53,7 @@ abstract class AbstractControllerTestCase extends PHPUnit_Framework_TestCase
     /**
      * Reset the application for isolation
      */
-    public function setUp()
+    protected function setUp()
     {
         $this->usedConsoleBackup = Console::isConsole();
         $this->reset();
@@ -62,7 +62,7 @@ public function setUp()
     /**
      * Restore params
      */
-    public function tearDown()
+    protected function tearDown()
     {
         Console::overrideIsConsole($this->usedConsoleBackup);
     }

diff --git a/tests/ZendTest/Test/PHPUnit/Controller/AbstractConsoleControllerTestCaseTest.php b/tests/ZendTest/Test/PHPUnit/Controller/AbstractConsoleControllerTestCaseTest.php
@@ -19,7 +19,7 @@
  */
 class AbstractConsoleControllerTestCaseTest extends AbstractConsoleControllerTestCase
 {
-    public function setUp()
+    protected function setUp()
     {
         $this->setApplicationConfig(
             include __DIR__ . '/../../_files/application.config.php'

diff --git a/tests/ZendTest/Test/PHPUnit/Controller/AbstractControllerTestCaseTest.php b/tests/ZendTest/Test/PHPUnit/Controller/AbstractControllerTestCaseTest.php
@@ -41,7 +41,7 @@ public static function rmdir($dir)
         return rmdir($dir);
     }
 
-    public function setUp()
+    protected function setUp()
     {
         $this->tearDownCacheDir();
         Console::overrideIsConsole(null);
@@ -51,7 +51,7 @@ public function setUp()
         parent::setUp();
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         $this->tearDownCacheDir();
         parent::tearDown();