Merge pull request #334 from lcobucci/update-dependencies

Update dependencies
lcobucci · Oct 31, 2021 · 27e1bb4 · 27e1bb4
2 parents 46c0cf6 + e8a3f57
commit 27e1bb4
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 77 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -19,6 +19,7 @@ jobs:
           - "development"
         php-version:
           - "8.0"
+          - "8.1"
         operating-system:
           - "ubuntu-latest"
 
@@ -62,7 +63,7 @@ jobs:
         run: "make phpunit"
 
   phpunit-rc:
-    name: "PHPUnit tests on PHP 8"
+    name: "PHPUnit tests on nightly"
 
     runs-on: ${{ matrix.operating-system }}
 
@@ -71,7 +72,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.1"
+          - "8.2"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "php": "^8.0",
         "ext-json": "*",
         "fig/http-message-util": "^1.1",
-        "lcobucci/content-negotiation-middleware": "^3.0",
+        "lcobucci/content-negotiation-middleware": "^3.1",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
@@ -28,7 +28,7 @@
     "require-dev": {
         "infection/infection": "^0.25",
         "laminas/laminas-diactoros": "^2.8",
-        "lcobucci/coding-standard": "^7.0",
+        "lcobucci/coding-standard": "^8.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^0.12",
         "phpstan/phpstan-deprecation-rules": "^0.12",

diff --git a/composer.lock b/composer.lock
diff --git a/src/ErrorConversionMiddleware.php b/src/ErrorConversionMiddleware.php
@@ -25,18 +25,11 @@ final class ErrorConversionMiddleware implements MiddlewareInterface
 
     private const STATUS_URL = 'https://httpstatuses.com/';
 
-    private ResponseFactoryInterface $responseFactory;
-    private DebugInfoStrategy $debugInfoStrategy;
-    private StatusCodeExtractionStrategy $statusCodeExtractor;
-
     public function __construct(
-        ResponseFactoryInterface $responseFactory,
-        DebugInfoStrategy $debugInfoStrategy,
-        StatusCodeExtractionStrategy $statusCodeExtractor
+        private ResponseFactoryInterface $responseFactory,
+        private DebugInfoStrategy $debugInfoStrategy,
+        private StatusCodeExtractionStrategy $statusCodeExtractor,
     ) {
-        $this->responseFactory     = $responseFactory;
-        $this->debugInfoStrategy   = $debugInfoStrategy;
-        $this->statusCodeExtractor = $statusCodeExtractor;
     }
 
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
@@ -49,7 +42,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             return new UnformattedResponse(
                 $response,
                 $this->extractData($error, $response),
-                ['error' => $error]
+                ['error' => $error],
             );
         }
     }
@@ -66,7 +59,7 @@ private function generateResponse(ServerRequestInterface $request, Throwable $er
 
         return $response->withAddedHeader(
             'Content-Type',
-            self::CONTENT_TYPE_CONVERSION[$accept] . '; charset=' . $request->getHeaderLine('Accept-Charset')
+            self::CONTENT_TYPE_CONVERSION[$accept] . '; charset=' . $request->getHeaderLine('Accept-Charset'),
         );
     }
 

diff --git a/src/ErrorLoggingMiddleware.php b/src/ErrorLoggingMiddleware.php
@@ -12,11 +12,8 @@
 
 final class ErrorLoggingMiddleware implements MiddlewareInterface
 {
-    private LoggerInterface $logger;
-
-    public function __construct(LoggerInterface $logger)
+    public function __construct(private LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     /**

diff --git a/src/StatusCodeExtractionStrategy/ClassMap.php b/src/StatusCodeExtractionStrategy/ClassMap.php
@@ -21,13 +21,9 @@ final class ClassMap implements StatusCodeExtractionStrategy
         Problem\ServiceUnavailable::class => StatusCodeInterface::STATUS_SERVICE_UNAVAILABLE,
     ];
 
-    /** @var array<string, int> */
-    private array $conversionMap;
-
     /** @param array<string, int> $conversionMap */
-    public function __construct(array $conversionMap = self::DEFAULT_MAP)
+    public function __construct(private array $conversionMap = self::DEFAULT_MAP)
     {
-        $this->conversionMap = $conversionMap;
     }
 
     public function extractStatusCode(Throwable $error): int

diff --git a/tests/DebugInfoStrategy/NoTraceTest.php b/tests/DebugInfoStrategy/NoTraceTest.php
@@ -31,7 +31,7 @@ public function extractDebugInfoShouldConvertExceptionInfoWithoutTheTrace(): voi
                 'file'    => __FILE__,
                 'line'    => __LINE__ + 2,
             ],
-            $strategy->extractDebugInfo(new RuntimeException('Testing', 11))
+            $strategy->extractDebugInfo(new RuntimeException('Testing', 11)),
         );
     }
 
