symfony
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+8-6Lines changed: 8 additions & 6 deletions b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+8-6Lines changed: 8 additions & 6 deletions
diff --git a/‎Tests/Factory/AbstractHttpMessageFactoryTest.php
Copy file name to clipboardExpand all lines: Tests/Factory/AbstractHttpMessageFactoryTest.php
+1-1Lines changed: 1 addition & 1 deletion b/‎Tests/Factory/AbstractHttpMessageFactoryTest.php
Copy file name to clipboardExpand all lines: Tests/Factory/AbstractHttpMessageFactoryTest.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎Tests/Factory/PsrHttpFactoryTest.php
Copy file name to clipboardExpand all lines: Tests/Factory/PsrHttpFactoryTest.php
+18-2Lines changed: 18 additions & 2 deletions b/‎Tests/Factory/PsrHttpFactoryTest.php
Copy file name to clipboardExpand all lines: Tests/Factory/PsrHttpFactoryTest.php
+18-2Lines changed: 18 additions & 2 deletions
diff --git a/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+1-2Lines changed: 1 addition & 2 deletions b/‎composer.json
Copy file name to clipboardExpand all lines: composer.json
+1-2Lines changed: 1 addition & 2 deletions
@@ -9,13 +9,13 @@ env:
     global:
         - PHPUNIT_FLAGS="-v"
         - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
-        - DEPENDENCIES="zendframework/zend-diactoros:^1.4.1 http-interop/http-factory-diactoros:^1.0"
+        - DEPENDENCIES="nyholm/psr7:^1.1"
 
 matrix:
     fast_finish: true
     include:
           # Minimum supported dependencies with the latest and oldest PHP version
-        - php: 7.2
+        - php: 7.3
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
         - php: 5.3
           dist: 'precise'
@@ -24,27 +24,29 @@ matrix:
           # Test the latest stable release
         - php: 5.3
           dist: 'precise'
-          env: DEPENDENCIES=""
+          env: DEPENDENCIES="symfony/phpunit-bridge:>=3.4,<3.4.22||>=4.0,<4.1.11||>=4.2,<4.2.3"
         - php: 5.4
           env: DEPENDENCIES="zendframework/zend-diactoros:^1.4.1"
         - php: 5.5
           env: DEPENDENCIES="zendframework/zend-diactoros:^1.4.1"
         - php: 5.6
           env: DEPENDENCIES="zendframework/zend-diactoros:^1.4.1"
         - php: 7.0
+          env: DEPENDENCIES="zendframework/zend-diactoros:^1.4.1 http-interop/http-factory-diactoros:^1.0"
         - php: 7.1
         - php: 7.2
+        - php: 7.3
           env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
 
           # Test LTS versions. This makes sure we do not use Symfony packages with version greater
           # than 2 or 3 respectively.
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="$DEPENDENCIES symfony/lts:^2 symfony/force-lowest:~2.8.0"
-        - php: 7.2
+        - php: 7.3
           env: DEPENDENCIES="$DEPENDENCIES symfony/lts:^3 symfony/force-lowest:~3.4.0"
 
           # Latest commit to master
-        - php: 7.2
+        - php: 7.3
           env: STABILITY="dev"
 
     allow_failures:
 
@@ -149,7 +149,7 @@ public function testCreateResponse()
             202,
             array('X-Symfony' => array('3.4'))
         );
-        $response->headers->setCookie(new Cookie('city', 'Lille', new \DateTime('Wed, 13 Jan 2021 22:23:01 GMT'), '/', null, false, true, false, ''));
+        $response->headers->setCookie(new Cookie('city', 'Lille', new \DateTime('Wed, 13 Jan 2021 22:23:01 GMT'), '/', null, false, true, false, 'lax'));
 
         $psrResponse = $this->factory->createResponse($response);
         $this->assertEquals('Response content.', $psrResponse->getBody()->__toString());
 
@@ -11,6 +11,10 @@
 
 namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;
 
+use Http\Factory\Diactoros\ResponseFactory;
+use Http\Factory\Diactoros\ServerRequestFactory;
+use Http\Factory\Diactoros\StreamFactory;
+use Http\Factory\Diactoros\UploadedFileFactory;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
 
@@ -22,8 +26,20 @@ class PsrHttpFactoryTest extends AbstractHttpMessageFactoryTest
 {
     protected function buildHttpMessageFactory()
     {
-        $factory = new Psr17Factory();
+        if (class_exists('Nyholm\Psr7\Factory\Psr17Factory')) {
+            $factory = new Psr17Factory();
+            return new PsrHttpFactory($factory, $factory, $factory, $factory);
+        }
 
-        return new PsrHttpFactory($factory, $factory, $factory, $factory);
+        if (class_exists('Http\Factory\Diactoros\ServerRequestFactory')) {
+            return new PsrHttpFactory(
+                new ServerRequestFactory(),
+                new StreamFactory(),
+                new UploadedFileFactory(),
+                new ResponseFactory()
+            );
+        }
+
+        $this->markTestSkipped('No PSR-17 HTTP Factory installed.');
     }
 }
@@ -21,8 +21,7 @@
         "symfony/http-foundation": "^2.3.42 || ^3.4 || ^4.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.4 || ^4.0",
-        "nyholm/psr7": "^1.1"
+        "symfony/phpunit-bridge": "^3.4 || ^4.0"
     },
     "suggest": {
         "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"