Upgrading Doctrine Coding Standard to ^8.2

Author: moufmouf

composer.json

@@ -38,7 +38,7 @@
         "phpstan/phpstan": "^0.12.25",
         "beberlei/porpaginas": "^1.2",
         "myclabs/php-enum": "^1.6.6",
-        "doctrine/coding-standard": "^7.0",
+        "doctrine/coding-standard": "^8.2",
         "phpstan/phpstan-webmozart-assert": "^0.12",
         "phpstan/extension-installer": "^1.0",
         "thecodingmachine/phpstan-strict-rules": "^0.12",

phpcs.xml.dist

@@ -18,11 +18,6 @@
     <exclude-pattern>src/Types/TypeAnnotatedInterfaceType.php</exclude-pattern>
     <exclude-pattern>src/Mappers/Proxys/*</exclude-pattern>
 
-    <!-- Excluding ServiceResolver.php and QueryFieldDescriptor.php because Slevomat 5.0 does not support array shaped. -->
-    <!-- Support is added in 5.1 so we can remove these excludes when Slevomat 5.1 is out -->
-    <exclude-pattern>src/Middlewares/ServiceResolver.php</exclude-pattern>
-    <exclude-pattern>src/QueryFieldDescriptor.php</exclude-pattern>
-
     <!-- Include full Doctrine Coding Standard -->
     <rule ref="Doctrine">
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix"/>

src/AggregateControllerQueryProvider.php

@@ -7,6 +7,7 @@
 use GraphQL\Type\Definition\FieldDefinition;
 use Psr\Container\ContainerInterface;
 use TheCodingMachine\GraphQLite\Mappers\DuplicateMappingException;
+
 use function array_filter;
 use function array_intersect_key;
 use function array_keys;

src/AnnotationReader.php

@@ -26,6 +26,7 @@
 use TheCodingMachine\GraphQLite\Annotations\SourceFieldInterface;
 use TheCodingMachine\GraphQLite\Annotations\Type;
 use Webmozart\Assert\Assert;
+
 use function array_diff_key;
 use function array_filter;
 use function array_key_exists;
@@ -40,6 +41,7 @@
 use function strpos;
 use function strrpos;
 use function substr;
+
 use const PHP_MAJOR_VERSION;
 
 class AnnotationReader
@@ -267,8 +269,8 @@ private function getClassAnnotation(ReflectionClass $refClass, string $annotatio
             if (PHP_MAJOR_VERSION >= 8) {
                 $attribute = $refClass->getAttributes($annotationClass)[0] ?? null;
                 if ($attribute) {
-                    /** @var T $instance */
                     $instance = $attribute->newInstance();
+                    assert($instance instanceof T);
                     return $instance;
                 }
             }
@@ -279,6 +281,7 @@ private function getClassAnnotation(ReflectionClass $refClass, string $annotatio
             switch ($this->mode) {
                 case self::STRICT_MODE:
                     throw $e;
+
                 case self::LAX_MODE:
                     if ($this->isErrorImportant($annotationClass, $refClass->getDocComment() ?: '', $refClass->getName())) {
                         throw $e;
@@ -322,6 +325,7 @@ private function getMethodAnnotation(ReflectionMethod $refMethod, string $annota
             switch ($this->mode) {
                 case self::STRICT_MODE:
                     throw $e;
+
                 case self::LAX_MODE:
                     if ($this->isErrorImportant($annotationClass, $refMethod->getDocComment() ?: '', $refMethod->getDeclaringClass()->getName())) {
                         throw $e;

src/Annotations/AbstractRequest.php

@@ -15,7 +15,7 @@ abstract class AbstractRequest
     /**
      * @param mixed[] $attributes
      */
-    public function __construct(array $attributes = [], string $name = null, string $outputType = null)
+    public function __construct(array $attributes = [], ?string $name = null, ?string $outputType = null)
     {
         $this->outputType = $outputType ?? $attributes['outputType'] ?? null;
         $this->name       = $name ?? $attributes['name'] ?? null;

src/Annotations/Autowire.php

@@ -6,6 +6,7 @@
 
 use Attribute;
 use BadMethodCallException;
+
 use function is_string;
 use function ltrim;
 

src/Annotations/Decorate.php

@@ -6,6 +6,7 @@
 
 use Attribute;
 use BadMethodCallException;
+
 use function is_string;
 
 /**

src/Annotations/EnumType.php

@@ -24,7 +24,7 @@ class EnumType
     /**
      * @param mixed[] $attributes
      */
-    public function __construct(array $attributes = [], string $name = null)
+    public function __construct(array $attributes = [], ?string $name = null)
     {
         $this->name = $name ?? $attributes['name'] ?? null;
     }

src/Annotations/Exceptions/ClassNotFoundException.php

@@ -5,6 +5,7 @@
 namespace TheCodingMachine\GraphQLite\Annotations\Exceptions;
 
 use InvalidArgumentException;
+
 use function sprintf;
 
 class ClassNotFoundException extends InvalidArgumentException

src/Annotations/Exceptions/InvalidParameterException.php

@@ -6,6 +6,7 @@
 
 use BadMethodCallException;
 use ReflectionMethod;
+
 use function sprintf;
 
 class InvalidParameterException extends BadMethodCallException