Merge pull request #21 from snapshotpl/php-8.1

Ocramius · web-flow · commit dc94f129a0c9 · 2021-12-09T10:59:10.000+01:00
Support for PHP 8.1
diff --git a/composer.json b/composer.json
@@ -27,17 +27,17 @@
         }
     },
     "require": {
-        "php": "^7.3 || ~8.0.0",
+        "php": "^7.3 || ~8.0.0 || ~8.1.0",
         "ext-json": "*",
         "laminas/laminas-eventmanager": "^2.6.3 || ^3.0.1",
-        "laminas/laminas-http": "^2.5.4",
+        "laminas/laminas-http": "^2.15.1",
         "laminas/laminas-json": "^2.6.1 || ^3.0",
         "laminas/laminas-mvc": "^2.7.15 || ^3.0.4",
         "laminas/laminas-view": "^2.8.1",
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
-        "laminas/laminas-coding-standard": "~2.2.0",
+        "laminas/laminas-coding-standard": "~2.3.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.3",
         "psalm/plugin-phpunit": "^0.16.0",
diff --git a/composer.lock b/composer.lock
diff --git a/config/module.config.php b/config/module.config.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem;
 
 return [
diff --git a/src/ApiProblem.php b/src/ApiProblem.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem;
 
 use Exception;
@@ -136,7 +138,7 @@ class ApiProblem
      * if the status matches any known, the title field will be selected
      * from $problemStatusTitles as a result.
      *
-     * @param int    $status
+     * @param int|string $status
      * @param string|Exception|Throwable $detail
      * @param string $type
      * @param string $title
@@ -165,7 +167,7 @@ public function __construct($status, $detail, $type = null, $title = null, array
             $status = 500;
         }
 
-        $this->status = $status;
+        $this->status = (int) $status;
         $this->detail = $detail;
         $this->title  = $title;
 
diff --git a/src/ApiProblemResponse.php b/src/ApiProblemResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem;
 
 use Laminas\Http\Headers;
@@ -29,7 +31,10 @@ public function __construct(ApiProblem $apiProblem)
     {
         $this->apiProblem = $apiProblem;
         $this->setCustomStatusCode($apiProblem->status);
-        $this->setReasonPhrase($apiProblem->title);
+
+        if ($apiProblem->title !== null) {
+            $this->setReasonPhrase($apiProblem->title);
+        }
 
         $this->jsonFlags = JSON_UNESCAPED_SLASHES | JSON_PARTIAL_OUTPUT_ON_ERROR;
     }
diff --git a/src/Exception/DomainException.php b/src/Exception/DomainException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Exception;
 
 class DomainException extends \DomainException implements
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Exception;
 
 /**
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
diff --git a/src/Exception/ProblemExceptionInterface.php b/src/Exception/ProblemExceptionInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Exception;
 
 use Traversable;
diff --git a/src/Factory/ApiProblemListenerFactory.php b/src/Factory/ApiProblemListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/src/Factory/ApiProblemRendererFactory.php b/src/Factory/ApiProblemRendererFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/src/Factory/ApiProblemStrategyFactory.php b/src/Factory/ApiProblemStrategyFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/src/Factory/RenderErrorListenerFactory.php b/src/Factory/RenderErrorListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/src/Factory/SendApiProblemResponseListenerFactory.php b/src/Factory/SendApiProblemResponseListenerFactory.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Factory;
 
 use Interop\Container\ContainerInterface;
diff --git a/src/Listener/ApiProblemListener.php b/src/Listener/ApiProblemListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Listener;
 
 use Exception;
diff --git a/src/Listener/RenderErrorListener.php b/src/Listener/RenderErrorListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Listener;
 
 use Exception;
diff --git a/src/Listener/SendApiProblemResponseListener.php b/src/Listener/SendApiProblemResponseListener.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\Listener;
 
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
diff --git a/src/Module.php b/src/Module.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem;
 
 use Laminas\ApiTools\ApiProblem\Listener\SendApiProblemResponseListener;
diff --git a/src/View/ApiProblemModel.php b/src/View/ApiProblemModel.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\View;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
diff --git a/src/View/ApiProblemRenderer.php b/src/View/ApiProblemRenderer.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\View;
 
 use Laminas\View\Model\ModelInterface;
diff --git a/src/View/ApiProblemStrategy.php b/src/View/ApiProblemStrategy.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem\View;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
diff --git a/test/ApiProblemResponseTest.php b/test/ApiProblemResponseTest.php
@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
+use Laminas\ApiTools\ApiProblem\Exception\DomainException;
 use Laminas\Http\Header\ContentType;
 use Laminas\Http\Response;
 use PHPUnit\Framework\TestCase;
@@ -20,9 +23,6 @@ public function testApiProblemResponseIsAnHttpResponse(): void
         $this->assertInstanceOf(Response::class, $response);
     }
 
-    /**
-     * @depends testApiProblemResponseIsAnHttpResponse
-     */
     public function testApiProblemResponseSetsStatusCodeAndReasonPhrase(): void
     {
         $response = new ApiProblemResponse(new ApiProblem(400, 'Random error'));
@@ -32,6 +32,16 @@ public function testApiProblemResponseSetsStatusCodeAndReasonPhrase(): void
         $this->assertEquals('bad request', strtolower($response->getReasonPhrase()));
     }
 
+    public function testApiProblemResponseSetsStatusCodeAndReasonPhraseUsingException(): void
+    {
+        $exception = new DomainException('Random error', 400);
+        $response  = new ApiProblemResponse(new ApiProblem(400, $exception));
+        $this->assertEquals(400, $response->getStatusCode());
+        $this->assertIsString($response->getReasonPhrase());
+        $this->assertNotEmpty($response->getReasonPhrase());
+        $this->assertEquals('bad request', strtolower($response->getReasonPhrase()));
+    }
+
     public function testApiProblemResponseBodyIsSerializedApiProblem(): void
     {
         $additional = [
@@ -51,9 +61,6 @@ public function testApiProblemResponseBodyIsSerializedApiProblem(): void
         $this->assertEquals($expected, json_decode($response->getContent(), true));
     }
 
-    /**
-     * @depends testApiProblemResponseIsAnHttpResponse
-     */
     public function testApiProblemResponseSetsContentTypeHeader(): void
     {
         $response = new ApiProblemResponse(new ApiProblem(400, 'Random error'));
diff --git a/test/ApiProblemTest.php b/test/ApiProblemTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
@@ -94,7 +96,7 @@ public function testExceptionsCanTriggerInclusionOfStackTraceInDetails(): void
     public function testExceptionsCanTriggerInclusionOfNestedExceptions(): void
     {
         $exceptionChild  = new \Exception('child exception');
-        $exceptionParent = new \Exception('parent exception', null, $exceptionChild);
+        $exceptionParent = new \Exception('parent exception', 0, $exceptionChild);
 
         $apiProblem = new ApiProblem('500', $exceptionParent);
         $apiProblem->setDetailIncludesStackTrace(true);
diff --git a/test/Listener/ApiProblemListenerTest.php b/test/Listener/ApiProblemListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem\Listener;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
diff --git a/test/Listener/RenderErrorListenerTest.php b/test/Listener/RenderErrorListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem\Listener;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
diff --git a/test/Listener/SendApiProblemResponseListenerTest.php b/test/Listener/SendApiProblemResponseListenerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem\Listener;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;
diff --git a/test/ModuleTest.php b/test/ModuleTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Laminas\ApiTools\ApiProblem;
 
 use Laminas\ApiTools\ApiProblem\Listener\ApiProblemListener;
diff --git a/test/View/ApiProblemRendererTest.php b/test/View/ApiProblemRendererTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem\View;
 
 use Exception;
diff --git a/test/View/ApiProblemStrategyTest.php b/test/View/ApiProblemStrategyTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaminasTest\ApiTools\ApiProblem\View;
 
 use Laminas\ApiTools\ApiProblem\ApiProblem;

-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 <?php
 +declare(strict_types=1);
++
 namespace Laminas\ApiTools\ApiProblem\Exception;
 /**