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 · 4b2a554 · 4b2a554
commit 4b2a554
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 2 deletions.
diff --git a/src/Writer/Entry.php b/src/Writer/Entry.php
@@ -11,7 +11,6 @@
 
 use DateTime;
 use Zend\Feed\Uri;
-use Zend\Feed\Writer\Exception;
 
 /**
 */

diff --git a/src/Writer/Feed.php b/src/Writer/Feed.php
@@ -11,7 +11,6 @@
 
 use Countable;
 use Iterator;
-use Zend\Feed\Writer\Renderer;
 
 /**
 */

diff --git a/...der/Integration/H-OnlineComAtom10Test.php → ...ader/Integration/HOnlineComAtom10Test.php b/...der/Integration/H-OnlineComAtom10Test.php → ...ader/Integration/HOnlineComAtom10Test.php
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     use DateTime;
     use Zend\Feed\Uri;
-    use Zend\Feed\Writer\Exception;
     /**
     */
@@ Expand Down @@