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

PHP 8.4 deprecates implicitly nullable types

Author: mcg-web

.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.*'

.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)

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;

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;

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;

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;

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;

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;

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)

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;