Merge branch 'overblog:master' into phpcs

Author: Vincz

composer.json

@@ -57,7 +57,7 @@
         "doctrine/orm": "^2.5",
         "monolog/monolog": "^1.26.1",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "1.6.2",
+        "phpstan/phpstan": "1.8.4",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5.10",

src/DependencyInjection/Compiler/ConfigParserPass.php

@@ -8,6 +8,7 @@
 use Overblog\GraphQLBundle\Config\Parser\AnnotationParser;
 use Overblog\GraphQLBundle\Config\Parser\AttributeParser;
 use Overblog\GraphQLBundle\Config\Parser\GraphQLParser;
+use Overblog\GraphQLBundle\Config\Parser\ParserInterface;
 use Overblog\GraphQLBundle\Config\Parser\PreParserInterface;
 use Overblog\GraphQLBundle\Config\Parser\YamlParser;
 use Overblog\GraphQLBundle\DependencyInjection\TypesConfiguration;
@@ -47,7 +48,7 @@ final class ConfigParserPass implements CompilerPassInterface
     ];
 
     /**
-     * @var array<string, class-string<PreParserInterface>>
+     * @var array<string, class-string<ParserInterface>>
      */
     public const PARSERS = [
         'yaml' => YamlParser::class,

src/Resolver/ResolverMap.php

@@ -78,7 +78,7 @@ public function covered(?string $typeName = null)
         if (null === $typeName) {
             $resolvers = $loadedMap;
         } elseif (isset($loadedMap[$typeName])) { // @phpstan-ignore-line
-            $resolvers = $loadedMap[$typeName];
+            $resolvers = $loadedMap[$typeName]; // @phpstan-ignore-line
         }
 
         foreach ($resolvers as $key => $value) {

tests/Functional/Type/DefinitionTest.php

@@ -23,7 +23,7 @@ public function testDefinesEnumTypeWithDeprecatedValue(): void
         /** @var EnumType $enumTypeWithDeprecatedValue */
         $enumTypeWithDeprecatedValue = $this->getType('EnumWithDeprecatedValue');
         $value = $enumTypeWithDeprecatedValue->getValues()[0];
-        $this->assertSame([
+        $this->assertSame([ // @phpstan-ignore-line
             'deprecationReason' => 'Just because',
             'value' => 'foo',
             'name' => 'foo',

tests/Relay/Connection/AbstractConnectionBuilderTest.php

@@ -37,7 +37,7 @@ protected function getExpectedConnection(array $wantedEdges, bool $hasPreviousPa
             $expectedEdges,
             new PageInfo(
                 isset($expectedEdges[0]) ? $expectedEdges[0]->getCursor() : null,
-                $endEdge ? $endEdge->getCursor() : null,
+                $endEdge ? $endEdge->getCursor() : null, // @phpstan-ignore-line
                 $hasPreviousPage,
                 $hasNextPage
             )