Merge pull request #1198 from benji07/fix-php84-nullable-deprecation

PHP 8.4 deprecates implicitly nullable types
overblog · Dec 19, 2024 · 31f217f · 31f217f
2 parents a8c5661 + c7b4c24
commit 31f217f
Show file tree

Hide file tree

Showing 59 changed files with 88 additions and 84 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ jobs:
           - '8.1'
           - '8.2'
           - '8.3'
+          - '8.4'
         symfony-version:
           - '5.4.*'
           - '6.0.*'
@@ -45,6 +46,8 @@ jobs:
             symfony-version: '7.0.*'
           - php-version: '8.1'
             symfony-version: '7.1.*'
+          - php-version: '8.4'
+            dependencies: 'lowest'
         include:
           - php-version: '8.0'
             symfony-version: '5.4.*'

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -35,6 +35,7 @@
             'single_line_comment_style' => false,
             'phpdoc_no_alias_tag' => ['replacements' => ['type' => 'var']],
             'no_mixed_echo_print' => ['use' => 'echo'],
+            'nullable_type_declaration_for_default_null_value' => true,
         ]
     )
     ->setFinder($finder)

diff --git a/src/Annotation/Builder.php b/src/Annotation/Builder.php
@@ -20,7 +20,7 @@ abstract class Builder extends Annotation
     /**
      * Builder name.
      */
-    public string $name;
+    public ?string $name;
 
     /**
      * The builder config.
@@ -31,7 +31,7 @@ abstract class Builder extends Annotation
      * @param string|null $name   The name of the builder
      * @param array       $config The builder configuration array
      */
