Add integration tests

.travis.yml

@@ -9,7 +9,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="php-coveralls/php-coveralls"
+    - DEPENDENCIES=""
     - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
@@ -31,6 +31,7 @@ matrix:
         - DEPS=locked
         - CHECK_CS=true
         - TEST_COVERAGE=true
+        - DEPENDENCIES="php-coveralls/php-coveralls"
     - php: 7
       env:
         - DEPS=latest
@@ -52,6 +53,11 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.2
+      name: Integration tests
+      env:
+        - DEPENDENCIES="http-interop/http-factory-diactoros"
+
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
@@ -62,7 +68,7 @@ install:
   - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - if ! [ -v "$DEPENDENCIES" ]; then travis_retry composer require --dev $COMPOSER_ARGS $DEPENDENCIES ; fi
   - stty cols 120 && composer show
 
 script:

composer.json

@@ -30,6 +30,7 @@
   "require-dev": {
     "ext-dom": "*",
     "ext-libxml": "*",
+    "php-http/psr7-integration-tests": "dev-master",
     "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
     "zendframework/zend-coding-standard": "~1.0"
   },

phpunit.xml.dist

@@ -10,4 +10,13 @@
             <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
+
+    <php>
+        <const name="REQUEST_FACTORY" value="Http\Factory\Diactoros\RequestFactory"/>
+        <const name="RESPONSE_FACTORY" value="Http\Factory\Diactoros\ResponseFactory"/>
+        <const name="SERVER_REQUEST_FACTORY" value="Http\Factory\Diactoros\ServerRequestFactory"/>
+        <const name="STREAM_FACTORY" value="Http\Factory\Diactoros\StreamFactory"/>
+        <const name="UPLOADED_FILE_FACTORY" value="Http\Factory\Diactoros\UploadedFileFactory"/>
+        <const name="URI_FACTORY" value="Http\Factory\Diactoros\UriFactory"/>
+    </php>
 </phpunit>

test/Integration/RequestTest.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\RequestIntegrationTest;
+use Zend\Diactoros\Request;
+
+class RequestTest extends RequestIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createSubject()
+    {
+        return new Request('/', 'GET');
+    }
+}

test/Integration/ResponseTest.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\ResponseIntegrationTest;
+use Zend\Diactoros\Response;
+
+class ResponseTest extends ResponseIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createSubject()
+    {
+        return new Response();
+    }
+}

test/Integration/ServerRequestTest.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\ServerRequestIntegrationTest;
+use Zend\Diactoros\ServerRequest;
+
+class ServerRequestTest extends ServerRequestIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createSubject()
+    {
+        return new ServerRequest($_SERVER);
+    }
+}

test/Integration/StreamTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\StreamIntegrationTest;
+use Psr\Http\Message\StreamInterface;
+use Zend\Diactoros\Stream;
+
+class StreamTest extends StreamIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createStream($data)
+    {
+        if ($data instanceof StreamInterface) {
+            return $data;
+        }
+
+        return new Stream($data);
+    }
+}

test/Integration/UploadedFileTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\UploadedFileIntegrationTest;
+use Zend\Diactoros\Stream;
+use Zend\Diactoros\UploadedFile;
+
+class UploadedFileTest extends UploadedFileIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createSubject()
+    {
+        $stream = new Stream('php://memory', 'rw');
+        $stream->write('foobar');
+
+        return new UploadedFile($stream, $stream->getSize(), UPLOAD_ERR_OK);
+    }
+}

test/Integration/UriTest.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-diactoros for the canonical source repository
+ * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-diactoros/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Diactoros\Integration;
+
+use Http\Factory\Diactoros\RequestFactory;
+use Http\Psr7Test\UriIntegrationTest;
+use Zend\Diactoros\Uri;
+
+class UriTest extends UriIntegrationTest
+{
+    public static function setUpBeforeClass()
+    {
+        if (! class_exists(RequestFactory::class)) {
+            self::markTestSkipped('You need to install http-interop/http-factory-diactoros to run integration tests');
+        }
+        parent::setUpBeforeClass();
+    }
+
+    public function createUri($uri)
+    {
+        return new Uri($uri);
+    }
+}