Forward port zendframework/zendframework#5672

Conflicts: library/Zend/EventManager/EventManagerAwareTrait.php library/Zend/Form/View/Helper/FormRow.php library/Zend/I18n/Translator/TranslatorAwareTrait.php library/Zend/Stdlib/Hydrator/AbstractHydrator.php tests/.php_cs tests/ZendTest/Loader/AutoloadDoesNotHideParseError.php tests/ZendTest/Loader/AutoloadableClass.php tests/ZendTest/Loader/MyLoader.php tests/ZendTest/Loader/MyOverloader.php tests/ZendTest/Loader/TestAsset/UnMappedClass.php tests/ZendTest/Version/VersionTest.php tests/ZendTest/View/_stubs/FilterDir1/Foo.php tests/ZendTest/View/_stubs/HelperDir1/Stub1.php tests/ZendTest/View/_stubs/HelperDir1/StubEmpty.php tests/ZendTest/View/_stubs/HelperDir2/Datetime.php tests/ZendTest/View/_stubs/HelperDir2/Stub1.php tests/ZendTest/View/_stubs/HelperDir2/Stub2.php
zendframework · Jan 4, 2014 · 2cbf238 · 2cbf238
commit 2cbf238
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 93 deletions.
diff --git a/test/AutoloadDoesNotHideParseError.php b/test/AutoloadDoesNotHideParseError.php
diff --git a/test/AutoloadableClass.php b/test/AutoloadableClass.php
diff --git a/test/ModuleAutoloaderTest.php b/test/ModuleAutoloaderTest.php
@@ -7,13 +7,13 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Loader\ModuleAutoloaderTest;
+namespace ZendTest\Loader;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Loader\ModuleAutoloader;
 use InvalidArgumentException;
 
-class ManagerTest extends TestCase
+class ModuleAutoloaderTest extends TestCase
 {
     public function setUp()
     {

diff --git a/test/MyLoader.php b/test/MyLoader.php
diff --git a/test/MyOverloader.php b/test/MyOverloader.php
diff --git a/test/TestAsset/UnMappedClass.php b/test/TestAsset/UnMappedClass.php