minor #90 Fix CI failures with Xdebug 3 and test on PHP 7.4/8.0 as well (derrabus)

derrabus · derrabus · commit 488df9b0c3d1 · 2021-02-16T16:22:30.000+01:00
This PR was merged into the 2.0-dev branch. Discussion ---------- Fix CI failures with Xdebug 3 and test on PHP 7.4/8.0 as well Commits ------- a6697fd Fix CI failures with Xdebug 3 and test on PHP 7.4/8.0 as well
diff --git a/.travis.yml b/.travis.yml
@@ -8,22 +8,27 @@ cache:
 env:
     global:
         - PHPUNIT_FLAGS="-v"
+        - SYMFONY_PHPUNIT_VERSION=9.5
         - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit"
 
 matrix:
     fast_finish: true
     include:
           # Minimum supported dependencies with the latest and oldest PHP version
-        - php: 7.3
+        - php: 7.4
           env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak_vendors"
 
         - php: 7.1
+          env: SYMFONY_PHPUNIT_VERSION=7.5
         - php: 7.2
+          env: SYMFONY_PHPUNIT_VERSION=8.5
         - php: 7.3
-          env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text"
+        - php: 7.4
+          env: COVERAGE=true PHPUNIT_FLAGS="-v --coverage-text" XDEBUG_MODE=coverage
+        - php: 8.0
 
           # Latest commit to master
-        - php: 7.3
+        - php: 7.4
           env: STABILITY="dev"
 
     allow_failures:
diff --git a/Tests/Factory/AbstractHttpMessageFactoryTest.php b/Tests/Factory/AbstractHttpMessageFactoryTest.php
@@ -152,7 +152,7 @@ public function testCreateResponse()
         $cookieHeader = $psrResponse->getHeader('Set-Cookie');
         $this->assertIsArray($cookieHeader);
         $this->assertCount(1, $cookieHeader);
-        $this->assertRegExp('{city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT;( max-age=\d+;)? path=/; httponly}i', $cookieHeader[0]);
+        $this->assertMatchesRegularExpression('{city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT;( max-age=\d+;)? path=/; httponly}i', $cookieHeader[0]);
     }
 
     public function testCreateResponseFromStreamed()
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "symfony/http-foundation": "^4.4 || ^5.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4 || ^5.0",
+        "symfony/phpunit-bridge": "^4.4.19 || ^5.2",
         "nyholm/psr7": "^1.1"
     },
     "suggest": {

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function testCreateResponse()`
`152`	`152`	`$cookieHeader = $psrResponse->getHeader('Set-Cookie');`
`153`	`153`	`$this->assertIsArray($cookieHeader);`
`154`	`154`	`$this->assertCount(1, $cookieHeader);`
`155`		`- $this->assertRegExp('{city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT;( max-age=\d+;)? path=/; httponly}i', $cookieHeader[0]);`
	`155`	`+ $this->assertMatchesRegularExpression('{city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT;( max-age=\d+;)? path=/; httponly}i', $cookieHeader[0]);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`public function testCreateResponseFromStreamed()`