Merge branch 'hotfix/2685'

weierophinney · weierophinney · commit 9db875ba160e · 2012-10-08T12:16:00.000-05:00
Close zendframework/zendframework#2685
diff --git a/src/Header/Cookie.php b/src/Header/Cookie.php
@@ -11,7 +11,6 @@
 namespace Zend\Http\Header;
 
 use ArrayObject;
-use Zend\Uri;
 
 /**
  * @see http://www.ietf.org/rfc/rfc2109.txt
diff --git a/src/Header/Location.php b/src/Header/Location.php
@@ -10,7 +10,6 @@
 
 namespace Zend\Http\Header;
 
-use Zend\Uri\Http as HttpUri;
 
 /**
  * Location Header
diff --git a/test/Client/UseCaseTest.php b/test/Client/UseCaseTest.php
@@ -12,7 +12,6 @@
 
 use Zend\Http\Client as HTTPClient;
 use Zend\Http\Client\Adapter;
-use Zend\Http\Client\Adapter\Exception as AdapterException;
 use Zend\Http\Response;
 use Zend\Http\Request;
 
diff --git a/test/Header/AcceptTest.php b/test/Header/AcceptTest.php
@@ -10,7 +10,6 @@
 
 namespace ZendTest\Http\Header;
 
-use Zend\Http\Header\GenericHeader;
 use Zend\Http\Header\Accept;
 
 
diff --git a/test/Header/ContentLocationTest.php b/test/Header/ContentLocationTest.php
@@ -11,7 +11,6 @@
 namespace ZendTest\Http\Header;
 
 use Zend\Http\Header\ContentLocation;
-use Zend\Uri\Http as HttpUri;
 
 class ContentLocationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/Header/LocationTest.php b/test/Header/LocationTest.php
@@ -11,7 +11,6 @@
 namespace ZendTest\Http\Header;
 
 use Zend\Http\Header\Location;
-use Zend\Uri\Http as HttpUri;
 
 class LocationTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/test/Header/RefererTest.php b/test/Header/RefererTest.php
@@ -11,7 +11,6 @@
 namespace ZendTest\Http\Header;
 
 use Zend\Http\Header\Referer;
-use Zend\Uri\Http as HttpUri;
 
 class RefererTest extends \PHPUnit_Framework_TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`	`namespace ZendTest\Http\Header;`
`12`	`12`
`13`		`-use Zend\Http\Header\GenericHeader;`
`14`	`13`	`use Zend\Http\Header\Accept;`
`15`	`14`
`16`	`15`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`namespace ZendTest\Http\Header;`
`12`	`12`
`13`	`13`	`use Zend\Http\Header\ContentLocation;`
`14`		`-use Zend\Uri\Http as HttpUri;`
`15`	`14`
`16`	`15`	`class ContentLocationTest extends \PHPUnit_Framework_TestCase`
`17`	`16`	`{`