Update doctrine/coding-standard to 8.2

Author: canvural

composer.json

@@ -35,7 +35,7 @@
     },
     "require-dev": {
         "cache/array-adapter": "^1.0",
-        "doctrine/coding-standard": "^6.0",
+        "doctrine/coding-standard": "^8.0",
         "guzzlehttp/psr7": "^1.5",
         "phpunit/phpunit": "^7|^8"
     },

phpcs.xml

@@ -13,5 +13,11 @@
     <file>tests</file>
 
     <!-- Include full Doctrine Coding Standard -->
-    <rule ref="Doctrine"/>
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
+
+        // This is only for PHP 7.4 and up
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator.RequiredNullCoalesceEqualOperator"/>
+    </rule>
 </ruleset>

src/Foundation/ArrayHelper.php

@@ -20,7 +20,7 @@ final class ArrayHelper
      *
      * @param mixed[] $arr
      */
-    public static function isAssoc(array $arr) : bool
+    public static function isAssoc(array $arr): bool
     {
         if ($arr === []) {
             return false;

src/PSR15/Exception/InvalidRequestMessage.php

@@ -8,7 +8,7 @@
 
 class InvalidRequestMessage extends ValidationFailed
 {
-    public static function because(ValidationFailed $e) : self
+    public static function because(ValidationFailed $e): self
     {
         return new static('Request message failed validation', 0, $e);
     }

src/PSR15/Exception/InvalidResponseMessage.php

@@ -8,7 +8,7 @@
 
 class InvalidResponseMessage extends ValidationFailed
 {
-    public static function because(ValidationFailed $e) : self
+    public static function because(ValidationFailed $e): self
     {
         return new static('Response message failed validation', 0, $e);
     }

src/PSR15/Exception/InvalidServerRequestMessage.php

@@ -8,7 +8,7 @@
 
 class InvalidServerRequestMessage extends ValidationFailed
 {
-    public static function because(ValidationFailed $e) : self
+    public static function because(ValidationFailed $e): self
     {
         return new static('Server Request message failed validation', 0, $e);
     }

src/PSR15/SlimAdapter.php

@@ -27,7 +27,7 @@ public function __construct(MiddlewareInterface $middleware)
         $this->middleware = $middleware;
     }
 
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next) : ResponseInterface
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, callable $next): ResponseInterface
     {
         $this->response = $response;
         $this->next     = $next;
@@ -37,7 +37,7 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
         return $this->middleware->process($request, $this);
     }
 
-    public function handle(ServerRequestInterface $request) : ResponseInterface
+    public function handle(ServerRequestInterface $request): ResponseInterface
     {
         return ($this->next)($request, $this->response);
     }

src/PSR15/ValidationMiddleware.php

@@ -34,7 +34,7 @@ public function __construct(ServerRequestValidator $requestValidator, ResponseVa
      * If unable to produce the response itself, it may delegate to the provided
      * request handler to do so.
      */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : ResponseInterface
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         // 1. Validate request
         try {

src/PSR15/ValidationMiddlewareBuilder.php

@@ -9,7 +9,7 @@
 
 class ValidationMiddlewareBuilder extends ValidatorBuilder
 {
-    public function getValidationMiddleware() : MiddlewareInterface
+    public function getValidationMiddleware(): MiddlewareInterface
     {
         return new ValidationMiddleware(
             $this->getServerRequestValidator(),

src/PSR7/CacheableSchemaFactory.php

@@ -6,5 +6,5 @@
 
 interface CacheableSchemaFactory extends SchemaFactory
 {
-    public function getCacheKey() : string;
+    public function getCacheKey(): string;
 }

src/PSR7/CallbackAddress.php

@@ -21,17 +21,17 @@ public function __construct(string $path, string $method, string $callbackName,
         $this->callbackMethod = $callbackMethod;
     }
 
-    public function callbackName() : string
+    public function callbackName(): string
     {
         return $this->callbackName;
     }
 
-    public function callbackMethod() : string
+    public function callbackMethod(): string
     {
         return $this->callbackMethod;
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
         return sprintf('Callback [%s %s %s %s]', $this->method, $this->path, $this->callbackName, $this->callbackMethod);
     }

src/PSR7/CallbackRequestValidator.php

@@ -32,15 +32,15 @@ public function __construct(OpenApi $schema)
         );
     }
 
-    public function getSchema() : OpenApi
+    public function getSchema(): OpenApi
     {
         return $this->openApi;
     }
 
     /**
      * @throws ValidationFailed
      */
-    public function validate(CallbackAddress $opAddr, RequestInterface $serverRequest) : void
+    public function validate(CallbackAddress $opAddr, RequestInterface $serverRequest): void
     {
         $this->validator->validate($opAddr, $serverRequest);
     }

src/PSR7/CallbackResponseAddress.php

@@ -17,12 +17,12 @@ public function __construct(string $path, string $method, string $callbackName,
         $this->responseCode = $responseCode;
     }
 
-    public function responseCode() : int
+    public function responseCode(): int
     {
         return $this->responseCode;
     }
 
-    public function __toString() : string
+    public function __toString(): string
     {
         return sprintf('Callback [%s %s %s %s %d]', $this->method, $this->path, $this->callbackName, $this->callbackMethod, $this->responseCode);
     }

src/PSR7/CallbackResponseValidator.php

@@ -28,15 +28,15 @@ public function __construct(OpenApi $schema)
         );
     }
 
-    public function getSchema() : OpenApi
+    public function getSchema(): OpenApi
     {
         return $this->openApi;
     }
 
     /**
      * @throws ValidationFailed
      */
-    public function validate(CallbackAddress $opAddr, ResponseInterface $serverRequest) : void
+    public function validate(CallbackAddress $opAddr, ResponseInterface $serverRequest): void
     {
         $opAddr = new CallbackResponseAddress(
             $opAddr->path(),

src/PSR7/Exception/MultipleOperationsMismatchForRequest.php

@@ -5,6 +5,7 @@
 namespace League\OpenAPIValidation\PSR7\Exception;
 
 use League\OpenAPIValidation\PSR7\OperationAddress;
+
 use function array_map;
 use function implode;
 use function sprintf;
@@ -17,7 +18,7 @@ class MultipleOperationsMismatchForRequest extends ValidationFailed
     /**
      * @param OperationAddress[] $addrs
      */
-    public static function fromMatchedAddrs(array $addrs) : self
+    public static function fromMatchedAddrs(array $addrs): self
     {
         $addrsStrings = array_map(static function (OperationAddress $addr) {
             return sprintf('[%s,%s]', $addr->path(), $addr->method());
@@ -33,7 +34,7 @@ public static function fromMatchedAddrs(array $addrs) : self
     /**
      * @return OperationAddress[]
      */
-    public function matchedAddrs() : array
+    public function matchedAddrs(): array
     {
         return $this->matchedAddrs;
     }

src/PSR7/Exception/NoCallback.php

@@ -14,7 +14,7 @@ class NoCallback extends NoOperation
     /** @var string */
     protected $callbackMethod;
 
-    public static function fromCallbackPath(string $path, string $method, string $callbackName, string $callbackMethod) : self
+    public static function fromCallbackPath(string $path, string $method, string $callbackName, string $callbackMethod): self
     {
         $i                 = new self(sprintf('OpenAPI spec contains no such callback [%s,%s,%s,%s]', $path, $method, $callbackName, $callbackMethod));
         $i->path           = $path;
@@ -25,7 +25,7 @@ public static function fromCallbackPath(string $path, string $method, string $ca
         return $i;
     }
 
-    public function method() : string
+    public function method(): string
     {
         return $this->method;
     }

src/PSR7/Exception/NoOperation.php

@@ -11,7 +11,7 @@ class NoOperation extends NoPath
     /** @var string */
     protected $method;
 
-    public static function fromPathAndMethod(string $path, string $method) : self
+    public static function fromPathAndMethod(string $path, string $method): self
     {
         $i         = new self(sprintf('OpenAPI spec contains no such operation [%s,%s]', $path, $method));
         $i->path   = $path;
@@ -20,7 +20,7 @@ public static function fromPathAndMethod(string $path, string $method) : self
         return $i;
     }
 
-    public function method() : string
+    public function method(): string
     {
         return $this->method;
     }

src/PSR7/Exception/NoPath.php

@@ -11,15 +11,15 @@ class NoPath extends ValidationFailed
     /** @var string */
     protected $path;
 
-    public static function fromPath(string $path) : self
+    public static function fromPath(string $path): self
     {
         $i       = new self(sprintf('OpenAPI spec contains no such operation [%s]', $path));
         $i->path = $path;
 
         return $i;
     }
 
-    public function path() : string
+    public function path(): string
     {
         return $this->path;
     }

src/PSR7/Exception/NoResponseCode.php

@@ -11,7 +11,7 @@ class NoResponseCode extends NoOperation
     /** @var int */
     protected $responseCode;
 
-    public static function fromPathAndMethodAndResponseCode(string $path, string $method, int $responseCode) : self
+    public static function fromPathAndMethodAndResponseCode(string $path, string $method, int $responseCode): self
     {
         $i               = new self(sprintf('OpenAPI spec contains no such operation [%s,%s,%d]', $path, $method, $responseCode));
         $i->path         = $path;
@@ -21,7 +21,7 @@ public static function fromPathAndMethodAndResponseCode(string $path, string $me
         return $i;
     }
 
-    public function responseCode() : int
+    public function responseCode(): int
     {
         return $this->responseCode;
     }

src/PSR7/Exception/Validation/AddressValidationFailed.php

@@ -7,6 +7,7 @@
 use League\OpenAPIValidation\PSR7\Exception\ValidationFailed;
 use League\OpenAPIValidation\PSR7\OperationAddress;
 use Throwable;
+
 use function sprintf;
 
 abstract class AddressValidationFailed extends ValidationFailed
@@ -17,7 +18,7 @@ abstract class AddressValidationFailed extends ValidationFailed
     /**
      * @return static
      */
-    public static function fromAddrAndPrev(OperationAddress $address, Throwable $prev) : self
+    public static function fromAddrAndPrev(OperationAddress $address, Throwable $prev): self
     {
         $ex          = new static(sprintf('Validation failed for %s', $address), $prev->getCode(), $prev);
         $ex->address = $address;
@@ -28,15 +29,15 @@ public static function fromAddrAndPrev(OperationAddress $address, Throwable $pre
     /**
      * @return static
      */
-    public static function fromAddr(OperationAddress $address) : self
+    public static function fromAddr(OperationAddress $address): self
     {
         $ex          = new static(sprintf('Validation failed for %s', $address));
         $ex->address = $address;
 
         return $ex;
     }
 
-    public function getAddress() : OperationAddress
+    public function getAddress(): OperationAddress
     {
         return $this->address;
     }

src/PSR7/Exception/Validation/InvalidBody.php

@@ -6,6 +6,7 @@
 
 use League\OpenAPIValidation\PSR7\OperationAddress;
 use League\OpenAPIValidation\Schema\Exception\SchemaMismatch;
+
 use function sprintf;
 
 class InvalidBody extends AddressValidationFailed
@@ -14,7 +15,7 @@ public static function becauseBodyDoesNotMatchSchema(
         string $contentType,
         OperationAddress $addr,
         SchemaMismatch $prev
-    ) : self {
+    ): self {
         $exception          = static::fromAddrAndPrev($addr, $prev);
         $exception->message = sprintf('Body does not match schema for content-type "%s" for %s', $contentType, $addr);
 
@@ -26,7 +27,7 @@ public static function becauseBodyDoesNotMatchSchemaMultipart(
         string $contentType,
         OperationAddress $addr,
         ?SchemaMismatch $prev = null
-    ) : self {
+    ): self {
         $exception          = $prev ? static::fromAddrAndPrev($addr, $prev) : static::fromAddr($addr);
         $exception->message = sprintf(
             'Multipart body does not match schema for part "%s" with content-type "%s" for %s',
@@ -38,7 +39,7 @@ public static function becauseBodyDoesNotMatchSchemaMultipart(
         return $exception;
     }
 
-    public static function becauseBodyIsNotValidJson(string $error, OperationAddress $addr) : self
+    public static function becauseBodyIsNotValidJson(string $error, OperationAddress $addr): self
     {
         $exception          = static::fromAddr($addr);
         $exception->message = sprintf('JSON parsing failed with "%s" for %s', $error, $addr);

src/PSR7/Exception/Validation/InvalidCookies.php

@@ -6,19 +6,20 @@
 
 use League\OpenAPIValidation\PSR7\OperationAddress;
 use League\OpenAPIValidation\Schema\Exception\SchemaMismatch;
+
 use function sprintf;
 
 class InvalidCookies extends AddressValidationFailed
 {
-    public static function becauseOfMissingRequiredCookie(string $cookieName, OperationAddress $address) : self
+    public static function becauseOfMissingRequiredCookie(string $cookieName, OperationAddress $address): self
     {
         $exception          = static::fromAddr($address);
         $exception->message = sprintf('Missing required cookie "%s" for %s', $cookieName, $address);
 
         return $exception;
     }
 
-    public static function becauseValueDoesNotMatchSchema(string $cookieName, string $cookieValue, OperationAddress $address, SchemaMismatch $prev) : self
+    public static function becauseValueDoesNotMatchSchema(string $cookieName, string $cookieValue, OperationAddress $address, SchemaMismatch $prev): self
     {
         $exception          = static::fromAddrAndPrev($address, $prev);
         $exception->message = sprintf('Value "%s" for cookie "%s" is invalid for %s', $cookieValue, $cookieName, $address);