update require-dev

Dominik Zogg · Dominik Zogg · commit 453f222568cb · 2021-09-28T21:46:02.000+02:00
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -12,7 +12,9 @@
 /** @var array $config */
 $config = require __DIR__ . '/vendor/chubbyphp/chubbyphp-dev-helper/phpcs.php';
 
-return PhpCsFixer\Config::create()
+$config['rules']['final_public_method_for_abstract_class'] = false;
+
+return (new PhpCsFixer\Config)
     ->setIndent($config['indent'])
     ->setLineEnding($config['lineEnding'])
     ->setRules($config['rules'])
diff --git a/composer.json b/composer.json
@@ -20,18 +20,18 @@
         "psr/log": "^1.1.3"
     },
     "require-dev": {
-        "chubbyphp/chubbyphp-container": "^1.1|^2.0",
+        "chubbyphp/chubbyphp-container": "^1.4|^2.0",
         "chubbyphp/chubbyphp-dev-helper": "dev-master",
-        "chubbyphp/chubbyphp-laminas-config-factory": "^1.0",
+        "chubbyphp/chubbyphp-laminas-config-factory": "^1.1.1",
         "chubbyphp/chubbyphp-mock": "^1.6",
-        "infection/infection": "^0.20.2",
+        "infection/infection": "^0.25.2",
         "php-coveralls/php-coveralls": "^2.4.3",
         "phploc/phploc": "^7.0.2",
         "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan": "^0.12.64",
-        "phpunit/phpunit": "^9.5",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0|^2.0"
+        "phpstan/phpstan": "^0.12.99",
+        "phpunit/phpunit": "^9.5.10",
+        "pimple/pimple": "^3.4",
+        "psr/container": "^1.1.1|^2.0.1"
     },
     "autoload": {
         "psr-4": { "Chubbyphp\\ApiHttp\\": "src/" }
diff --git a/src/ApiProblem/AbstractApiProblem.php b/src/ApiProblem/AbstractApiProblem.php
@@ -6,30 +6,15 @@
 
 abstract class AbstractApiProblem implements ApiProblemInterface
 {
-    /**
-     * @var string
-     */
-    protected $type;
+    protected string $type;
 
-    /**
-     * @var int
-     */
-    protected $status;
+    protected int $status;
 
-    /**
-     * @var string
-     */
-    protected $title;
+    protected string $title;
 
-    /**
-     * @var string|null
-     */
-    protected $detail;
+    protected ?string $detail;
 
-    /**
-     * @var string|null
-     */
-    protected $instance;
+    protected ?string $instance;
 
     public function __construct(
         string $type,
diff --git a/src/ApiProblem/ClientError/BadRequest.php b/src/ApiProblem/ClientError/BadRequest.php
@@ -11,7 +11,7 @@ final class BadRequest extends AbstractApiProblem
     /**
      * @var array<int, array<mixed>>
      */
-    private $invalidParameters = [];
+    private array $invalidParameters = [];
 
     /**
      * @param array<int, array<mixed>> $invalidParameters
diff --git a/src/ApiProblem/ClientError/ExpectationFailed.php b/src/ApiProblem/ClientError/ExpectationFailed.php
@@ -11,7 +11,7 @@ final class ExpectationFailed extends AbstractApiProblem
     /**
      * @var array<int, string>
      */
-    private $failedExpectations = [];
+    private array $failedExpectations = [];
 
     /**
      * @param array<int, string> $failedExpectations
diff --git a/src/ApiProblem/ClientError/MethodNotAllowed.php b/src/ApiProblem/ClientError/MethodNotAllowed.php
@@ -8,15 +8,12 @@
 
 final class MethodNotAllowed extends AbstractApiProblem
 {
-    /**
-     * @var string
-     */
-    private $method;
+    private string $method;
 
     /**
      * @var array<int, string>
      */
-    private $allowedMethods = [];
+    private array $allowedMethods = [];
 
     /**
      * @param string             $method,
diff --git a/src/ApiProblem/ClientError/NotAcceptable.php b/src/ApiProblem/ClientError/NotAcceptable.php
@@ -8,15 +8,12 @@
 
 final class NotAcceptable extends AbstractApiProblem
 {
-    /**
-     * @var string
-     */
-    private $accept;
+    private string $accept;
 
     /**
      * @var array<int, string>
      */
-    private $acceptables = [];
+    private array $acceptables = [];
 
     /**
      * @param array<int, string> $acceptables
diff --git a/src/ApiProblem/ClientError/PaymentRequired.php b/src/ApiProblem/ClientError/PaymentRequired.php
@@ -11,7 +11,7 @@ final class PaymentRequired extends AbstractApiProblem
     /**
      * @var array<int, string>
      */
-    private $paymentTypes = [];
+    private array $paymentTypes = [];
 
     /**
      * @param array<int, string> $paymentTypes
diff --git a/src/ApiProblem/ClientError/PreconditionFailed.php b/src/ApiProblem/ClientError/PreconditionFailed.php
@@ -11,7 +11,7 @@ final class PreconditionFailed extends AbstractApiProblem
     /**
      * @var array<int, string>
      */
-    private $failedPreconditions = [];
+    private array $failedPreconditions = [];
 
     /**
      * @param array<int, string> $failedPreconditions
diff --git a/src/ApiProblem/ClientError/RequestEntityTooLarge.php b/src/ApiProblem/ClientError/RequestEntityTooLarge.php
@@ -8,10 +8,7 @@
 
 final class RequestEntityTooLarge extends AbstractApiProblem
 {
-    /**
-     * @var int
-     */
-    private $maxContentLength;
+    private int $maxContentLength;
 
     public function __construct(int $maxContentLength, ?string $detail = null, ?string $instance = null)
     {
diff --git a/src/ApiProblem/ClientError/RequestUriTooLong.php b/src/ApiProblem/ClientError/RequestUriTooLong.php
@@ -8,10 +8,7 @@
 
 final class RequestUriTooLong extends AbstractApiProblem
 {
-    /**
-     * @var int
-     */
-    private $maxUriLength;
+    private int $maxUriLength;
 
     public function __construct(int $maxUriLength, ?string $detail = null, ?string $instance = null)
     {
diff --git a/src/ApiProblem/ClientError/Unauthorized.php b/src/ApiProblem/ClientError/Unauthorized.php
@@ -8,15 +8,12 @@
 
 final class Unauthorized extends AbstractApiProblem
 {
-    /**
-     * @var string
-     */
-    private $authorization;
+    private string $authorization;
 
     /**
      * @var array<int, string>
      */
-    private $authorizationTypes = [];
+    private array $authorizationTypes = [];
 
     /**
      * @param array<int, string> $authorizationTypes
diff --git a/src/ApiProblem/ClientError/UnprocessableEntity.php b/src/ApiProblem/ClientError/UnprocessableEntity.php
@@ -11,7 +11,7 @@ final class UnprocessableEntity extends AbstractApiProblem
     /**
      * @var array<int, array<mixed>>
      */
-    private $invalidParameters = [];
+    private array $invalidParameters = [];
 
     /**
      * @param array<int, array<mixed>> $invalidParameters
diff --git a/src/ApiProblem/ClientError/UnsupportedMediaType.php b/src/ApiProblem/ClientError/UnsupportedMediaType.php
@@ -8,15 +8,12 @@
 
 final class UnsupportedMediaType extends AbstractApiProblem
 {
-    /**
-     * @var string
-     */
-    private $mediaType;
+    private string $mediaType;
 
     /**
      * @var array<int, string>
      */
-    private $supportedMediaTypes = [];
+    private array $supportedMediaTypes = [];
 
     /**
      * @param array<int, string> $supportedMediaTypes
diff --git a/src/ApiProblem/ServerError/InternalServerError.php b/src/ApiProblem/ServerError/InternalServerError.php
@@ -9,9 +9,9 @@
 final class InternalServerError extends AbstractApiProblem
 {
     /**
-     * @var array<int, array<mixed>>|null
+     * @var null|array<int, array<mixed>>
      */
-    private $backtrace;
+    private ?array $backtrace = null;
 
     public function __construct(?string $detail = null, ?string $instance = null)
     {
@@ -25,15 +25,15 @@ public function __construct(?string $detail = null, ?string $instance = null)
     }
 
     /**
-     * @param array<int, array<mixed>>|null $backtrace
+     * @param null|array<int, array<mixed>> $backtrace
      */
     public function setBacktrace(?array $backtrace): void
     {
         $this->backtrace = $backtrace;
     }
 
     /**
-     * @return array<int, array<mixed>>|null
+     * @return null|array<int, array<mixed>>
      */
     public function getBacktrace(): ?array
     {
diff --git a/src/Manager/RequestManager.php b/src/Manager/RequestManager.php
@@ -10,10 +10,7 @@
 
 final class RequestManager implements RequestManagerInterface
 {
-    /**
-     * @var DeserializerInterface
-     */
-    private $deserializer;
+    private DeserializerInterface $deserializer;
 
     public function __construct(DeserializerInterface $deserializer)
     {
@@ -22,28 +19,24 @@ public function __construct(DeserializerInterface $deserializer)
 
     /**
      * @param object|string $object
-     *
-     * @return object
      */
     public function getDataFromRequestQuery(
         ServerRequestInterface $request,
         $object,
         ?DenormalizerContextInterface $context = null
-    ) {
+    ): object {
         return $this->deserializer->denormalize($object, $request->getQueryParams(), $context);
     }
 
     /**
      * @param object|string $object
-     *
-     * @return object
      */
     public function getDataFromRequestBody(
         ServerRequestInterface $request,
         $object,
         string $contentType,
         ?DenormalizerContextInterface $context = null
-    ) {
+    ): object {
         return $this->deserializer->deserialize($object, (string) $request->getBody(), $contentType, $context);
     }
 }
diff --git a/src/Manager/RequestManagerInterface.php b/src/Manager/RequestManagerInterface.php
@@ -11,24 +11,20 @@ interface RequestManagerInterface
 {
     /**
      * @param object|string $object
-     *
-     * @return object
      */
     public function getDataFromRequestQuery(
         ServerRequestInterface $request,
         $object,
         ?DenormalizerContextInterface $context = null
-    );
+    ): object;
 
     /**
      * @param object|string $object
-     *
-     * @return object
      */
     public function getDataFromRequestBody(
         ServerRequestInterface $request,
         $object,
         string $contentType,
         ?DenormalizerContextInterface $context = null
-    );
+    ): object;
 }
diff --git a/src/Manager/ResponseManager.php b/src/Manager/ResponseManager.php
@@ -12,27 +12,18 @@
 
 final class ResponseManager implements ResponseManagerInterface
 {
-    /**
-     * @var ResponseFactoryInterface
-     */
-    private $responseFactory;
+    private ResponseFactoryInterface $responseFactory;
 
-    /**
-     * @var SerializerInterface
-     */
-    private $serializer;
+    private SerializerInterface $serializer;
 
     public function __construct(ResponseFactoryInterface $responseFactory, SerializerInterface $serializer)
     {
         $this->responseFactory = $responseFactory;
         $this->serializer = $serializer;
     }
 
-    /**
-     * @param object $object
-     */
     public function create(
-        $object,
+        object $object,
         string $accept,
         int $status = 200,
         ?NormalizerContextInterface $context = null
diff --git a/src/Manager/ResponseManagerInterface.php b/src/Manager/ResponseManagerInterface.php
@@ -10,11 +10,8 @@
 
 interface ResponseManagerInterface
 {
-    /**
-     * @param object $object
-     */
     public function create(
-        $object,
+        object $object,
         string $accept,
         int $status = 200,
         ?NormalizerContextInterface $context = null
diff --git a/src/Middleware/AcceptAndContentTypeMiddleware.php b/src/Middleware/AcceptAndContentTypeMiddleware.php
@@ -16,20 +16,11 @@
 
 final class AcceptAndContentTypeMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var AcceptNegotiatorInterface
-     */
-    private $acceptNegotiator;
+    private AcceptNegotiatorInterface $acceptNegotiator;
 
-    /**
-     * @var ContentTypeNegotiatorInterface
-     */
-    private $contentTypeNegotiator;
+    private ContentTypeNegotiatorInterface $contentTypeNegotiator;
 
-    /**
-     * @var ResponseManagerInterface
-     */
-    private $responseManager;
+    private ResponseManagerInterface $responseManager;
 
     public function __construct(
         AcceptNegotiatorInterface $acceptNegotiator,
@@ -57,7 +48,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         $request = $request->withAttribute('accept', $accept->getValue());
 
-        if (in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true)) {
+        if (\in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true)) {
             if (null === $contentType = $this->contentTypeNegotiator->negotiate($request)) {
                 return $this->responseManager->createFromApiProblem(
                     new UnsupportedMediaType(
diff --git a/src/Middleware/ApiExceptionMiddleware.php b/src/Middleware/ApiExceptionMiddleware.php
diff --git a/tests/Unit/ApiProblem/ApiProblemTest.php b/tests/Unit/ApiProblem/ApiProblemTest.php
diff --git a/tests/Unit/Manager/RequestManagerTest.php b/tests/Unit/Manager/RequestManagerTest.php
diff --git a/tests/Unit/Manager/ResponseManagerTest.php b/tests/Unit/Manager/ResponseManagerTest.php
diff --git a/tests/Unit/Middleware/AcceptAndContentTypeMiddlewareTest.php b/tests/Unit/Middleware/AcceptAndContentTypeMiddlewareTest.php
diff --git a/tests/Unit/Middleware/ApiExceptionMiddlewareTest.php b/tests/Unit/Middleware/ApiExceptionMiddlewareTest.php
diff --git a/tests/Unit/Serialization/ApiProblem/ClientError/ForbiddenMappingTest.php b/tests/Unit/Serialization/ApiProblem/ClientError/ForbiddenMappingTest.php

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,7 @@`
`8`	`8`
`9`	`9`	`final class RequestEntityTooLarge extends AbstractApiProblem`
`10`	`10`	`{`
`11`		`- /**`
`12`		`- * @var int`
`13`		`- */`
`14`		`- private $maxContentLength;`
	`11`	`+ private int $maxContentLength;`
`15`	`12`
`16`	`13`	`public function __construct(int $maxContentLength, ?string $detail = null, ?string $instance = null)`
`17`	`14`	`{`