fix: implicity nullable parameter deprecations (#208)

Korbeil · web-flow · commit dbaaa77ffb59 · 2024-11-25T22:53:14.000+01:00
Follows #207
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Fixed
-- [GH#207](https://github.com/jolicode/automapper/pull/207) Fix implicity nullable parameter deprecations
+- [GH#207](https://github.com/jolicode/automapper/pull/207) [GH#208](https://github.com/jolicode/automapper/pull/208) Fix implicity nullable parameter deprecations
 
 ## [9.2.0] - 2024-11-19
 ### Added
diff --git a/src/AutoMapper.php b/src/AutoMapper.php
@@ -125,11 +125,11 @@ public function map(array|object $source, string|array|object $target, array $co
      */
     public static function create(
         Configuration $configuration = new Configuration(),
-        string $cacheDirectory = null,
-        AdvancedNameConverterInterface $nameConverter = null,
+        ?string $cacheDirectory = null,
+        ?AdvancedNameConverterInterface $nameConverter = null,
         array $transformerFactories = [],
         iterable $propertyTransformers = [],
-        ExpressionLanguageProvider $expressionLanguageProvider = null,
+        ?ExpressionLanguageProvider $expressionLanguageProvider = null,
         EventDispatcherInterface $eventDispatcher = new EventDispatcher(),
         iterable $providers = [],
     ): AutoMapperInterface {
diff --git a/src/Generator/PropertyConditionsGenerator.php b/src/Generator/PropertyConditionsGenerator.php
@@ -31,7 +31,7 @@
 
     public function __construct(
         private ExpressionLanguage $expressionLanguage,
-        Parser $parser = null,
+        ?Parser $parser = null,
     ) {
         $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
diff --git a/src/MapperContext.php b/src/MapperContext.php
@@ -171,7 +171,7 @@ public static function shouldHandleCircularReference(array $context, string $ref
      *
      * @param MapperContextArray &$context
      */
-    public static function &handleCircularReference(array &$context, string $reference, mixed $object, ?int $circularReferenceLimit = null, callable $callback = null): mixed
+    public static function &handleCircularReference(array &$context, string $reference, mixed $object, ?int $circularReferenceLimit = null, ?callable $callback = null): mixed
     {
         if (null === $callback) {
             $callback = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? null;
diff --git a/src/Normalizer/AutoMapperNormalizer.php b/src/Normalizer/AutoMapperNormalizer.php
@@ -48,7 +48,7 @@ public function __construct(
      *
      * @return array<string, mixed>
      */
-    public function normalize(mixed $object, string $format = null, array $context = []): ?array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): ?array
     {
         try {
             return $this->autoMapper->map($object, 'array', $this->createAutoMapperContext($format, $context));
@@ -68,7 +68,7 @@ public function normalize(mixed $object, string $format = null, array $context =
      *
      * @return T|null
      */
-    public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed
+    public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed
     {
         try {
             return $this->autoMapper->map($data, $type, $this->createAutoMapperContext($format, $context));
@@ -82,7 +82,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
     /**
      * @param array<string, mixed> $context
      */
-    public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool
+    public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool
     {
         if (!\is_object($data) || $data instanceof \stdClass) {
             return false;
@@ -102,7 +102,7 @@ public function supportsNormalization(mixed $data, string $format = null, array
     /**
      * @param array<string, mixed> $context
      */
-    public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool
     {
         if (!class_exists($type)) {
             return false;
@@ -145,7 +145,7 @@ public function getSupportedTypes(?string $format): array
      *
      * @return MapperContextArray
      */
-    private function createAutoMapperContext(string $format = null, array $serializerContext = []): array
+    private function createAutoMapperContext(?string $format = null, array $serializerContext = []): array
     {
         /** @var MapperContextArray $context */
         $context = [];
diff --git a/src/Symfony/Bundle/CacheWarmup/CacheWarmer.php b/src/Symfony/Bundle/CacheWarmup/CacheWarmer.php
@@ -27,7 +27,7 @@ public function isOptional(): bool
         return true;
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         // load all mappers
         $mapping = clone $this->mapping;
diff --git a/src/Transformer/ExpressionLanguageTransformer.php b/src/Transformer/ExpressionLanguageTransformer.php
@@ -21,7 +21,7 @@
 
     public function __construct(
         private string $expression,
-        Parser $parser = null,
+        ?Parser $parser = null,
     ) {
         $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
diff --git a/src/Transformer/FixedValueTransformer.php b/src/Transformer/FixedValueTransformer.php
@@ -21,7 +21,7 @@
 
     public function __construct(
         private mixed $value,
-        Parser $parser = null,
+        ?Parser $parser = null,
     ) {
         $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
diff --git a/src/Transformer/PropertyTransformer/PropertyTransformer.php b/src/Transformer/PropertyTransformer/PropertyTransformer.php
@@ -29,7 +29,7 @@
     public function __construct(
         private string $propertyTransformerId,
         private array $extraContext = [],
-        Parser $parser = null,
+        ?Parser $parser = null,
     ) {
         $this->parser = $parser ?? (new ParserFactory())->createForHostVersion();
     }
diff --git a/tests/Fixtures/IssueTargetToPopulate/VatEntity.php b/tests/Fixtures/IssueTargetToPopulate/VatEntity.php
@@ -38,7 +38,7 @@ class VatEntity
 
     public function __construct(
         string $countryCode,
-        string $stateCode = null,
+        ?string $stateCode = null,
         float $standardVatRate = 0,
         float $reducedVatRate = 0,
         bool $displayIncVatPrices = false,
diff --git a/tests/Transformer/EvalTransformerTrait.php b/tests/Transformer/EvalTransformerTrait.php
@@ -19,7 +19,7 @@
 
 trait EvalTransformerTrait
 {
-    private function createTransformerFunction(TransformerInterface $transformer, PropertyMetadata $propertyMapping = null): \Closure
+    private function createTransformerFunction(TransformerInterface $transformer, ?PropertyMetadata $propertyMapping = null): \Closure
     {
         if (null === $propertyMapping) {
             $propertyMapping = new PropertyMetadata(
@@ -55,7 +55,7 @@ private function createTransformerFunction(TransformerInterface $transformer, Pr
         return eval($code);
     }
 
-    private function evalTransformer(TransformerInterface $transformer, mixed $input, PropertyMetadata $propertyMapping = null): mixed
+    private function evalTransformer(TransformerInterface $transformer, mixed $input, ?PropertyMetadata $propertyMapping = null): mixed
     {
         $function = $this->createTransformerFunction($transformer, $propertyMapping);
 
diff --git a/tools/php-cs-fixer/.php-cs-fixer.php b/tools/php-cs-fixer/.php-cs-fixer.php
@@ -19,7 +19,6 @@
         'no_superfluous_phpdoc_tags' => [
             'remove_inheritdoc' => false,
         ],
-        'nullable_type_declaration_for_default_null_value' => false,
         'declare_strict_types' => true,
         'no_trailing_comma_in_singleline' => false,
         'function_declaration' => ['trailing_comma_single_line' => true],

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`
`32`	`32`	`public function __construct(`
`33`	`33`	`private ExpressionLanguage $expressionLanguage,`
`34`		`- Parser $parser = null,`
	`34`	`+ ?Parser $parser = null,`
`35`	`35`	`) {`
`36`	`36`	`$this->parser = $parser ?? (new ParserFactory())->createForHostVersion();`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ public static function shouldHandleCircularReference(array $context, string $ref`
`171`	`171`	`*`
`172`	`172`	`* @param MapperContextArray &$context`
`173`	`173`	`*/`
`174`		`- public static function &handleCircularReference(array &$context, string $reference, mixed $object, ?int $circularReferenceLimit = null, callable $callback = null): mixed`
	`174`	`+ public static function &handleCircularReference(array &$context, string $reference, mixed $object, ?int $circularReferenceLimit = null, ?callable $callback = null): mixed`
`175`	`175`	`{`
`176`	`176`	`if (null === $callback) {`
`177`	`177`	`$callback = $context[self::CIRCULAR_REFERENCE_HANDLER] ?? null;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function __construct(`
`48`	`48`	`*`
`49`	`49`	`* @return array<string, mixed>`
`50`	`50`	`*/`
`51`		`- public function normalize(mixed $object, string $format = null, array $context = []): ?array`
	`51`	`+ public function normalize(mixed $object, ?string $format = null, array $context = []): ?array`
`52`	`52`	`{`
`53`	`53`	`try {`
`54`	`54`	`return $this->autoMapper->map($object, 'array', $this->createAutoMapperContext($format, $context));`
`@@ -68,7 +68,7 @@ public function normalize(mixed $object, string $format = null, array $context =`
`68`	`68`	`*`
`69`	`69`	`* @return T\|null`
`70`	`70`	`*/`
`71`		`- public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed`
	`71`	`+ public function denormalize(mixed $data, string $type, ?string $format = null, array $context = []): mixed`
`72`	`72`	`{`
`73`	`73`	`try {`
`74`	`74`	`return $this->autoMapper->map($data, $type, $this->createAutoMapperContext($format, $context));`
`@@ -82,7 +82,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar`
`82`	`82`	`/**`
`83`	`83`	`* @param array<string, mixed> $context`
`84`	`84`	`*/`
`85`		`- public function supportsNormalization(mixed $data, string $format = null, array $context = []): bool`
	`85`	`+ public function supportsNormalization(mixed $data, ?string $format = null, array $context = []): bool`
`86`	`86`	`{`
`87`	`87`	`if (!\is_object($data) \|\| $data instanceof \stdClass) {`
`88`	`88`	`return false;`
`@@ -102,7 +102,7 @@ public function supportsNormalization(mixed $data, string $format = null, array`
`102`	`102`	`/**`
`103`	`103`	`* @param array<string, mixed> $context`
`104`	`104`	`*/`
`105`		`- public function supportsDenormalization(mixed $data, string $type, string $format = null, array $context = []): bool`
	`105`	`+ public function supportsDenormalization(mixed $data, string $type, ?string $format = null, array $context = []): bool`
`106`	`106`	`{`
`107`	`107`	`if (!class_exists($type)) {`
`108`	`108`	`return false;`
`@@ -145,7 +145,7 @@ public function getSupportedTypes(?string $format): array`
`145`	`145`	`*`
`146`	`146`	`* @return MapperContextArray`
`147`	`147`	`*/`
`148`		`- private function createAutoMapperContext(string $format = null, array $serializerContext = []): array`
	`148`	`+ private function createAutoMapperContext(?string $format = null, array $serializerContext = []): array`
`149`	`149`	`{`
`150`	`150`	`/** @var MapperContextArray $context */`
`151`	`151`	`$context = [];`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function isOptional(): bool`
`27`	`27`	`return true;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function warmUp(string $cacheDir, string $buildDir = null): array`
	`30`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`31`	`31`	`{`
`32`	`32`	`// load all mappers`
`33`	`33`	`$mapping = clone $this->mapping;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`public function __construct(`
`23`	`23`	`private string $expression,`
`24`		`- Parser $parser = null,`
	`24`	`+ ?Parser $parser = null,`
`25`	`25`	`) {`
`26`	`26`	`$this->parser = $parser ?? (new ParserFactory())->createForHostVersion();`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`public function __construct(`
`30`	`30`	`private string $propertyTransformerId,`
`31`	`31`	`private array $extraContext = [],`
`32`		`- Parser $parser = null,`
	`32`	`+ ?Parser $parser = null,`
`33`	`33`	`) {`
`34`	`34`	`$this->parser = $parser ?? (new ParserFactory())->createForHostVersion();`
`35`	`35`	`}`