Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 95834caa174c · 2024-01-23T16:02:46.000+01:00
* 6.4:
  Fix implicitly-required parameters
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
  [Messenger][AmazonSqs] Allow async-aws/sqs version 2
diff --git a/Builder/ClassBuilder.php b/Builder/ClassBuilder.php
@@ -119,7 +119,7 @@ public function addMethod(string $name, string $body, array $params = []): void
         $this->methods[] = new Method(strtr($body, ['NAME' => $this->camelCase($name)] + $params));
     }
 
-    public function addProperty(string $name, string $classType = null, string $defaultValue = null): Property
+    public function addProperty(string $name, ?string $classType = null, ?string $defaultValue = null): Property
     {
         $property = new Property($name, '_' !== $name[0] ? $this->camelCase($name) : $name);
         if (null !== $classType) {
diff --git a/ConfigCacheInterface.php b/ConfigCacheInterface.php
@@ -41,5 +41,5 @@ public function isFresh(): bool;
      *
      * @throws \RuntimeException When the cache file cannot be written
      */
-    public function write(string $content, array $metadata = null): void;
+    public function write(string $content, ?array $metadata = null): void;
 }
diff --git a/Definition/BaseNode.php b/Definition/BaseNode.php
@@ -46,7 +46,7 @@ abstract class BaseNode implements NodeInterface
     /**
      * @throws \InvalidArgumentException if the name contains a period
      */
-    public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
     {
         if (str_contains($name = (string) $name, $pathSeparator)) {
             throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".');
diff --git a/Definition/Builder/ArrayNodeDefinition.php b/Definition/Builder/ArrayNodeDefinition.php
@@ -37,7 +37,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
     protected NodeBuilder $nodeBuilder;
     protected bool $normalizeKeys = true;
 
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         parent::__construct($name, $parent);
 
@@ -123,7 +123,7 @@ public function addDefaultsIfNotSet(): static
      *
      * @return $this
      */
-    public function addDefaultChildrenIfNoneSet(int|string|array $children = null): static
+    public function addDefaultChildrenIfNoneSet(int|string|array|null $children = null): static
     {
         $this->addDefaultChildren = $children;
 
@@ -166,7 +166,7 @@ public function disallowNewKeysInSubsequentConfigs(): static
      *
      * @return $this
      */
-    public function fixXmlConfig(string $singular, string $plural = null): static
+    public function fixXmlConfig(string $singular, ?string $plural = null): static
     {
         $this->normalization()->remap($singular, $plural);
 
diff --git a/Definition/Builder/BooleanNodeDefinition.php b/Definition/Builder/BooleanNodeDefinition.php
@@ -21,7 +21,7 @@
  */
 class BooleanNodeDefinition extends ScalarNodeDefinition
 {
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         parent::__construct($name, $parent);
 
diff --git a/Definition/Builder/ExprBuilder.php b/Definition/Builder/ExprBuilder.php
@@ -42,7 +42,7 @@ public function __construct(NodeDefinition $node)
      *
      * @return $this
      */
-    public function always(\Closure $then = null): static
+    public function always(?\Closure $then = null): static
     {
         $this->ifPart = static fn () => true;
         $this->allowedTypes = self::TYPE_ANY;
@@ -61,7 +61,7 @@ public function always(\Closure $then = null): static
      *
      * @return $this
      */
-    public function ifTrue(\Closure $closure = null): static
+    public function ifTrue(?\Closure $closure = null): static
     {
         $this->ifPart = $closure ?? static fn ($v) => true === $v;
         $this->allowedTypes = self::TYPE_ANY;
diff --git a/Definition/Builder/NodeDefinition.php b/Definition/Builder/NodeDefinition.php
@@ -38,7 +38,7 @@ abstract class NodeDefinition implements NodeParentInterface
     protected NodeParentInterface|NodeInterface|null $parent;
     protected array $attributes = [];
 
-    public function __construct(?string $name, NodeParentInterface $parent = null)
+    public function __construct(?string $name, ?NodeParentInterface $parent = null)
     {
         $this->parent = $parent;
         $this->name = $name;
diff --git a/Definition/Builder/NormalizationBuilder.php b/Definition/Builder/NormalizationBuilder.php
@@ -37,7 +37,7 @@ public function __construct(NodeDefinition $node)
      *
      * @return $this
      */
-    public function remap(string $key, string $plural = null): static
+    public function remap(string $key, ?string $plural = null): static
     {
         $this->remappings[] = [$key, null === $plural ? $key.'s' : $plural];
 
@@ -49,7 +49,7 @@ public function remap(string $key, string $plural = null): static
      *
      * @return ExprBuilder|$this
      */
-    public function before(\Closure $closure = null): ExprBuilder|static
+    public function before(?\Closure $closure = null): ExprBuilder|static
     {
         if (null !== $closure) {
             $this->before[] = $closure;
diff --git a/Definition/Builder/TreeBuilder.php b/Definition/Builder/TreeBuilder.php
@@ -23,7 +23,7 @@ class TreeBuilder implements NodeParentInterface
     protected ?NodeInterface $tree = null;
     protected ?NodeDefinition $root = null;
 
-    public function __construct(string $name, string $type = 'array', NodeBuilder $builder = null)
+    public function __construct(string $name, string $type = 'array', ?NodeBuilder $builder = null)
     {
         $builder ??= new NodeBuilder();
         $this->root = $builder->node($name, $type)->setParent($this);
diff --git a/Definition/Builder/ValidationBuilder.php b/Definition/Builder/ValidationBuilder.php
@@ -32,7 +32,7 @@ public function __construct(NodeDefinition $node)
      *
      * @return ExprBuilder|$this
      */
-    public function rule(\Closure $closure = null): ExprBuilder|static
+    public function rule(?\Closure $closure = null): ExprBuilder|static
     {
         if (null !== $closure) {
             $this->rules[] = $closure;
diff --git a/Definition/Configurator/DefinitionConfigurator.php b/Definition/Configurator/DefinitionConfigurator.php
@@ -29,7 +29,7 @@ public function __construct(
     ) {
     }
 
-    public function import(string $resource, string $type = null, bool $ignoreErrors = false): void
+    public function import(string $resource, ?string $type = null, bool $ignoreErrors = false): void
     {
         $this->loader->setCurrentDir(\dirname($this->path));
         $this->loader->import($resource, $type, $ignoreErrors, $this->file);
diff --git a/Definition/Dumper/XmlReferenceDumper.php b/Definition/Dumper/XmlReferenceDumper.php
@@ -31,12 +31,12 @@ class XmlReferenceDumper
 {
     private ?string $reference = null;
 
-    public function dump(ConfigurationInterface $configuration, string $namespace = null): string
+    public function dump(ConfigurationInterface $configuration, ?string $namespace = null): string
     {
         return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree(), $namespace);
     }
 
-    public function dumpNode(NodeInterface $node, string $namespace = null): string
+    public function dumpNode(NodeInterface $node, ?string $namespace = null): string
     {
         $this->reference = '';
         $this->writeNode($node, 0, true, $namespace);
@@ -46,7 +46,7 @@ public function dumpNode(NodeInterface $node, string $namespace = null): string
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, string $namespace = null): void
+    private function writeNode(NodeInterface $node, int $depth = 0, bool $root = false, ?string $namespace = null): void
     {
         $rootName = ($root ? 'config' : $node->getName());
         $rootNamespace = ($namespace ?: ($root ? 'http://example.org/schema/dic/'.$node->getName() : null));
diff --git a/Definition/Dumper/YamlReferenceDumper.php b/Definition/Dumper/YamlReferenceDumper.php
@@ -71,7 +71,7 @@ public function dumpNode(NodeInterface $node): string
         return $ref;
     }
 
-    private function writeNode(NodeInterface $node, NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false): void
+    private function writeNode(NodeInterface $node, ?NodeInterface $parentNode = null, int $depth = 0, bool $prototypedArray = false): void
     {
         $comments = [];
         $default = '';
diff --git a/Definition/EnumNode.php b/Definition/EnumNode.php
@@ -22,7 +22,7 @@ class EnumNode extends ScalarNode
 {
     private array $values;
 
-    public function __construct(?string $name, NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, array $values = [], string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
     {
         if (!$values) {
             throw new \InvalidArgumentException('$values must contain at least one element.');
diff --git a/Definition/Loader/DefinitionFileLoader.php b/Definition/Loader/DefinitionFileLoader.php
@@ -34,7 +34,7 @@ public function __construct(
         parent::__construct($locator);
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         // the loader variable is exposed to the included file below
         $loader = $this;
@@ -57,7 +57,7 @@ public function load(mixed $resource, string $type = null): mixed
         return null;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
diff --git a/Definition/NumericNode.php b/Definition/NumericNode.php
@@ -23,7 +23,7 @@ class NumericNode extends ScalarNode
     protected int|float|null $min;
     protected int|float|null $max;
 
-    public function __construct(?string $name, NodeInterface $parent = null, int|float $min = null, int|float $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
+    public function __construct(?string $name, ?NodeInterface $parent = null, int|float|null $min = null, int|float|null $max = null, string $pathSeparator = BaseNode::DEFAULT_PATH_SEPARATOR)
     {
         parent::__construct($name, $parent, $pathSeparator);
         $this->min = $min;
diff --git a/Definition/Processor.php b/Definition/Processor.php
@@ -67,7 +67,7 @@ public function processConfiguration(ConfigurationInterface $configuration, arra
      * @param string      $key    The key to normalize
      * @param string|null $plural The plural form of the key if it is irregular
      */
-    public static function normalizeConfig(array $config, string $key, string $plural = null): array
+    public static function normalizeConfig(array $config, string $key, ?string $plural = null): array
     {
         $plural ??= $key.'s';
 
diff --git a/Exception/FileLoaderImportCircularReferenceException.php b/Exception/FileLoaderImportCircularReferenceException.php
@@ -18,7 +18,7 @@
  */
 class FileLoaderImportCircularReferenceException extends LoaderLoadException
 {
-    public function __construct(array $resources, int $code = 0, \Throwable $previous = null)
+    public function __construct(array $resources, int $code = 0, ?\Throwable $previous = null)
     {
         $message = sprintf('Circular reference detected in "%s" ("%s" > "%s").', $this->varToString($resources[0]), implode('" > "', $resources), $resources[0]);
 
diff --git a/Exception/FileLocatorFileNotFoundException.php b/Exception/FileLocatorFileNotFoundException.php
@@ -20,7 +20,7 @@ class FileLocatorFileNotFoundException extends \InvalidArgumentException
 {
     private array $paths;
 
-    public function __construct(string $message = '', int $code = 0, \Throwable $previous = null, array $paths = [])
+    public function __construct(string $message = '', int $code = 0, ?\Throwable $previous = null, array $paths = [])
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/Exception/LoaderLoadException.php b/Exception/LoaderLoadException.php
@@ -25,7 +25,7 @@ class LoaderLoadException extends \Exception
      * @param \Throwable|null $previous       A previous exception
      * @param string|null     $type           The type of resource
      */
-    public function __construct(mixed $resource, string $sourceResource = null, int $code = 0, \Throwable $previous = null, string $type = null)
+    public function __construct(mixed $resource, ?string $sourceResource = null, int $code = 0, ?\Throwable $previous = null, ?string $type = null)
     {
         if (!\is_string($resource)) {
             try {
diff --git a/FileLocator.php b/FileLocator.php
@@ -30,7 +30,7 @@ public function __construct(string|array $paths = [])
         $this->paths = (array) $paths;
     }
 
-    public function locate(string $name, string $currentPath = null, bool $first = true): string|array
+    public function locate(string $name, ?string $currentPath = null, bool $first = true): string|array
     {
         if ('' === $name) {
             throw new \InvalidArgumentException('An empty file name is not valid to be located.');
diff --git a/FileLocatorInterface.php b/FileLocatorInterface.php
@@ -30,5 +30,5 @@ interface FileLocatorInterface
      * @throws \InvalidArgumentException        If $name is empty
      * @throws FileLocatorFileNotFoundException If a file is not found
      */
-    public function locate(string $name, string $currentPath = null, bool $first = true): string|array;
+    public function locate(string $name, ?string $currentPath = null, bool $first = true): string|array;
 }
diff --git a/Loader/DelegatingLoader.php b/Loader/DelegatingLoader.php
@@ -28,7 +28,7 @@ public function __construct(LoaderResolverInterface $resolver)
         $this->resolver = $resolver;
     }
 
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         if (false === $loader = $this->resolver->resolve($resource, $type)) {
             throw new LoaderLoadException($resource, null, 0, null, $type);
@@ -37,7 +37,7 @@ public function load(mixed $resource, string $type = null): mixed
         return $loader->load($resource, $type);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return false !== $this->resolver->resolve($resource, $type);
     }
diff --git a/Loader/FileLoader.php b/Loader/FileLoader.php
@@ -31,7 +31,7 @@ abstract class FileLoader extends Loader
 
     private ?string $currentDir = null;
 
-    public function __construct(FileLocatorInterface $locator, string $env = null)
+    public function __construct(FileLocatorInterface $locator, ?string $env = null)
     {
         $this->locator = $locator;
         parent::__construct($env);
@@ -66,7 +66,7 @@ public function getLocator(): FileLocatorInterface
      * @throws FileLoaderImportCircularReferenceException
      * @throws FileLocatorFileNotFoundException
      */
-    public function import(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null, string|array $exclude = null): mixed
+    public function import(mixed $resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null, string|array|null $exclude = null): mixed
     {
         if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) {
             $excluded = [];
@@ -97,7 +97,7 @@ public function import(mixed $resource, string $type = null, bool $ignoreErrors
     /**
      * @internal
      */
-    protected function glob(string $pattern, bool $recursive, array|GlobResource &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = []): iterable
+    protected function glob(string $pattern, bool $recursive, array|GlobResource|null &$resource = null, bool $ignoreErrors = false, bool $forExclusion = false, array $excluded = []): iterable
     {
         if (\strlen($pattern) === $i = strcspn($pattern, '*?{[')) {
             $prefix = $pattern;
@@ -129,7 +129,7 @@ protected function glob(string $pattern, bool $recursive, array|GlobResource &$r
         yield from $resource;
     }
 
-    private function doImport(mixed $resource, string $type = null, bool $ignoreErrors = false, string $sourceResource = null): mixed
+    private function doImport(mixed $resource, ?string $type = null, bool $ignoreErrors = false, ?string $sourceResource = null): mixed
     {
         try {
             $loader = $this->resolve($resource, $type);
diff --git a/Loader/GlobFileLoader.php b/Loader/GlobFileLoader.php
@@ -18,12 +18,12 @@
  */
 class GlobFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         return $this->import($resource);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'glob' === $type;
     }
diff --git a/Loader/Loader.php b/Loader/Loader.php
@@ -23,7 +23,7 @@ abstract class Loader implements LoaderInterface
     protected LoaderResolverInterface $resolver;
     protected ?string $env;
 
-    public function __construct(string $env = null)
+    public function __construct(?string $env = null)
     {
         $this->env = $env;
     }
@@ -41,7 +41,7 @@ public function setResolver(LoaderResolverInterface $resolver): void
     /**
      * Imports a resource.
      */
-    public function import(mixed $resource, string $type = null): mixed
+    public function import(mixed $resource, ?string $type = null): mixed
     {
         return $this->resolve($resource, $type)->load($resource, $type);
     }
@@ -51,7 +51,7 @@ public function import(mixed $resource, string $type = null): mixed
      *
      * @throws LoaderLoadException If no loader is found
      */
-    public function resolve(mixed $resource, string $type = null): LoaderInterface
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface
     {
         if ($this->supports($resource, $type)) {
             return $this;
diff --git a/Loader/LoaderInterface.php b/Loader/LoaderInterface.php
@@ -23,14 +23,14 @@ interface LoaderInterface
      *
      * @throws \Exception If something went wrong
      */
-    public function load(mixed $resource, string $type = null): mixed;
+    public function load(mixed $resource, ?string $type = null): mixed;
 
     /**
      * Returns whether this class supports the given resource.
      *
      * @param mixed $resource A resource
      */
-    public function supports(mixed $resource, string $type = null): bool;
+    public function supports(mixed $resource, ?string $type = null): bool;
 
     /**
      * Gets the loader resolver.
diff --git a/Loader/LoaderResolver.php b/Loader/LoaderResolver.php
@@ -36,7 +36,7 @@ public function __construct(array $loaders = [])
         }
     }
 
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface|false
     {
         foreach ($this->loaders as $loader) {
             if ($loader->supports($resource, $type)) {
diff --git a/Loader/LoaderResolverInterface.php b/Loader/LoaderResolverInterface.php
@@ -23,5 +23,5 @@ interface LoaderResolverInterface
      *
      * @param string|null $type The resource type or null if unknown
      */
-    public function resolve(mixed $resource, string $type = null): LoaderInterface|false;
+    public function resolve(mixed $resource, ?string $type = null): LoaderInterface|false;
 }
diff --git a/Resource/ClassExistenceResource.php b/Resource/ClassExistenceResource.php
diff --git a/Resource/DirectoryResource.php b/Resource/DirectoryResource.php
diff --git a/ResourceCheckerConfigCache.php b/ResourceCheckerConfigCache.php
diff --git a/Tests/Builder/GeneratedConfigTest.php b/Tests/Builder/GeneratedConfigTest.php
diff --git a/Tests/Definition/Builder/ExprBuilderTest.php b/Tests/Definition/Builder/ExprBuilderTest.php
diff --git a/Tests/Loader/FileLoaderTest.php b/Tests/Loader/FileLoaderTest.php
diff --git a/Tests/Loader/LoaderTest.php b/Tests/Loader/LoaderTest.php
diff --git a/Tests/Resource/ReflectionClassResourceTest.php b/Tests/Resource/ReflectionClassResourceTest.php
diff --git a/Util/XmlUtils.php b/Util/XmlUtils.php

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ public function addMethod(string $name, string $body, array $params = []): void`
`119`	`119`	`$this->methods[] = new Method(strtr($body, ['NAME' => $this->camelCase($name)] + $params));`
`120`	`120`	`}`
`121`	`121`
`122`		`- public function addProperty(string $name, string $classType = null, string $defaultValue = null): Property`
	`122`	`+ public function addProperty(string $name, ?string $classType = null, ?string $defaultValue = null): Property`
`123`	`123`	`{`
`124`	`124`	`$property = new Property($name, '_' !== $name[0] ? $this->camelCase($name) : $name);`
`125`	`125`	`if (null !== $classType) {`
Original file line number	Diff line number	Diff line change
`@@ -41,5 +41,5 @@ public function isFresh(): bool;`
`41`	`41`	`*`
`42`	`42`	`* @throws \RuntimeException When the cache file cannot be written`
`43`	`43`	`*/`
`44`		`- public function write(string $content, array $metadata = null): void;`
	`44`	`+ public function write(string $content, ?array $metadata = null): void;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ abstract class BaseNode implements NodeInterface`
`46`	`46`	`/**`
`47`	`47`	`* @throws \InvalidArgumentException if the name contains a period`
`48`	`48`	`*/`
`49`		`- public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)`
	`49`	`+ public function __construct(?string $name, ?NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)`
`50`	`50`	`{`
`51`	`51`	`if (str_contains($name = (string) $name, $pathSeparator)) {`
`52`	`52`	`throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".');`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition`
`37`	`37`	`protected NodeBuilder $nodeBuilder;`
`38`	`38`	`protected bool $normalizeKeys = true;`
`39`	`39`
`40`		`- public function __construct(?string $name, NodeParentInterface $parent = null)`
	`40`	`+ public function __construct(?string $name, ?NodeParentInterface $parent = null)`
`41`	`41`	`{`
`42`	`42`	`parent::__construct($name, $parent);`
`43`	`43`
`@@ -123,7 +123,7 @@ public function addDefaultsIfNotSet(): static`
`123`	`123`	`*`
`124`	`124`	`* @return $this`
`125`	`125`	`*/`
`126`		`- public function addDefaultChildrenIfNoneSet(int\|string\|array $children = null): static`
	`126`	`+ public function addDefaultChildrenIfNoneSet(int\|string\|array\|null $children = null): static`
`127`	`127`	`{`
`128`	`128`	`$this->addDefaultChildren = $children;`
`129`	`129`
`@@ -166,7 +166,7 @@ public function disallowNewKeysInSubsequentConfigs(): static`
`166`	`166`	`*`
`167`	`167`	`* @return $this`
`168`	`168`	`*/`
`169`		`- public function fixXmlConfig(string $singular, string $plural = null): static`
	`169`	`+ public function fixXmlConfig(string $singular, ?string $plural = null): static`
`170`	`170`	`{`
`171`	`171`	`$this->normalization()->remap($singular, $plural);`
`172`	`172`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class BooleanNodeDefinition extends ScalarNodeDefinition`
`23`	`23`	`{`
`24`		`- public function __construct(?string $name, NodeParentInterface $parent = null)`
	`24`	`+ public function __construct(?string $name, ?NodeParentInterface $parent = null)`
`25`	`25`	`{`
`26`	`26`	`parent::__construct($name, $parent);`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function __construct(NodeDefinition $node)`
`42`	`42`	`*`
`43`	`43`	`* @return $this`
`44`	`44`	`*/`
`45`		`- public function always(\Closure $then = null): static`
	`45`	`+ public function always(?\Closure $then = null): static`
`46`	`46`	`{`
`47`	`47`	`$this->ifPart = static fn () => true;`
`48`	`48`	`$this->allowedTypes = self::TYPE_ANY;`
`@@ -61,7 +61,7 @@ public function always(\Closure $then = null): static`
`61`	`61`	`*`
`62`	`62`	`* @return $this`
`63`	`63`	`*/`
`64`		`- public function ifTrue(\Closure $closure = null): static`
	`64`	`+ public function ifTrue(?\Closure $closure = null): static`
`65`	`65`	`{`
`66`	`66`	`$this->ifPart = $closure ?? static fn ($v) => true === $v;`
`67`	`67`	`$this->allowedTypes = self::TYPE_ANY;`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ abstract class NodeDefinition implements NodeParentInterface`
`38`	`38`	`protected NodeParentInterface\|NodeInterface\|null $parent;`
`39`	`39`	`protected array $attributes = [];`
`40`	`40`
`41`		`- public function __construct(?string $name, NodeParentInterface $parent = null)`
	`41`	`+ public function __construct(?string $name, ?NodeParentInterface $parent = null)`
`42`	`42`	`{`
`43`	`43`	`$this->parent = $parent;`
`44`	`44`	`$this->name = $name;`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(NodeDefinition $node)`
`37`	`37`	`*`
`38`	`38`	`* @return $this`
`39`	`39`	`*/`
`40`		`- public function remap(string $key, string $plural = null): static`
	`40`	`+ public function remap(string $key, ?string $plural = null): static`
`41`	`41`	`{`
`42`	`42`	`$this->remappings[] = [$key, null === $plural ? $key.'s' : $plural];`
`43`	`43`
`@@ -49,7 +49,7 @@ public function remap(string $key, string $plural = null): static`
`49`	`49`	`*`
`50`	`50`	`* @return ExprBuilder\|$this`
`51`	`51`	`*/`
`52`		`- public function before(\Closure $closure = null): ExprBuilder\|static`
	`52`	`+ public function before(?\Closure $closure = null): ExprBuilder\|static`
`53`	`53`	`{`
`54`	`54`	`if (null !== $closure) {`
`55`	`55`	`$this->before[] = $closure;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class TreeBuilder implements NodeParentInterface`
`23`	`23`	`protected ?NodeInterface $tree = null;`
`24`	`24`	`protected ?NodeDefinition $root = null;`
`25`	`25`
`26`		`- public function __construct(string $name, string $type = 'array', NodeBuilder $builder = null)`
	`26`	`+ public function __construct(string $name, string $type = 'array', ?NodeBuilder $builder = null)`
`27`	`27`	`{`
`28`	`28`	`$builder ??= new NodeBuilder();`
`29`	`29`	`$this->root = $builder->node($name, $type)->setParent($this);`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(NodeDefinition $node)`
`32`	`32`	`*`
`33`	`33`	`* @return ExprBuilder\|$this`
`34`	`34`	`*/`
`35`		`- public function rule(\Closure $closure = null): ExprBuilder\|static`
	`35`	`+ public function rule(?\Closure $closure = null): ExprBuilder\|static`
`36`	`36`	`{`
`37`	`37`	`if (null !== $closure) {`
`38`	`38`	`$this->rules[] = $closure;`