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 · 40fb990 · 40fb990
commit 40fb990
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 5 deletions.
diff --git a/src/ClientStatic.php b/src/ClientStatic.php
@@ -9,7 +9,6 @@
 
 namespace Zend\Http;
 
-use Zend\Http\Client;
 
 /**
  * Http static client

diff --git a/src/Cookies.php b/src/Cookies.php
@@ -11,7 +11,6 @@
 
 use ArrayIterator;
 use Zend\Http\Header\SetCookie;
-use Zend\Http\Response;
 use Zend\Uri;
 
 

diff --git a/src/Headers.php b/src/Headers.php
@@ -13,7 +13,6 @@
 use Countable;
 use Iterator;
 use Traversable;
-use Zend\Http\HeaderLoader;
 use Zend\Loader\PluginClassLocator;
 
 /**

diff --git a/test/Header/CookieTest.php b/test/Header/CookieTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Http;
+namespace ZendTest\Http\Header;
 
 use Zend\Http\Header\Cookie;
 use Zend\Http\Header\SetCookie;

diff --git a/test/Response/ResponseStreamTest.php b/test/Response/ResponseStreamTest.php
@@ -7,7 +7,7 @@
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
-namespace ZendTest\Http;
+namespace ZendTest\Http\Response;
 
 use Zend\Http\Response\Stream;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     namespace Zend\Http;
-    use Zend\Http\Client;
     /**
      * Http static client
@@ Expand Down @@