added typing on tests, since minimum version is php 7.1 anyway

Author: rbaarsma

Tests/Factory/AbstractHttpMessageFactoryTest.php

@@ -32,15 +32,15 @@ abstract class AbstractHttpMessageFactoryTest extends TestCase
     /**
      * @return HttpMessageFactoryInterface
      */
-    abstract protected function buildHttpMessageFactory();
+    abstract protected function buildHttpMessageFactory(): HttpMessageFactoryInterface;
 
     public function setUp(): void
     {
         $this->factory = $this->buildHttpMessageFactory();
         $this->tmpDir = sys_get_temp_dir();
     }
 
-    public function testCreateRequest()
+    public function testCreateRequest(): void
     {
         $stdClass = new \stdClass();
         $request = new Request(
@@ -119,7 +119,7 @@ public function testCreateRequest()
         $this->assertEquals(['2.8'], $psrRequest->getHeader('X-Symfony'));
     }
 
-    public function testGetContentCanBeCalledAfterRequestCreation()
+    public function testGetContentCanBeCalledAfterRequestCreation(): void
     {
         $header = ['HTTP_HOST' => 'dunglas.fr'];
         $request = new Request([], [], [], [], [], $header, 'Content');
@@ -143,7 +143,7 @@ private function createUploadedFile($content, $originalName, $mimeType, $error)
         return new UploadedFile($path, $originalName, $mimeType, filesize($path), $error, true);
     }
 
-    public function testCreateResponse()
+    public function testCreateResponse(): void
     {
         $response = new Response(
             'Response content.',
@@ -163,7 +163,7 @@ public function testCreateResponse()
         $this->assertRegExp('{city=Lille; expires=Wed, 13-Jan-2021 22:23:01 GMT;( max-age=\d+;)? path=/; httponly}i', $cookieHeader[0]);
     }
 
-    public function testCreateResponseFromStreamed()
+    public function testCreateResponseFromStreamed(): void
     {
         $response = new StreamedResponse(function () {
             echo "Line 1\n";
@@ -178,7 +178,7 @@ public function testCreateResponseFromStreamed()
         $this->assertEquals("Line 1\nLine 2\n", $psrResponse->getBody()->__toString());
     }
 
-    public function testCreateResponseFromBinaryFile()
+    public function testCreateResponseFromBinaryFile(): void
     {
         $path = tempnam($this->tmpDir, uniqid());
         file_put_contents($path, 'Binary');
@@ -190,7 +190,7 @@ public function testCreateResponseFromBinaryFile()
         $this->assertEquals('Binary', $psrResponse->getBody()->__toString());
     }
 
-    public function testUploadErrNoFile()
+    public function testUploadErrNoFile(): void
     {
         if (class_exists('Symfony\Component\HttpFoundation\HeaderUtils')) {
             // Symfony 4.1+

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

@@ -39,7 +39,7 @@ public function setUp(): void
         $this->tmpDir = sys_get_temp_dir();
     }
 
-    public function testCreateRequest()
+    public function testCreateRequest(): void
     {
         $stdClass = new \stdClass();
         $serverRequest = new ServerRequest(
@@ -84,7 +84,7 @@ public function testCreateRequest()
         $this->assertEquals(['a', 'b'], $symfonyRequest->headers->all('X-data'));
     }
 
-    public function testCreateRequestWithNullParsedBody()
+    public function testCreateRequestWithNullParsedBody(): void
     {
         $serverRequest = new ServerRequest(
             '1.1',
@@ -104,7 +104,7 @@ public function testCreateRequestWithNullParsedBody()
         $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
     }
 
-    public function testCreateRequestWithObjectParsedBody()
+    public function testCreateRequestWithObjectParsedBody(): void
     {
         $serverRequest = new ServerRequest(
             '1.1',
@@ -124,7 +124,7 @@ public function testCreateRequestWithObjectParsedBody()
         $this->assertCount(0, $this->factory->createRequest($serverRequest)->request);
     }
 
-    public function testCreateRequestWithUri()
+    public function testCreateRequestWithUri(): void
     {
         $serverRequest = new ServerRequest(
             '1.1',
@@ -144,7 +144,7 @@ public function testCreateRequestWithUri()
         $this->assertEquals('/about/kevin', $this->factory->createRequest($serverRequest)->getPathInfo());
     }
 
-    public function testCreateUploadedFile()
+    public function testCreateUploadedFile(): void
     {
         $uploadedFile = $this->createUploadedFile('An uploaded file.', UPLOAD_ERR_OK, 'myfile.txt', 'text/plain');
         $symfonyUploadedFile = $this->callCreateUploadedFile($uploadedFile);
@@ -161,7 +161,7 @@ public function testCreateUploadedFile()
         $this->assertEquals('An uploaded file.', file_get_contents($this->tmpDir.'/'.$uniqid));
     }
 
-    public function testCreateUploadedFileWithError()
+    public function testCreateUploadedFileWithError(): void
     {
         $this->expectException(FileException::class);
         $this->expectExceptionMessage('The file "e" could not be written on disk.');
@@ -174,15 +174,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): \Symfony\Component\HttpFoundation\File\UploadedFile
     {
         $reflection = new \ReflectionClass($this->factory);
         $createUploadedFile = $reflection->getMethod('createUploadedFile');
@@ -191,7 +191,7 @@ private function callCreateUploadedFile(UploadedFileInterface $uploadedFile)
         return $createUploadedFile->invokeArgs($this->factory, [$uploadedFile]);
     }
 
-    public function testCreateResponse()
+    public function testCreateResponse(): void
     {
         $response = new Response(
             '1.0',

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();