Normalize types of RootTypeMapperInterface (#520)

l-you · web-flow · commit b68e96b88f8b · 2022-10-28T18:23:45.000-04:00
* psr/container v2

* Implement replacement for Picotainer

* Replace Picotainer with LazyContainer in tests and documentation for version &gt;=6

* Fix tests for phpdocumentor/type-resolver minor update

* run cs-fix script

* Fix some cs-fixer errors manually

* fix return type

* abandon psr/container ^1

* Test for LazyContainer

* Normalize RootTypeMapperInterface
diff --git a/src/Mappers/Root/BaseTypeMapper.php b/src/Mappers/Root/BaseTypeMapper.php
@@ -78,7 +78,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
      * @throws CannotMapTypeException
      * @throws CannotMapTypeExceptionInterface
      */
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         $mappedType = $this->mapBaseType($type);
         if ($mappedType !== null) {
diff --git a/src/Mappers/Root/CompoundTypeMapper.php b/src/Mappers/Root/CompoundTypeMapper.php
@@ -81,7 +81,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
         return $return;
     }
 
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         if (! $type instanceof Compound) {
             return $this->next->toGraphQLInputType($type, $subType, $argumentName, $reflector, $docBlockObj);
diff --git a/src/Mappers/Root/EnumTypeMapper.php b/src/Mappers/Root/EnumTypeMapper.php
@@ -65,11 +65,11 @@ public function toGraphQLOutputType(
      */
     public function toGraphQLInputType(
         Type $type,
-        InputType|GraphQLType|null $subType,
+        InputType|null $subType,
         string $argumentName,
         ReflectionMethod|ReflectionProperty $reflector,
         DocBlock $docBlockObj,
-    ): InputType|GraphQLType
+    ): InputType
     {
         $result = $this->map($type);
         if ($result === null) {
diff --git a/src/Mappers/Root/FinalRootTypeMapper.php b/src/Mappers/Root/FinalRootTypeMapper.php
@@ -40,7 +40,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
     }
 
     /** @throws CannotMapTypeException */
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         throw CannotMapTypeException::createForPhpDocType($type);
     }
diff --git a/src/Mappers/Root/IteratorTypeMapper.php b/src/Mappers/Root/IteratorTypeMapper.php
@@ -70,7 +70,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
         return $result;
     }
 
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         if (! $type instanceof Compound) {
             //try {
diff --git a/src/Mappers/Root/MyCLabsEnumTypeMapper.php b/src/Mappers/Root/MyCLabsEnumTypeMapper.php
@@ -8,7 +8,6 @@
 use GraphQL\Type\Definition\InputType;
 use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\OutputType;
-use GraphQL\Type\Definition\Type as GraphQLType;
 use MyCLabs\Enum\Enum;
 use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\Type;
@@ -46,7 +45,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
         return $result ?? $this->next->toGraphQLOutputType($type, $subType, $reflector, $docBlockObj);
     }
 
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         $result = $this->map($type);
         return $result ?? $this->next->toGraphQLInputType($type, $subType, $argumentName, $reflector, $docBlockObj);
diff --git a/src/Mappers/Root/NullableTypeMapperAdapter.php b/src/Mappers/Root/NullableTypeMapperAdapter.php
@@ -65,7 +65,7 @@ public function toGraphQLOutputType(Type $type, OutputType|GraphQLType|null $sub
         return $graphQlType;
     }
 
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         // Let's check a "null" value in the docblock
         $isNullable = $this->isNullable($type);
diff --git a/src/Mappers/Root/RootTypeMapperInterface.php b/src/Mappers/Root/RootTypeMapperInterface.php
@@ -37,7 +37,7 @@ public function toGraphQLOutputType(Type $type, OutputType|null $subType, Reflec
      *
      * @return InputType&GraphQLType
      */
-    public function toGraphQLInputType(Type $type, InputType|GraphQLType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType;
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType;
 
     /**
      * Returns a GraphQL type by name.
diff --git a/tests/Mappers/Root/NullableTypeMapperAdapterTest.php b/tests/Mappers/Root/NullableTypeMapperAdapterTest.php
@@ -55,7 +55,7 @@ public function toGraphQLOutputType(Type $type, ?OutputType $subType, $reflector
                 return new NonNull(new StringType());
             }
 
-            public function toGraphQLInputType(Type $type, null|InputType|GraphQLType $subType, string $argumentName, $reflector, DocBlock $docBlockObj): InputType
+            public function toGraphQLInputType(Type $type, null|InputType $subType, string $argumentName, $reflector, DocBlock $docBlockObj): InputType
             {
                 throw new \RuntimeException('Not implemented');
             }
diff --git a/tests/Mappers/Root/VoidRootTypeMapper.php b/tests/Mappers/Root/VoidRootTypeMapper.php
@@ -1,9 +1,9 @@
 <?php
 
+declare(strict_types=1);
 
 namespace TheCodingMachine\GraphQLite\Mappers\Root;
 
-
 use GraphQL\Type\Definition\InputType;
 use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\OutputType;
@@ -15,9 +15,7 @@
 
 class VoidRootTypeMapper implements RootTypeMapperInterface
 {
-    /**
-     * @var RootTypeMapperInterface
-     */
+    /** @var RootTypeMapperInterface */
     private $next;
 
     public function __construct(RootTypeMapperInterface $next)
@@ -27,22 +25,20 @@ public function __construct(RootTypeMapperInterface $next)
 
     /**
      * @param (OutputType&GraphQLType)|null $subType
-     * @param ReflectionMethod|ReflectionProperty $reflector
      *
      * @return OutputType&GraphQLType
      */
-    public function toGraphQLOutputType(Type $type, ?OutputType $subType, $reflector, DocBlock $docBlockObj): OutputType
+    public function toGraphQLOutputType(Type $type, OutputType|null $subType, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): OutputType
     {
         return $this->next->toGraphQLOutputType($type, $subType, $reflector, $docBlockObj);
     }
 
     /**
      * @param (InputType&GraphQLType)|null $subType
-     * @param ReflectionMethod|ReflectionProperty $reflector
      *
      * @return InputType&GraphQLType
      */
-    public function toGraphQLInputType(Type $type, null|InputType|GraphQLType $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType|GraphQLType
+    public function toGraphQLInputType(Type $type, InputType|null $subType, string $argumentName, ReflectionMethod|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType
     {
         return $this->next->toGraphQLInputType($type, $subType, $argumentName, $reflector, $docBlockObj);
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, Reflec`
`78`	`78`	`* @throws CannotMapTypeException`
`79`	`79`	`* @throws CannotMapTypeExceptionInterface`
`80`	`80`	`*/`
`81`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`81`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`82`	`82`	`{`
`83`	`83`	`$mappedType = $this->mapBaseType($type);`
`84`	`84`	`if ($mappedType !== null) {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, Reflec`
`81`	`81`	`return $return;`
`82`	`82`	`}`
`83`	`83`
`84`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`84`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`85`	`85`	`{`
`86`	`86`	`if (! $type instanceof Compound) {`
`87`	`87`	`return $this->next->toGraphQLInputType($type, $subType, $argumentName, $reflector, $docBlockObj);`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, Reflec`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/** @throws CannotMapTypeException */`
`43`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`43`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`44`	`44`	`{`
`45`	`45`	`throw CannotMapTypeException::createForPhpDocType($type);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, Reflec`
`70`	`70`	`return $result;`
`71`	`71`	`}`
`72`	`72`
`73`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`73`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`74`	`74`	`{`
`75`	`75`	`if (! $type instanceof Compound) {`
`76`	`76`	`//try {`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|GraphQLType\|null $sub`
`65`	`65`	`return $graphQlType;`
`66`	`66`	`}`
`67`	`67`
`68`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`68`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`69`	`69`	`{`
`70`	`70`	`// Let's check a "null" value in the docblock`
`71`	`71`	`$isNullable = $this->isNullable($type);`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, Reflec`
`37`	`37`	`*`
`38`	`38`	`* @return InputType&GraphQLType`
`39`	`39`	`*/`
`40`		`- public function toGraphQLInputType(Type $type, InputType\|GraphQLType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType;`
	`40`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType;`
`41`	`41`
`42`	`42`	`/**`
`43`	`43`	`* Returns a GraphQL type by name.`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function toGraphQLOutputType(Type $type, ?OutputType $subType, $reflector`
`55`	`55`	`return new NonNull(new StringType());`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function toGraphQLInputType(Type $type, null\|InputType\|GraphQLType $subType, string $argumentName, $reflector, DocBlock $docBlockObj): InputType`
	`58`	`+ public function toGraphQLInputType(Type $type, null\|InputType $subType, string $argumentName, $reflector, DocBlock $docBlockObj): InputType`
`59`	`59`	`{`
`60`	`60`	`throw new \RuntimeException('Not implemented');`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+declare(strict_types=1);`
`3`	`4`
`4`	`5`	`namespace TheCodingMachine\GraphQLite\Mappers\Root;`
`5`	`6`
`6`		`-`
`7`	`7`	`use GraphQL\Type\Definition\InputType;`
`8`	`8`	`use GraphQL\Type\Definition\NamedType;`
`9`	`9`	`use GraphQL\Type\Definition\OutputType;`
`@@ -15,9 +15,7 @@`
`15`	`15`
`16`	`16`	`class VoidRootTypeMapper implements RootTypeMapperInterface`
`17`	`17`	`{`
`18`		`- /**`
`19`		`- * @var RootTypeMapperInterface`
`20`		`- */`
	`18`	`+ /** @var RootTypeMapperInterface */`
`21`	`19`	`private $next;`
`22`	`20`
`23`	`21`	`public function __construct(RootTypeMapperInterface $next)`
`@@ -27,22 +25,20 @@ public function __construct(RootTypeMapperInterface $next)`
`27`	`25`
`28`	`26`	`/**`
`29`	`27`	`* @param (OutputType&GraphQLType)\|null $subType`
`30`		`- * @param ReflectionMethod\|ReflectionProperty $reflector`
`31`	`28`	`*`
`32`	`29`	`* @return OutputType&GraphQLType`
`33`	`30`	`*/`
`34`		`- public function toGraphQLOutputType(Type $type, ?OutputType $subType, $reflector, DocBlock $docBlockObj): OutputType`
	`31`	`+ public function toGraphQLOutputType(Type $type, OutputType\|null $subType, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): OutputType`
`35`	`32`	`{`
`36`	`33`	`return $this->next->toGraphQLOutputType($type, $subType, $reflector, $docBlockObj);`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`/**`
`40`	`37`	`* @param (InputType&GraphQLType)\|null $subType`
`41`		`- * @param ReflectionMethod\|ReflectionProperty $reflector`
`42`	`38`	`*`
`43`	`39`	`* @return InputType&GraphQLType`
`44`	`40`	`*/`
`45`		`- public function toGraphQLInputType(Type $type, null\|InputType\|GraphQLType $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType\|GraphQLType`
	`41`	`+ public function toGraphQLInputType(Type $type, InputType\|null $subType, string $argumentName, ReflectionMethod\|ReflectionProperty $reflector, DocBlock $docBlockObj): InputType`
`46`	`42`	`{`
`47`	`43`	`return $this->next->toGraphQLInputType($type, $subType, $argumentName, $reflector, $docBlockObj);`
`48`	`44`	`}`