zendframework is now laminas

danopz · danopz · commit 5a28fb98f34d · 2020-01-07T23:20:16.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,7 @@ env:
         - TEST_COMMAND="./vendor/bin/phpunit"
     matrix:
         - SUITE="Guzzle"
-        - SUITE="Zend"
+        - SUITE="Laminas"
         - SUITE="Slim"
         - SUITE="Nyholm"
         - SUITE="RingCentral"
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 | PSR7 Implementation | Status        |
 | ------------------- |:-------------:|
 | Guzzle              | [![Guzzle](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/1)](https://travis-ci.org/php-http/psr7-integration-tests)      |
-| Zend                | [![Zend](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/2)](https://travis-ci.org/php-http/psr7-integration-tests)        |
+| Laminas             | [![Laminas](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/2)](https://travis-ci.org/php-http/psr7-integration-tests)        |
 | Slim                | [![Slim](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/3)](https://travis-ci.org/php-http/psr7-integration-tests)        |
 | Nyholm              | [![Nyholm](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/4)](https://travis-ci.org/php-http/psr7-integration-tests)      |
 | RingCentral         | [![RingCentral](https://travis-matrix-badges.herokuapp.com/repos/php-http/psr7-integration-tests/branches/master/5)](https://travis-ci.org/php-http/psr7-integration-tests)      |
diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
     },
     "require-dev": {
         "guzzlehttp/psr7": "^1.4",
+        "laminas/laminas-diactoros": "^2.1",
         "nyholm/psr7": "^1.0",
         "ringcentral/psr7": "^1.2",
-        "slim/psr7": "dev-master",
-        "zendframework/zend-diactoros": "^2.1"
+        "slim/psr7": "dev-master"
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -23,8 +23,8 @@
         <directory>./tests/Slim/</directory>
     </testsuite>
 
-    <testsuite name="Zend">
-        <directory>./tests/Zend/</directory>
+    <testsuite name="Laminas">
+        <directory>./tests/Laminas/</directory>
     </testsuite>
 
     <testsuite name="Nyholm">
diff --git a/tests/Laminas/RequestTest.php b/tests/Laminas/RequestTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\RequestIntegrationTest;
-use Zend\Diactoros\Request;
+use Laminas\Diactoros\Request;
 
 class RequestTest extends RequestIntegrationTest
 {
diff --git a/tests/Laminas/ResponseTest.php b/tests/Laminas/ResponseTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\ResponseIntegrationTest;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Response;
 
 class ResponseTest extends ResponseIntegrationTest
 {
diff --git a/tests/Laminas/ServerRequestTest.php b/tests/Laminas/ServerRequestTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\ServerRequestIntegrationTest;
-use Zend\Diactoros\ServerRequest;
+use Laminas\Diactoros\ServerRequest;
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
diff --git a/tests/Laminas/StreamTest.php b/tests/Laminas/StreamTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\StreamIntegrationTest;
+use Laminas\Diactoros\Stream;
 use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Stream;
 
 class StreamTest extends StreamIntegrationTest
 {
diff --git a/tests/Laminas/UploadedFileTest.php b/tests/Laminas/UploadedFileTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\UploadedFileIntegrationTest;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\UploadedFile;
+use Laminas\Diactoros\Stream;
+use Laminas\Diactoros\UploadedFile;
 
 class UploadedFileTest extends UploadedFileIntegrationTest
 {
diff --git a/tests/Laminas/UriTest.php b/tests/Laminas/UriTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Http\Psr7Test\Tests\Zend;
+namespace Http\Psr7Test\Tests\Laminas;
 
 use Http\Psr7Test\UriIntegrationTest;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\Uri;
 
 class UriTest extends UriIntegrationTest
 {

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Http\Psr7Test\Tests\Zend;`
	`3`	`+namespace Http\Psr7Test\Tests\Laminas;`
`4`	`4`
`5`	`5`	`use Http\Psr7Test\RequestIntegrationTest;`
`6`		`-use Zend\Diactoros\Request;`
	`6`	`+use Laminas\Diactoros\Request;`
`7`	`7`
`8`	`8`	`class RequestTest extends RequestIntegrationTest`
`9`	`9`	`{`