@@ -77,10 +77,10 @@ public function extractDebugInfoShouldAlsoReturnPreviousExceptions(): void
                     new InvalidArgumentException(
                         'Oh no!',
                         25,
-                        new LogicException('Bummer')
-                    )
-                )
-            )
+                        new LogicException('Bummer'),
+                    ),
+                ),
+            ),
         );
     }
 }
diff --git a/tests/ErrorConversionMiddlewareTest.php b/tests/ErrorConversionMiddlewareTest.php
@@ -55,7 +55,7 @@ public function processShouldJustReturnTheResponseWhenEverythingIsAlright(): voi
         $middleware = new ErrorConversionMiddleware(
             $this->responseFactory,
             new NoDebugInfo(),
-            $this->statusCodeExtractor
+            $this->statusCodeExtractor,
         );
 
         self::assertSame($response, $middleware->process(new ServerRequest(), $handler));
@@ -75,7 +75,7 @@ public function processShouldJustReturnTheResponseWhenEverythingIsAlright(): voi
     public function processShouldConvertTheExceptionIntoAnUnformattedResponseWithTheProblemDetails(
         Throwable $error,
         int $expectedStatusCode,
-        array $expectedData
+        array $expectedData,
     ): void {
         $response = $this->handleProcessWithError(new ServerRequest(), $error);
 
@@ -100,7 +100,7 @@ public function possibleConversions(): iterable
         yield 'typed exceptions' => [
             new SampleProblem\Typed(
                 'Your current balance is 30, but that costs 50.',
-                StatusCodeInterface::STATUS_FORBIDDEN
+                StatusCodeInterface::STATUS_FORBIDDEN,
             ),
             StatusCodeInterface::STATUS_FORBIDDEN,
             [
@@ -113,7 +113,7 @@ public function possibleConversions(): iterable
         yield 'titled exceptions' => [
             new SampleProblem\Titled(
                 'Your current balance is 30, but that costs 50.',
-                StatusCodeInterface::STATUS_FORBIDDEN
+                StatusCodeInterface::STATUS_FORBIDDEN,
             ),
             StatusCodeInterface::STATUS_FORBIDDEN,
             [
@@ -126,7 +126,7 @@ public function possibleConversions(): iterable
         yield 'detailed exceptions' => [
             new SampleProblem\Detailed(
                 'Your current balance is 30, but that costs 50.',
-                StatusCodeInterface::STATUS_FORBIDDEN
+                StatusCodeInterface::STATUS_FORBIDDEN,
             ),
             StatusCodeInterface::STATUS_FORBIDDEN,
             [
@@ -141,7 +141,7 @@ public function possibleConversions(): iterable
         yield 'typed+titled+detailed exceptions' => [
             new SampleProblem\All(
                 'Your current balance is 30, but that costs 50.',
-                StatusCodeInterface::STATUS_FORBIDDEN
+                StatusCodeInterface::STATUS_FORBIDDEN,
             ),
             StatusCodeInterface::STATUS_FORBIDDEN,
             [
@@ -229,12 +229,12 @@ public function processShouldModifyTheContentTypeHeaderForXml(): void
     private function handleProcessWithError(
         ServerRequestInterface $request,
         Throwable $error,
-        ?DebugInfoStrategy $debugInfoStrategy = null
+        ?DebugInfoStrategy $debugInfoStrategy = null,
     ): ResponseInterface {
         $middleware = new ErrorConversionMiddleware(
             $this->responseFactory,
             $debugInfoStrategy ?? new NoDebugInfo(),
-            $this->statusCodeExtractor
+            $this->statusCodeExtractor,
         );
 
         $handler = $this->createMock(RequestHandlerInterface::class);