Allow Symfony 5.0

Author: rbaarsma

Tests/Factory/AbstractHttpMessageFactoryTest.php

@@ -29,12 +29,9 @@ abstract class AbstractHttpMessageFactoryTest extends TestCase
     private $factory;
     private $tmpDir;
 
-    /**
-     * @return HttpMessageFactoryInterface
-     */
-    abstract protected function buildHttpMessageFactory();
+    abstract protected function buildHttpMessageFactory(): HttpMessageFactoryInterface;
 
-    public function setup()
+    public function setUp(): void
     {
         $this->factory = $this->buildHttpMessageFactory();
         $this->tmpDir = sys_get_temp_dir();
@@ -158,7 +155,7 @@ public function testCreateResponse()
         $this->assertEquals(['3.4'], $psrResponse->getHeader('X-Symfony'));
 
         $cookieHeader = $psrResponse->getHeader('Set-Cookie');
-        $this->assertInternalType('array', $cookieHeader);
+        $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]);
     }

Tests/Factory/DiactorosFactoryTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\PsrHttpMessage\Tests\Factory;
 
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -21,7 +22,7 @@
  */
 class DiactorosFactoryTest extends AbstractHttpMessageFactoryTest
 {
-    protected function buildHttpMessageFactory()
+    protected function buildHttpMessageFactory(): HttpMessageFactoryInterface
     {
         if (!class_exists('Zend\Diactoros\ServerRequestFactory')) {
             $this->markTestSkipped('Zend Diactoros is not installed.');

Tests/Factory/HttpFoundationFactoryTest.php

@@ -20,6 +20,8 @@
 use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\UploadedFile;
 use Symfony\Bridge\PsrHttpMessage\Tests\Fixtures\Uri;
 use Symfony\Component\HttpFoundation\Cookie;
+use Symfony\Component\HttpFoundation\File\Exception\FileException;
+use Symfony\Component\HttpFoundation\File\UploadedFile as HttpFoundationUploadedFile;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -32,7 +34,7 @@ class HttpFoundationFactoryTest extends TestCase
     /** @var string */
     private $tmpDir;
 
-    public function setup()
+    public function setUp(): void
     {
         $this->factory = new HttpFoundationFactory();
         $this->tmpDir = sys_get_temp_dir();
@@ -80,7 +82,7 @@ public function testCreateRequest()
         $this->assertEquals('France', $symfonyRequest->server->get('country'));
         $this->assertEquals('The body', $symfonyRequest->getContent());
         $this->assertEquals('1.0', $symfonyRequest->headers->get('X-Dunglas-API-Platform'));
-        $this->assertEquals(['a', 'b'], $symfonyRequest->headers->get('X-data', null, false));
+        $this->assertEquals(['a', 'b'], $symfonyRequest->headers->all('X-data'));
     }
 
     public function testCreateRequestWithNullParsedBody()
@@ -160,12 +162,11 @@ public function testCreateUploadedFile()
         $this->assertEquals('An uploaded file.', file_get_contents($this->tmpDir.'/'.$uniqid));
     }
 
-    /**
-     * @expectedException        \Symfony\Component\HttpFoundation\File\Exception\FileException
-     * @expectedExceptionMessage The file "e" could not be written on disk.
-     */
     public function testCreateUploadedFileWithError()
     {
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage('The file "e" could not be written on disk.');
+
         $uploadedFile = $this->createUploadedFile('Error.', UPLOAD_ERR_CANT_WRITE, 'e', 'text/plain');
         $symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
 
@@ -174,15 +175,15 @@ public function testCreateUploadedFileWithError()
         $symfonyUploadedFile->move($this->tmpDir, 'shouldFail.txt');
     }
 
-    private function createUploadedFile($content, $error, $clientFileName, $clientMediaType)
+    private function createUploadedFile($content, $error, $clientFileName, $clientMediaType): UploadedFile
     {
         $filePath = tempnam($this->tmpDir, uniqid());
         file_put_contents($filePath, $content);
 
         return new UploadedFile($filePath, filesize($filePath), $error, $clientFileName, $clientMediaType);
     }
 
-    private function callCreateUploadedFile(UploadedFileInterface $uploadedFile)
+    private function callCreateUploadedFile(UploadedFileInterface $uploadedFile): HttpFoundationUploadedFile
     {
         $reflection = new \ReflectionClass($this->factory);
         $createUploadedFile = $reflection->getMethod('createUploadedFile');

Tests/Factory/PsrHttpFactoryTest.php

@@ -13,14 +13,15 @@
 
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Symfony\Bridge\PsrHttpMessage\Factory\PsrHttpFactory;
+use Symfony\Bridge\PsrHttpMessage\HttpMessageFactoryInterface;
 
 /**
  * @author Kévin Dunglas <[email protected]>
  * @author Antonio J. García Lagar <[email protected]>
  */
 class PsrHttpFactoryTest extends AbstractHttpMessageFactoryTest
 {
-    protected function buildHttpMessageFactory()
+    protected function buildHttpMessageFactory(): HttpMessageFactoryInterface
     {
         $factory = new Psr17Factory();
 

Tests/Functional/CovertTest.php

@@ -36,7 +36,7 @@ class CovertTest extends TestCase
 {
     private $tmpDir;
 
-    public function setup()
+    public function setUp(): void
     {
         if (!class_exists('Nyholm\Psr7\ServerRequest')) {
             $this->markTestSkipped('nyholm/psr7 is not installed.');

composer.json

@@ -18,10 +18,10 @@
     "require": {
         "php": "^7.1",
         "psr/http-message": "^1.0",
-        "symfony/http-foundation": "^3.4 || ^4.0"
+        "symfony/http-foundation": "^4.4 || ^5.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^3.4.20 || ^4.0",
+        "symfony/phpunit-bridge": "^4.4 || ^5.0",
         "nyholm/psr7": "^1.1",
         "zendframework/zend-diactoros": "^1.4.1 || ^2.0"
     },

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
     <testsuites>