-    public function __construct(string $name = null, array $config = [])
+    public function __construct(?string $name = null, array $config = [])
     {
         $this->name = $name;
         $this->config = $config;

diff --git a/src/Annotation/Input.php b/src/Annotation/Input.php
@@ -27,7 +27,7 @@ final class Input extends Annotation
      */
     public bool $isRelay = false;
 
-    public function __construct(string $name = null, bool $isRelay = false)
+    public function __construct(?string $name = null, bool $isRelay = false)
     {
         $this->name = $name;
         $this->isRelay = $isRelay;

diff --git a/src/Annotation/Provider.php b/src/Annotation/Provider.php
@@ -37,11 +37,11 @@ final class Provider extends Annotation
     public ?array $targetMutationTypes;
 
     /**
-     * @param string               $prefix              A prefix to apply to the name of fields generated by this provider
+     * @param string|null          $prefix              A prefix to apply to the name of fields generated by this provider
      * @param string|string[]|null $targetQueryTypes    A list of GraphQL types to add the resolver queries to
      * @param string|string[]|null $targetMutationTypes A list of GraphQL types to add the resolver mutations to
      */
-    public function __construct(string $prefix = null, $targetQueryTypes = null, $targetMutationTypes = null)
+    public function __construct(?string $prefix = null, $targetQueryTypes = null, $targetMutationTypes = null)
     {
         $this->prefix = $prefix;
         $this->targetQueryTypes = is_string($targetQueryTypes) ? [$targetQueryTypes] : $targetQueryTypes;

diff --git a/src/Annotation/Relay/Connection.php b/src/Annotation/Relay/Connection.php
@@ -29,7 +29,7 @@ final class Connection extends Type
      */
     public ?string $node;
 
-    public function __construct(string $edge = null, string $node = null)
+    public function __construct(?string $edge = null, ?string $node = null)
     {
         $this->edge = $edge;
         $this->node = $node;

diff --git a/src/Annotation/Scalar.php b/src/Annotation/Scalar.php
@@ -25,7 +25,7 @@ final class Scalar extends Annotation
      * @param string|null $name       The GraphQL name of the Scalar
      * @param string|null $scalarType Expression to reuse an other scalar type
      */
-    public function __construct(string $name = null, string $scalarType = null)
+    public function __construct(?string $name = null, ?string $scalarType = null)
     {
         $this->name = $name;
         $this->scalarType = $scalarType;

diff --git a/src/Annotation/Type.php b/src/Annotation/Type.php
@@ -52,11 +52,11 @@ class Type extends Annotation
      * @param string|null          $isTypeOf     An expression to resolve if the field is of given type
      */
     public function __construct(
-        string $name = null,
+        ?string $name = null,
         array $interfaces = [],
         bool $isRelay = false,
-        string $resolveField = null,
-        string $isTypeOf = null
+        ?string $resolveField = null,
+        ?string $isTypeOf = null
     ) {
         $this->name = $name;
         $this->interfaces = $interfaces;

diff --git a/src/Annotation/TypeInterface.php b/src/Annotation/TypeInterface.php
@@ -28,7 +28,7 @@ final class TypeInterface extends Annotation
     public ?string $name;
 
     /**
-     * @param string        $resolveType The express resolve type
+     * @param string|null   $resolveType The express resolve type
      * @param string|null   $name        The GraphQL name of the interface
      */
     public function __construct(?string $resolveType = null, ?string $name = null)

diff --git a/src/Annotation/Union.php b/src/Annotation/Union.php
@@ -37,7 +37,7 @@ final class Union extends Annotation
      * @param string[]    $types       List of types included in the union
      * @param string|null $resolveType The resolve type expression
      */
-    public function __construct(string $name = null, array $types = [], ?string $resolveType = null)
+    public function __construct(?string $name = null, array $types = [], ?string $resolveType = null)
     {
         $this->name = $name;
         $this->types = $types;

diff --git a/src/CacheWarmer/CompileCacheWarmer.php b/src/CacheWarmer/CompileCacheWarmer.php
@@ -29,7 +29,7 @@ public function isOptional(): bool
     /**
      * @return string[]
      */
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         if ($this->compiled) {
             // use warm up cache dir if type generator cache dir not already explicitly declared

diff --git a/src/Config/Processor/InheritanceProcessor.php b/src/Config/Processor/InheritanceProcessor.php
@@ -124,7 +124,7 @@ private static function flattenInherits(
         string $name,
         array $configs,
         array $allowedTypes,
-        string $child = null,
+        ?string $child = null,
         array $typesTreated = []
     ): array {
         self::checkTypeExists($name, $configs, $child);

diff --git a/src/Controller/GraphController.php b/src/Controller/GraphController.php
@@ -38,15 +38,15 @@ public function __construct(
     /**
      * @return JsonResponse|Response
      */
-    public function endpointAction(Request $request, string $schemaName = null)
+    public function endpointAction(Request $request, ?string $schemaName = null)
     {
         return $this->createResponse($request, $schemaName, false);
     }
 
     /**
      * @return JsonResponse|Response
      */
-    public function batchEndpointAction(Request $request, string $schemaName = null)
+    public function batchEndpointAction(Request $request, ?string $schemaName = null)
     {
         return $this->createResponse($request, $schemaName, true);
     }
@@ -92,7 +92,7 @@ private function processQuery(Request $request, ?string $schemaName, bool $batch
         return $payload;
     }
 
-    private function processBatchQuery(Request $request, string $schemaName = null): array
+    private function processBatchQuery(Request $request, ?string $schemaName = null): array
     {
         $queries = $this->batchParser->parse($request);
         $payloads = [];
@@ -110,7 +110,7 @@ private function processBatchQuery(Request $request, string $schemaName = null):
         return $payloads;
     }
 
-    private function processNormalQuery(Request $request, string $schemaName = null): array
+    private function processNormalQuery(Request $request, ?string $schemaName = null): array
     {
         $params = $this->requestParser->parse($request);
 

diff --git a/src/DataCollector/GraphQLCollector.php b/src/DataCollector/GraphQLCollector.php
@@ -25,7 +25,7 @@ final class GraphQLCollector extends DataCollector
      */
     protected array $batches = [];
 
-    public function collect(Request $request, Response $response, Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?Throwable $exception = null): void
     {
         $error = false;
         $count = 0;

diff --git a/src/Definition/Argument.php b/src/Definition/Argument.php
@@ -11,12 +11,12 @@ final class Argument implements ArgumentInterface
 {
     private array $rawArguments = [];
 
-    public function __construct(array $rawArguments = null)
+    public function __construct(?array $rawArguments = null)
     {
         $this->exchangeArray($rawArguments);
     }
 
-    public function exchangeArray(array $array = null): array
+    public function exchangeArray(?array $array = null): array
     {
         $old = $this->rawArguments;
         $this->rawArguments = $array ?? [];

diff --git a/src/Definition/Builder/SchemaBuilder.php b/src/Definition/Builder/SchemaBuilder.php
@@ -23,7 +23,7 @@ public function __construct(TypeResolver $typeResolver, bool $enableValidation =
         $this->enableValidation = $enableValidation;
     }
 
-    public function getBuilder(string $name, ?string $queryAlias, string $mutationAlias = null, string $subscriptionAlias = null, array $types = []): Closure
+    public function getBuilder(string $name, ?string $queryAlias, ?string $mutationAlias = null, ?string $subscriptionAlias = null, array $types = []): Closure
     {
         return function () use ($name, $queryAlias, $mutationAlias, $subscriptionAlias, $types): ExtensibleSchema {
             static $schema = null;
@@ -38,7 +38,7 @@ public function getBuilder(string $name, ?string $queryAlias, string $mutationAl
     /**
      * @param string[] $types
      */
-    public function create(string $name, ?string $queryAlias, string $mutationAlias = null, string $subscriptionAlias = null, array $types = []): ExtensibleSchema
+    public function create(string $name, ?string $queryAlias, ?string $mutationAlias = null, ?string $subscriptionAlias = null, array $types = []): ExtensibleSchema
     {
         $this->typeResolver->setCurrentSchemaName($name);
         $query = $this->typeResolver->resolve($queryAlias);

diff --git a/src/Definition/Type/CustomScalarType.php b/src/Definition/Type/CustomScalarType.php
@@ -63,7 +63,7 @@ public function parseValue($value): mixed
     /**
      * {@inheritdoc}
      */
-    public function parseLiteral(/* GraphQL\Language\AST\ValueNode */ $valueNode, array $variables = null): mixed
+    public function parseLiteral(/* GraphQL\Language\AST\ValueNode */ $valueNode, ?array $variables = null): mixed
     {
         return $this->call('parseLiteral', $valueNode);
     }

diff --git a/src/Definition/Type/PhpEnumType.php b/src/Definition/Type/PhpEnumType.php
@@ -93,7 +93,7 @@ public function parseValue($value): mixed
         return parent::parseValue($value);
     }
 
-    public function parseLiteral(Node $valueNode, array $variables = null): mixed
+    public function parseLiteral(Node $valueNode, ?array $variables = null): mixed
     {
         if ($this->enumClass) {
             if (!$valueNode instanceof EnumValueNode) {

diff --git a/src/DependencyInjection/Compiler/ConfigParserPass.php b/src/DependencyInjection/Compiler/ConfigParserPass.php
@@ -240,7 +240,7 @@ private function mappingFromBundles(ContainerBuilder $container): array
         return $typesMappings;
     }
 
-    private function detectFilesByTypes(ContainerBuilder $container, string $path, string $suffix, array $types = null): array
+    private function detectFilesByTypes(ContainerBuilder $container, string $path, string $suffix, ?array $types = null): array
     {
         // add the closest existing directory as a resource
         $resource = $path;

diff --git a/src/Error/InvalidArgumentError.php b/src/Error/InvalidArgumentError.php
@@ -18,7 +18,7 @@ public function __construct(
         ConstraintViolationListInterface $errors,
         string $message = '',
         int $code = 0,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $this->name = $name;
         $this->errors = $errors;

diff --git a/src/Error/InvalidArgumentsError.php b/src/Error/InvalidArgumentsError.php
@@ -16,7 +16,7 @@ public function __construct(
         array $errors,
         string $message = '',
         int $code = 0,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $this->errors = $errors;
         parent::__construct($message, $code, $previous);

diff --git a/src/Error/UserErrors.php b/src/Error/UserErrors.php
@@ -22,7 +22,7 @@ public function __construct(
         array $errors,
         string $message = '',
         int $code = 0,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $this->setErrors($errors);
         parent::__construct($message, $code, $previous);

diff --git a/src/Event/ExecutorArgumentsEvent.php b/src/Event/ExecutorArgumentsEvent.php
@@ -30,8 +30,8 @@ public static function create(
         string $requestString,
         ArrayObject $contextValue,
         mixed $rootValue = null,
-        array $variableValue = null,
-        string $operationName = null
+        ?array $variableValue = null,
+        ?string $operationName = null
     ): self {
         $instance = new self();
         $instance->setSchemaName($schemaName);

diff --git a/src/EventListener/ErrorLoggerListener.php b/src/EventListener/ErrorLoggerListener.php
@@ -20,7 +20,7 @@ final class ErrorLoggerListener
 
     private LoggerInterface $logger;
 
-    public function __construct(LoggerInterface $logger = null)
+    public function __construct(?LoggerInterface $logger = null)
     {
         $this->logger = $logger ?? new NullLogger();
     }

diff --git a/src/Executor/Executor.php b/src/Executor/Executor.php
@@ -28,8 +28,8 @@ public function execute(
         $contextValue = null,
         $variableValues = null,
         $operationName = null,
-        callable $fieldResolver = null,
-        array $validationRules = null
+        ?callable $fieldResolver = null,
+        ?array $validationRules = null
     ): ExecutionResult {
         if (!method_exists($promiseAdapter, 'wait')) {
             throw new RuntimeException(

diff --git a/src/Executor/ExecutorInterface.php b/src/Executor/ExecutorInterface.php
@@ -25,7 +25,7 @@ public function execute(
         $contextValue = null,
         $variableValues = null,
         $operationName = null,
-        callable $fieldResolver = null,
-        array $validationRules = null
+        ?callable $fieldResolver = null,
+        ?array $validationRules = null
     ): ExecutionResult;
 }
diff --git a/src/Executor/Promise/Adapter/ReactPromiseAdapter.php b/src/Executor/Promise/Adapter/ReactPromiseAdapter.php
@@ -42,7 +42,7 @@ public function convertThenable($thenable): Promise
      *
      * @throws Exception
      */
-    public function wait(Promise $promise, callable $onProgress = null): ?ExecutionResult
+    public function wait(Promise $promise, ?callable $onProgress = null): ?ExecutionResult
     {
         if (!$this->isThenable($promise)) {
             throw new InvalidArgumentException(sprintf('The "%s" method must be call with compatible a Promise.', __METHOD__));

diff --git a/src/ExpressionLanguage/Exception/EvaluatorIsNotAllowedException.php b/src/ExpressionLanguage/Exception/EvaluatorIsNotAllowedException.php
@@ -9,7 +9,7 @@
 
 final class EvaluatorIsNotAllowedException extends Exception
 {
-    public function __construct(string $expressionFunctionName, int $code = 0, Throwable $previous = null)
+    public function __construct(string $expressionFunctionName, int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct(
             "The expression function '$expressionFunctionName' cannot be used by it's evaluator.",

diff --git a/src/ExpressionLanguage/ExpressionFunction.php b/src/ExpressionLanguage/ExpressionFunction.php
@@ -12,7 +12,7 @@ class ExpressionFunction extends BaseExpressionFunction
 {
     protected string $gqlServices = '$'.TypeGenerator::GRAPHQL_SERVICES;
 
-    public function __construct(string $name, callable $compiler, callable $evaluator = null)
+    public function __construct(string $name, callable $compiler, ?callable $evaluator = null)
     {
         if (null === $evaluator) {
             $evaluator = new EvaluatorIsNotAllowedException($name);

diff --git a/src/ExpressionLanguage/ExpressionFunction/GraphQL/Relay/GlobalID.php b/src/ExpressionLanguage/ExpressionFunction/GraphQL/Relay/GlobalID.php
@@ -15,7 +15,7 @@ public function __construct()
     {
         parent::__construct(
             'globalId',
-            function (string $id, string $typeName = null): string {
+            function (string $id, ?string $typeName = null): string {
                 $typeName = $this->isTypeNameEmpty($typeName) ? '$info->parentType->name' : $typeName;
 
                 return sprintf('\%s::toGlobalId(%s, %s)', GlobalIdHelper::class, $typeName, $id);

diff --git a/src/Generator/TypeBuilder.php b/src/Generator/TypeBuilder.php
@@ -449,7 +449,7 @@ private function buildScalarCallback($callback, string $fieldName)
      *
      * @throws GeneratorException
      */
-    private function buildResolve($resolve, array $groups = null): GeneratorInterface
+    private function buildResolve($resolve, ?array $groups = null): GeneratorInterface
     {
         if (is_callable($resolve) && is_array($resolve)) {
             return Collection::numeric($resolve);

diff --git a/src/Generator/TypeGeneratorOptions.php b/src/Generator/TypeGeneratorOptions.php
@@ -36,8 +36,8 @@ public function __construct(
         string $namespace,
         ?string $cacheDir,
         bool $useClassMap = true,
-        string $cacheBaseDir = null,
-        int $cacheDirMask = null
+        ?string $cacheBaseDir = null,
+        ?int $cacheDirMask = null
     ) {
         $this->namespace = $namespace;
         $this->cacheDir = $cacheDir;

diff --git a/src/Relay/Connection/ConnectionBuilder.php b/src/Relay/Connection/ConnectionBuilder.php
@@ -59,7 +59,7 @@ final class ConnectionBuilder
      * @phpstan-param ConnectionFactoryFunc|null $connectionCallback
      * @phpstan-param EdgeFactoryFunc|null $edgeCallback
      */
-    public function __construct(CursorEncoderInterface $cursorEncoder = null, callable $connectionCallback = null, callable $edgeCallback = null)
+    public function __construct(?CursorEncoderInterface $cursorEncoder = null, ?callable $connectionCallback = null, ?callable $edgeCallback = null)
     {
         $this->cursorEncoder = $cursorEncoder ?? new Base64CursorEncoder();
         $this->connectionCallback = $connectionCallback ?? static fn (array $edges, PageInfoInterface $pageInfo): Connection => new Connection($edges, $pageInfo);

diff --git a/src/Relay/Connection/Output/Connection.php b/src/Relay/Connection/Output/Connection.php
@@ -31,7 +31,7 @@ class Connection implements ConnectionInterface
     /**
      * @param EdgeInterface<T>[] $edges
      */
-    public function __construct(array $edges = [], PageInfoInterface $pageInfo = null)
+    public function __construct(array $edges = [], ?PageInfoInterface $pageInfo = null)
     {
         $this->edges = $edges;
         $this->pageInfo = $pageInfo;

diff --git a/src/Relay/Connection/Output/Edge.php b/src/Relay/Connection/Output/Edge.php
@@ -25,7 +25,7 @@ class Edge implements EdgeInterface
      *
      * @phpstan-param T|null $node
      */
-    public function __construct(string $cursor = null, $node = null)
+    public function __construct(?string $cursor = null, $node = null)
     {
         $this->cursor = $cursor;
         $this->node = $node;

diff --git a/src/Relay/Connection/Output/PageInfo.php b/src/Relay/Connection/Output/PageInfo.php
@@ -15,7 +15,7 @@ final class PageInfo implements PageInfoInterface
     protected ?bool $hasPreviousPage;
     protected ?bool $hasNextPage;
 
-    public function __construct(string $startCursor = null, string $endCursor = null, bool $hasPreviousPage = null, bool $hasNextPage = null)
+    public function __construct(?string $startCursor = null, ?string $endCursor = null, ?bool $hasPreviousPage = null, ?bool $hasNextPage = null)
     {
         $this->startCursor = $startCursor;
         $this->endCursor = $endCursor;