Psr/container ^2 support (#518)

* psr/container v2 * Implement replacement for Picotainer * Replace Picotainer with LazyContainer in tests and documentation for version >=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
thecodingmachine · Oct 24, 2022 · fed9ffe · fed9ffe
1 parent fc9eae6
commit fed9ffe
Show file tree

Hide file tree

Showing 145 changed files with 639 additions and 897 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "composer/package-versions-deprecated": "^1.8",
         "phpdocumentor/reflection-docblock": "^4.3 || ^5.0",
         "phpdocumentor/type-resolver": "^1.4",
-        "psr/container": "^1",
+        "psr/container": "^2",
         "psr/http-factory": "^1",
         "psr/http-message": "^1.0.1",
         "psr/http-server-handler": "^1",
@@ -33,7 +33,6 @@
         "doctrine/coding-standard": "^9.0 || ^10.0",
         "ecodev/graphql-upload": "^6.1",
         "laminas/laminas-diactoros": "^2",
-        "mouf/picotainer": "^1.1",
         "myclabs/php-enum": "^1.6.6",
         "php-coveralls/php-coveralls": "^2.1",
         "phpstan/extension-installer": "^1.1",

diff --git a/src/AggregateControllerQueryProvider.php b/src/AggregateControllerQueryProvider.php
@@ -33,9 +33,7 @@ public function __construct(private iterable $controllers, private FieldsBuilder
     {
     }
 
-    /**
-     * @return array<string,FieldDefinition>
-     */
+    /** @return array<string,FieldDefinition> */
     public function getQueries(): array
     {
         $queryList = [];
@@ -48,9 +46,7 @@ public function getQueries(): array
         return $this->flattenList($queryList);
     }
 
-    /**
-     * @return array<string, FieldDefinition>
-     */
+    /** @return array<string, FieldDefinition> */
     public function getMutations(): array
     {
         $mutationList = [];

diff --git a/src/AggregateQueryProvider.php b/src/AggregateQueryProvider.php
@@ -17,17 +17,13 @@ class AggregateQueryProvider implements QueryProviderInterface
     /** @var QueryProviderInterface[] */
     private array $queryProviders;
 
-    /**
-     * @param QueryProviderInterface[] $queryProviders
-     */
+    /** @param QueryProviderInterface[] $queryProviders */
     public function __construct(iterable $queryProviders)
     {
         $this->queryProviders = is_array($queryProviders) ? $queryProviders : iterator_to_array($queryProviders);
     }
 
-    /**
-     * @return QueryField[]
-     */
+    /** @return QueryField[] */
     public function getQueries(): array
     {
         $queriesArray = array_map(static function (QueryProviderInterface $queryProvider) {
@@ -40,9 +36,7 @@ public function getQueries(): array
         return array_merge(...$queriesArray);
     }
 
-    /**
-     * @return QueryField[]
-     */
+    /** @return QueryField[] */
     public function getMutations(): array
     {
         $mutationsArray = array_map(static function (QueryProviderInterface $queryProvider) {

diff --git a/src/AnnotationReader.php b/src/AnnotationReader.php
@@ -49,6 +49,7 @@ class AnnotationReader
 {
     // In this mode, no exceptions will be thrown for incorrect annotations (unless the name of the annotation we are looking for is part of the docblock)
     public const LAX_MODE = 'LAX_MODE';
+
     // In this mode, exceptions will be thrown for any incorrect annotations.
     public const STRICT_MODE = 'STRICT_MODE';
 
@@ -86,7 +87,7 @@ public function __construct(private Reader $reader, private string $mode = self:
      *
      * @template T of object
      */
-    private function getClassAnnotation(ReflectionClass $refClass, string $annotationClass): ?object
+    private function getClassAnnotation(ReflectionClass $refClass, string $annotationClass): object|null
     {
         try {
             $attribute = $refClass->getAttributes($annotationClass)[0] ?? null;
@@ -123,7 +124,7 @@ private function getClassAnnotation(ReflectionClass $refClass, string $annotatio
      *
      * @throws AnnotationException
      */
-    private function getMethodAnnotation(ReflectionMethod $refMethod, string $annotationClass): ?object
+    private function getMethodAnnotation(ReflectionMethod $refMethod, string $annotationClass): object|null
     {
         $cacheKey = $refMethod->getDeclaringClass()->getName() . '::' . $refMethod->getName() . '_' . $annotationClass;
         if (array_key_exists($cacheKey, $this->methodAnnotationCache)) {
@@ -200,7 +201,7 @@ static function ($attribute) {
                     },
                     array_filter($refClass->getAttributes(), static function ($annotation) use ($annotationClass): bool {
                         return is_a($annotation->getName(), $annotationClass, true);
-                    })
+                    }),
                 );
 
                 $toAddAnnotations[] = $attributes;
@@ -231,7 +232,7 @@ static function ($attribute) {
      *
      * @template T of object
      */
-    public function getTypeAnnotation(ReflectionClass $refClass): ?TypeInterface
+    public function getTypeAnnotation(ReflectionClass $refClass): TypeInterface|null
     {
         try {
             $type = $this->getClassAnnotation($refClass, Type::class)
@@ -276,7 +277,7 @@ public function getInputAnnotations(ReflectionClass $refClass): array
      *
      * @template T of object
      */
-    public function getExtendTypeAnnotation(ReflectionClass $refClass): ?ExtendType
+    public function getExtendTypeAnnotation(ReflectionClass $refClass): ExtendType|null
     {
         try {
             $extendType = $this->getClassAnnotation($refClass, ExtendType::class);
@@ -287,15 +288,13 @@ public function getExtendTypeAnnotation(ReflectionClass $refClass): ?ExtendType
         return $extendType;
     }
 
-    public function getEnumTypeAnnotation(ReflectionClass $refClass): ?EnumType
+    public function getEnumTypeAnnotation(ReflectionClass $refClass): EnumType|null
     {
         return $this->getClassAnnotation($refClass, EnumType::class);
     }
 
-    /**
-     * @param class-string<AbstractRequest> $annotationClass
-     */
-    public function getRequestAnnotation(ReflectionMethod $refMethod, string $annotationClass): ?AbstractRequest
+    /** @param class-string<AbstractRequest> $annotationClass */
+    public function getRequestAnnotation(ReflectionMethod $refMethod, string $annotationClass): AbstractRequest|null
     {
         $queryAnnotation = $this->getMethodAnnotation($refMethod, $annotationClass);
         assert($queryAnnotation instanceof AbstractRequest || $queryAnnotation === null);
@@ -318,15 +317,15 @@ public function getSourceFields(ReflectionClass $refClass): array
         return $sourceFields;
     }
 
-    public function getFactoryAnnotation(ReflectionMethod $refMethod): ?Factory
+    public function getFactoryAnnotation(ReflectionMethod $refMethod): Factory|null
     {
         $factoryAnnotation = $this->getMethodAnnotation($refMethod, Factory::class);
         assert($factoryAnnotation instanceof Factory || $factoryAnnotation === null);
 
         return $factoryAnnotation;
     }
 
-    public function getDecorateAnnotation(ReflectionMethod $refMethod): ?Decorate
+    public function getDecorateAnnotation(ReflectionMethod $refMethod): Decorate|null
     {
         $decorateAnnotation = $this->getMethodAnnotation($refMethod, Decorate::class);
         assert($decorateAnnotation instanceof Decorate || $decorateAnnotation === null);
@@ -376,9 +375,7 @@ public function getParameterAnnotationsPerParameter(array $refParameters): array
         /** @var ParameterAnnotationInterface[] $parameterAnnotations */
         $parameterAnnotations = $this->getMethodAnnotations($method, ParameterAnnotationInterface::class);
 
-        /**
-         * @var array<string, array<int,ParameterAnnotations>> $parameterAnnotationsPerParameter
-         */
+        /** @var array<string, array<int,ParameterAnnotations>> $parameterAnnotationsPerParameter */
         $parameterAnnotationsPerParameter = [];
         foreach ($parameterAnnotations as $parameterAnnotation) {
             $parameterAnnotationsPerParameter[$parameterAnnotation->getTarget()][] = $parameterAnnotation;
@@ -406,25 +403,21 @@ static function ($attribute) {
                     },
                     array_filter($attributes, static function ($annotation): bool {
                         return is_a($annotation->getName(), ParameterAnnotationInterface::class, true);
-                    })
+                    }),
                 ),
             ];
         }
 
         return array_map(
             static function (array $parameterAnnotations): ParameterAnnotations {
-                /**
-                 * @var ParameterAnnotationInterface[] $parameterAnnotations
-                 */
+                /** @var ParameterAnnotationInterface[] $parameterAnnotations */
                 return new ParameterAnnotations($parameterAnnotations);
             },
-            $parameterAnnotationsPerParameter
+            $parameterAnnotationsPerParameter,
         );
     }
 
-    /**
-     * @throws AnnotationException
-     */
+    /** @throws AnnotationException */
     public function getMiddlewareAnnotations(ReflectionMethod|ReflectionProperty $reflection): MiddlewareAnnotations
     {
         if ($reflection instanceof ReflectionMethod) {
@@ -469,7 +462,7 @@ static function ($attribute) {
                     },
                     array_filter($attributes, static function ($annotation) use ($annotationClass): bool {
                         return is_a($annotation->getName(), $annotationClass, true);
-                    })
+                    }),
                 ),
             ];
         } catch (AnnotationException $e) {
@@ -525,7 +518,7 @@ static function ($attribute) {
                     },
                     array_filter($attributes, static function ($annotation) use ($annotationClass): bool {
                         return is_a($annotation->getName(), $annotationClass, true);
-                    })
+                    }),
                 ),
             ];
         } catch (AnnotationException $e) {

diff --git a/src/Annotations/AbstractRequest.php b/src/Annotations/AbstractRequest.php
@@ -6,14 +6,12 @@
 
 abstract class AbstractRequest
 {
-    private ?string $outputType;
+    private string|null $outputType;
 
-    private ?string $name;
+    private string|null $name;
 
-    /**
-     * @param mixed[] $attributes
-     */
-    public function __construct(array $attributes = [], ?string $name = null, ?string $outputType = null)
+    /** @param mixed[] $attributes */
+    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null)
     {
         $this->outputType = $outputType ?? $attributes['outputType'] ?? null;
         $this->name       = $name ?? $attributes['name'] ?? null;
@@ -23,7 +21,7 @@ public function __construct(array $attributes = [], ?string $name = null, ?strin
      * Returns the GraphQL return type of the request (as a string).
      * The string can represent the FQCN of the type or an entry in the container resolving to the GraphQL type.
      */
-    public function getOutputType(): ?string
+    public function getOutputType(): string|null
     {
         return $this->outputType;
     }
@@ -32,7 +30,7 @@ public function getOutputType(): ?string
      * Returns the name of the GraphQL query/mutation/field.
      * If not specified, the name of the method should be used instead.
      */
-    public function getName(): ?string
+    public function getName(): string|null
     {
         return $this->name;
     }

diff --git a/src/Annotations/Autowire.php b/src/Annotations/Autowire.php
@@ -28,9 +28,7 @@ class Autowire implements ParameterAnnotationInterface
     /** @var string|null */
     private $identifier;
 
-    /**
-     * @param array<string, mixed>|string $identifier
-     */
+    /** @param array<string, mixed>|string $identifier */
     public function __construct(array|string $identifier = [])
     {
         $values = $identifier;
@@ -52,7 +50,7 @@ public function getTarget(): string
         return $this->for;
     }
 
-    public function getIdentifier(): ?string
+    public function getIdentifier(): string|null
     {
         return $this->identifier;
     }

diff --git a/src/Annotations/EnumType.php b/src/Annotations/EnumType.php
@@ -26,10 +26,8 @@ class EnumType
     /** @var bool */
     private $useValues;
 
-    /**
-     * @param mixed[] $attributes
-     */
-    public function __construct(array $attributes = [], ?string $name = null, ?bool $useValues = null)
+    /** @param mixed[] $attributes */
+    public function __construct(array $attributes = [], string|null $name = null, bool|null $useValues = null)
     {
         $this->name = $name ?? $attributes['name'] ?? null;
         $this->useValues = $useValues ?? $attributes['useValues'] ?? false;
@@ -38,7 +36,7 @@ public function __construct(array $attributes = [], ?string $name = null, ?bool
     /**
      * Returns the GraphQL name for this type.
      */
-    public function getName(): ?string
+    public function getName(): string|null
     {
         return $this->name;
     }

diff --git a/src/Annotations/ExtendType.php b/src/Annotations/ExtendType.php
@@ -30,10 +30,8 @@ class ExtendType
     /** @var string|null */
     private $name;
 
-    /**
-     * @param mixed[] $attributes
-     */
-    public function __construct(array $attributes = [], ?string $class = null, ?string $name = null)
+    /** @param mixed[] $attributes */
+    public function __construct(array $attributes = [], string|null $class = null, string|null $name = null)
     {
         $className = isset($attributes['class']) ? ltrim($attributes['class'], '\\') : null;
         $className = $className ?? $class;
@@ -53,12 +51,12 @@ public function __construct(array $attributes = [], ?string $class = null, ?stri
      *
      * @return class-string<object>|null
      */
-    public function getClass(): ?string
+    public function getClass(): string|null
     {
         return $this->class;
     }
 
-    public function getName(): ?string
+    public function getName(): string|null
     {
         return $this->name;
     }

diff --git a/src/Annotations/Factory.php b/src/Annotations/Factory.php
@@ -25,10 +25,8 @@ class Factory
     /** @var bool */
     private $default;
 
-    /**
-     * @param mixed[] $attributes
-     */
-    public function __construct(array $attributes = [], ?string $name = null, ?bool $default = null)
+    /** @param mixed[] $attributes */
+    public function __construct(array $attributes = [], string|null $name = null, bool|null $default = null)
     {
         $this->name = $name ?? $attributes['name'] ?? null;
         // This IS the default if no name is set and no "default" attribute is passed.
@@ -43,7 +41,7 @@ public function __construct(array $attributes = [], ?string $name = null, ?bool
      * Returns the name of the GraphQL input type.
      * If not specified, the name of the method should be used instead.
      */
-    public function getName(): ?string
+    public function getName(): string|null
     {
         return $this->name;
     }

diff --git a/src/Annotations/FailWith.php b/src/Annotations/FailWith.php
@@ -28,9 +28,7 @@ class FailWith implements MiddlewareAnnotationInterface
      */
     private $value;
 
-    /**
-     * @throws BadMethodCallException
-     */
+    /** @throws BadMethodCallException */
     public function __construct(mixed $values = [], mixed $value = '__fail__with__magic__key__')
     {
         if ($value !== '__fail__with__magic__key__') {

diff --git a/src/Annotations/Field.php b/src/Annotations/Field.php
@@ -41,7 +41,7 @@ class Field extends AbstractRequest
      * @param mixed[] $attributes
      * @param string|string[] $for
      */
-    public function __construct(array $attributes = [], ?string $name = null, ?string $outputType = null, ?string $prefetchMethod = null, string|array|null $for = null, ?string $description = null, ?string $inputType = null)
+    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null, string|null $prefetchMethod = null, string|array|null $for = null, string|null $description = null, string|null $inputType = null)
     {
         parent::__construct($attributes, $name, $outputType);
         $this->prefetchMethod = $prefetchMethod ?? $attributes['prefetchMethod'] ?? null;
@@ -59,25 +59,23 @@ public function __construct(array $attributes = [], ?string $name = null, ?strin
     /**
      * Returns the prefetch method name (the method that will be called to fetch many records at once)
      */
-    public function getPrefetchMethod(): ?string
+    public function getPrefetchMethod(): string|null
     {
         return $this->prefetchMethod;
     }
 
-    /**
-     * @return string[]|null
-     */
-    public function getFor(): ?array
+    /** @return string[]|null */
+    public function getFor(): array|null
     {
         return $this->for;
     }
 
-    public function getDescription(): ?string
+    public function getDescription(): string|null
     {
         return $this->description;
     }
 
-    public function getInputType(): ?string
+    public function getInputType(): string|null
     {
         return $this->inputType;
     }