Merge branch 'feature/5338' into develop

Close #5338
zendframework · Oct 24, 2013 · f206707 · f206707
2 parents bfe2d63 + c164cf0
commit f206707
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/tests/ZendTest/Config/Reader/XmlTest.php b/tests/ZendTest/Config/Reader/XmlTest.php
@@ -21,6 +21,11 @@ public function setUp()
         $this->reader = new Xml();
     }
 
+    public function tearDown()
+    {
+        restore_error_handler();
+    }
+
     /**
      * getTestAssetPath(): defined by AbstractReaderTestCase.
      *

diff --git a/tests/ZendTest/Console/Prompt/CharTest.php b/tests/ZendTest/Console/Prompt/CharTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Console\Char;
+namespace ZendTest\Console\Prompt;
 
 use Zend\Console\Prompt\Char;
 use ZendTest\Console\TestAssets\ConsoleAdapter;

diff --git a/tests/ZendTest/Console/Prompt/ConfirmTest.php b/tests/ZendTest/Console/Prompt/ConfirmTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Console\Char;
+namespace ZendTest\Console\Prompt;
 
 use Zend\Console\Prompt\Confirm;
 use ZendTest\Console\TestAssets\ConsoleAdapter;

diff --git a/tests/ZendTest/Console/Prompt/LineTest.php b/tests/ZendTest/Console/Prompt/LineTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Console\Char;
+namespace ZendTest\Console\Prompt;
 
 use Zend\Console\Prompt\Line;
 use ZendTest\Console\TestAssets\ConsoleAdapter;

diff --git a/tests/ZendTest/Console/Prompt/NumberTest.php b/tests/ZendTest/Console/Prompt/NumberTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Console\Char;
+namespace ZendTest\Console\Prompt;
 
 use Zend\Console\Prompt\Number;
 use ZendTest\Console\TestAssets\ConsoleAdapter;

diff --git a/tests/ZendTest/Console/Prompt/SelectTest.php b/tests/ZendTest/Console/Prompt/SelectTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Console\Char;
+namespace ZendTest\Console\Prompt;
 
 use Zend\Console\Prompt\Select;
 use ZendTest\Console\TestAssets\ConsoleAdapter;