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 · 30d2b4b · 30d2b4b
commit 30d2b4b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
@@ -9,7 +9,6 @@
 
 namespace Zend\ServiceManager;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 interface InitializerInterface
 {

diff --git a/src/ServiceLocatorAwareTrait.php b/src/ServiceLocatorAwareTrait.php
@@ -9,7 +9,6 @@
 
 namespace Zend\ServiceManager;
 
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 trait ServiceLocatorAwareTrait
 {