Resolve symfony/error-handler deprecations (#197)

* Fixed deprecation messages for PHP 8.1 (#195) * Fixed deprecation messages for PHP 8.1 and `symfony/error-handler` with BC (#195) * Fixed deprecation messages for PHP 8.1 and `symfony/error-handler` in tests Co-authored-by: Luis Fernando do Nascimento <luis.nascimento@ankorstore.com>
Nyholm · Jun 22, 2022 · f88a9e5 · f88a9e5
1 parent 1461e07
commit f88a9e5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 6 deletions.
diff --git a/src/ServerRequest.php b/src/ServerRequest.php
@@ -77,6 +77,9 @@ public function getUploadedFiles(): array
         return $this->uploadedFiles;
     }
 
+    /**
+     * @return static
+     */
     public function withUploadedFiles(array $uploadedFiles)
     {
         $new = clone $this;
@@ -90,6 +93,9 @@ public function getCookieParams(): array
         return $this->cookieParams;
     }
 
+    /**
+     * @return static
+     */
     public function withCookieParams(array $cookies)
     {
         $new = clone $this;
@@ -103,6 +109,9 @@ public function getQueryParams(): array
         return $this->queryParams;
     }
 
+    /**
+     * @return static
+     */
     public function withQueryParams(array $query)
     {
         $new = clone $this;
@@ -111,11 +120,17 @@ public function withQueryParams(array $query)
         return $new;
     }
 
+    /**
+     * @return array|object|null
+     */
     public function getParsedBody()
     {
         return $this->parsedBody;
     }
 
+    /**
+     * @return static
+     */
     public function withParsedBody($data)
     {
         if (!\is_array($data) && !\is_object($data) && null !== $data) {

diff --git a/tests/Integration/RequestTest.php b/tests/Integration/RequestTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\RequestInterface;
 use Http\Psr7Test\RequestIntegrationTest;
 use Nyholm\Psr7\Request;
 
 class RequestTest extends RequestIntegrationTest
 {
-    public function createSubject()
+    public function createSubject(): RequestInterface
     {
         return new Request('GET', '/');
     }

diff --git a/tests/Integration/ResponseTest.php b/tests/Integration/ResponseTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\ResponseInterface;
 use Http\Psr7Test\ResponseIntegrationTest;
 use Nyholm\Psr7\Response;
 
 class ResponseTest extends ResponseIntegrationTest
 {
-    public function createSubject()
+    public function createSubject(): ResponseInterface
     {
         return new Response();
     }

diff --git a/tests/Integration/ServerRequestTest.php b/tests/Integration/ServerRequestTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\ServerRequestInterface;
 use Http\Psr7Test\ServerRequestIntegrationTest;
 use Nyholm\Psr7\ServerRequest;
 
 class ServerRequestTest extends ServerRequestIntegrationTest
 {
-    public function createSubject()
+    public function createSubject(): ServerRequestInterface
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
 

diff --git a/tests/Integration/StreamTest.php b/tests/Integration/StreamTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\StreamInterface;
 use Http\Psr7Test\StreamIntegrationTest;
 use Nyholm\Psr7\Stream;
 
 class StreamTest extends StreamIntegrationTest
 {
-    public function createStream($data)
+    public function createStream($data): StreamInterface
     {
         return Stream::create($data);
     }

diff --git a/tests/Integration/UploadedFileTest.php b/tests/Integration/UploadedFileTest.php
@@ -2,13 +2,14 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\UploadedFileInterface;
 use Http\Psr7Test\UploadedFileIntegrationTest;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Stream;
 
 class UploadedFileTest extends UploadedFileIntegrationTest
 {
-    public function createSubject()
+    public function createSubject(): UploadedFileInterface
     {
         return (new Psr17Factory())->createUploadedFile(Stream::create('writing to tempfile'));
     }

diff --git a/tests/Integration/UriTest.php b/tests/Integration/UriTest.php
@@ -2,12 +2,13 @@
 
 namespace Tests\Nyholm\Psr7\Integration;
 
+use Psr\Http\Message\UriInterface;
 use Http\Psr7Test\UriIntegrationTest;
 use Nyholm\Psr7\Uri;
 
 class UriTest extends UriIntegrationTest
 {
-    public function createUri($uri)
+    public function createUri($uri): UriInterface
     {
         return new Uri($uri);
     }