Merge 739548c into 86d5a28

zendframework · Jun 2, 2015 · 70d8ac2 · 70d8ac2
2 parents 86d5a28 + 739548c
commit 70d8ac2
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 16 deletions.
diff --git a/test/HeaderSecurityTest.php b/test/HeaderSecurityTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\HeaderSecurity;

diff --git a/test/MessageTraitTest.php b/test/MessageTraitTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\Request;

diff --git a/test/PhpInputStreamTest.php b/test/PhpInputStreamTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\PhpInputStream;

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\Request;

diff --git a/test/Response/SapiEmitterTest.php b/test/Response/SapiEmitterTest.php
@@ -10,11 +10,10 @@
 namespace ZendTest\Diactoros\Response;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Diactoros\HeaderStack;  // test asset
 use Zend\Diactoros\Response;
 use Zend\Diactoros\Response\SapiEmitter;
-use Zend\Diactoros\SapiResponse; // test asset
 use Zend\Diactoros\Stream;
+use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 class SapiEmitterTest extends TestCase
 {

diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\Response;

diff --git a/test/ServerRequestFactoryTest.php b/test/ServerRequestFactoryTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;

diff --git a/test/ServerRequestTest.php b/test/ServerRequestTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -7,11 +7,11 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Diactoros\HeaderStack; // test asset
 use Zend\Diactoros\Server;
+use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 class ServerTest extends TestCase
 {

diff --git a/test/StreamTest.php b/test/StreamTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;

diff --git a/test/TestAsset/Functions.php b/test/TestAsset/Functions.php
@@ -19,7 +19,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros\TestAsset;
 
 /**
  * Store output artifacts

diff --git a/test/TestAsset/SapiResponse.php b/test/TestAsset/SapiResponse.php
@@ -20,7 +20,7 @@
 
 namespace Zend\Diactoros\Response;
 
-use Zend\Diactoros\HeaderStack;
+use ZendTest\Diactoros\TestAsset\HeaderStack;
 
 /**
  * Have headers been sent?

diff --git a/test/UploadedFileTest.php b/test/UploadedFileTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use ReflectionProperty;

diff --git a/test/UriTest.php b/test/UriTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
  */
 
-namespace Zend\Diactoros;
+namespace ZendTest\Diactoros;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Zend\Diactoros\Uri;