chore(cs): fix composer.lock for phpstan and php cs fixer, also fixes…

… cs regarding last version of php-cs-fixer (#45)
jolicode · Mar 8, 2024 · f0bb0fe · f0bb0fe
1 parent cae8b2b
commit f0bb0fe
Show file tree

Hide file tree

Showing 18 changed files with 1,940 additions and 35 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 vendor/
-composer.lock
+/composer.lock
 .php-cs-fixer.cache
 .phpunit.result.cache
 tests/cache/

diff --git a/src/AutoMapper.php b/src/AutoMapper.php
@@ -105,7 +105,7 @@ public function hasMapper(string $source, string $target): bool
         return null !== $this->getMetadata($source, $target);
     }
 
-    public function map(array|object $source, string|array|object $target, array $context = []): null|array|object
+    public function map(array|object $source, string|array|object $target, array $context = []): array|object|null
     {
         $sourceType = $targetType = null;
 

diff --git a/src/AutoMapperInterface.php b/src/AutoMapperInterface.php
@@ -20,5 +20,5 @@ interface AutoMapperInterface
      *
      * @return array|object|null The mapped object
      */
-    public function map(array|object $source, string|array|object $target, array $context = []): null|array|object;
+    public function map(array|object $source, string|array|object $target, array $context = []): array|object|null;
 }
diff --git a/src/Extractor/CustomTransformerExtractor.php b/src/Extractor/CustomTransformerExtractor.php
@@ -22,7 +22,7 @@ public function __construct(
     /**
      * @param class-string<CustomTransformerInterface> $customTransformerClass
      */
-    public function extract(string $customTransformerClass, Expr|null $propertyToTransform, Expr $sourceObject): Expr
+    public function extract(string $customTransformerClass, ?Expr $propertyToTransform, Expr $sourceObject): Expr
     {
         if (!$propertyToTransform && is_a($customTransformerClass, CustomModelTransformerInterface::class, allow_string: true)) {
             throw new \LogicException('CustomModelTransformerInterface must use $propertyToTransform.');

diff --git a/src/Extractor/SourceTargetMappingExtractor.php b/src/Extractor/SourceTargetMappingExtractor.php
@@ -64,7 +64,7 @@ public function getPropertiesMapping(MapperGeneratorMetadataInterface $mapperMet
         return $mapping;
     }
 
-    private function toPropertyMapping(MapperGeneratorMetadataInterface $mapperMetadata, string $property, bool $onlyCustomTransformer = false): PropertyMapping|null
+    private function toPropertyMapping(MapperGeneratorMetadataInterface $mapperMetadata, string $property, bool $onlyCustomTransformer = false): ?PropertyMapping
     {
         $targetMutatorConstruct = $this->getWriteMutator($mapperMetadata->getSource(), $mapperMetadata->getTarget(), $property, [
             'enable_constructor_extraction' => true,
@@ -106,7 +106,7 @@ private function toPropertyMapping(MapperGeneratorMetadataInterface $mapperMetad
         );
     }
 
-    private function guessMaxDepth(MapperMetadataInterface $mapperMetadata, string $property): int|null
+    private function guessMaxDepth(MapperMetadataInterface $mapperMetadata, string $property): ?int
     {
         $maxDepthSource = $this->getMaxDepth($mapperMetadata->getSource(), $property);
         $maxDepthTarget = $this->getMaxDepth($mapperMetadata->getTarget(), $property);

diff --git a/src/Generator/CreateTargetStatementsGenerator.php b/src/Generator/CreateTargetStatementsGenerator.php
@@ -29,7 +29,7 @@ public function __construct(
         private DiscriminatorStatementsGenerator $discriminatorStatementsGenerator,
         private CachedReflectionStatementsGenerator $cachedReflectionStatementsGenerator,
         private CustomTransformerExtractor $customTransformerExtractor,
-        Parser|null $parser = null,
+        ?Parser $parser = null,
     ) {
         $this->parser = $parser ?? (new ParserFactory())->create(ParserFactory::PREFER_PHP7);
     }
@@ -62,7 +62,7 @@ public function generate(MapperGeneratorMetadataInterface $mapperMetadata, Varia
         ]);
     }
 
-    private function targetAsArray(MapperGeneratorMetadataInterface $mapperMetadata): Stmt|null
+    private function targetAsArray(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt
     {
         if ($mapperMetadata->getTarget() !== 'array') {
             return null;
@@ -73,7 +73,7 @@ private function targetAsArray(MapperGeneratorMetadataInterface $mapperMetadata)
         return new Stmt\Expression(new Expr\Assign($variableRegistry->getResult(), new Expr\Array_()));
     }
 
-    private function sourceAndTargetAsStdClass(MapperGeneratorMetadataInterface $mapperMetadata): Stmt|null
+    private function sourceAndTargetAsStdClass(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt
     {
         if (\stdClass::class !== $mapperMetadata->getSource() || \stdClass::class !== $mapperMetadata->getTarget()) {
             return null;
@@ -92,7 +92,7 @@ private function sourceAndTargetAsStdClass(MapperGeneratorMetadataInterface $map
         );
     }
 
-    private function targetAsStdClass(MapperGeneratorMetadataInterface $mapperMetadata): Stmt|null
+    private function targetAsStdClass(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt
     {
         if (\stdClass::class === $mapperMetadata->getSource() || \stdClass::class !== $mapperMetadata->getTarget()) {
             return null;
@@ -196,7 +196,7 @@ private function constructorArguments(MapperGeneratorMetadataInterface $mapperMe
      *
      * @return array{Stmt, Arg, int}|null
      */
-    private function constructorArgument(PropertyMapping $propertyMapping): array|null
+    private function constructorArgument(PropertyMapping $propertyMapping): ?array
     {
         if (null === $propertyMapping->writeMutatorConstructor || null === ($parameter = $propertyMapping->writeMutatorConstructor->parameter)) {
             return null;
@@ -264,7 +264,7 @@ private function constructorArgument(PropertyMapping $propertyMapping): array|nu
      *
      * @return array{Stmt, Arg, int}|null
      */
-    private function constructorArgumentWithDefaultValue(MapperGeneratorMetadataInterface $mapperMetadata, array $constructArguments, \ReflectionParameter $constructorParameter): array|null
+    private function constructorArgumentWithDefaultValue(MapperGeneratorMetadataInterface $mapperMetadata, array $constructArguments, \ReflectionParameter $constructorParameter): ?array
     {
         if (\array_key_exists($constructorParameter->getPosition(), $constructArguments) || !$constructorParameter->isDefaultValueAvailable()) {
             return null;
@@ -303,7 +303,7 @@ private function constructorArgumentWithDefaultValue(MapperGeneratorMetadataInte
      * $result = new Foo();
      * ```
      */
-    private function constructorWithoutArgument(MapperGeneratorMetadataInterface $mapperMetadata): Stmt|null
+    private function constructorWithoutArgument(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt
     {
         if (!$mapperMetadata->targetIsAUserDefinedClass()
         ) {

diff --git a/src/Generator/MapperConstructorGenerator.php b/src/Generator/MapperConstructorGenerator.php
@@ -45,7 +45,7 @@ public function getStatements(MapperGeneratorMetadataInterface $mapperMetadata):
      * $this->extractCallbacks['propertyName'] = $extractCallback;
      * ```
      */
-    private function extractCallbackForProperty(PropertyMapping $propertyMapping): Stmt\Expression|null
+    private function extractCallbackForProperty(PropertyMapping $propertyMapping): ?Stmt\Expression
     {
         $mapperMetadata = $propertyMapping->mapperMetadata;
 
@@ -69,7 +69,7 @@ private function extractCallbackForProperty(PropertyMapping $propertyMapping): S
      * $this->hydrateCallback['propertyName'] = $hydrateCallback;
      * ```
      */
-    private function hydrateCallbackForProperty(PropertyMapping $propertyMapping): Stmt\Expression|null
+    private function hydrateCallbackForProperty(PropertyMapping $propertyMapping): ?Stmt\Expression
     {
         $mapperMetadata = $propertyMapping->mapperMetadata;
 

diff --git a/src/Generator/PropertyConditionsGenerator.php b/src/Generator/PropertyConditionsGenerator.php
@@ -18,7 +18,7 @@
  */
 final readonly class PropertyConditionsGenerator
 {
-    public function generate(PropertyMapping $propertyMapping): Expr|null
+    public function generate(PropertyMapping $propertyMapping): ?Expr
     {
         $conditions = [];
 
@@ -60,7 +60,7 @@ public function generate(PropertyMapping $propertyMapping): Expr|null
      * property_exists($source, 'propertyName')
      * ```
      */
-    private function propertyExistsForStdClass(PropertyMapping $propertyMapping): Expr|null
+    private function propertyExistsForStdClass(PropertyMapping $propertyMapping): ?Expr
     {
         $variableRegistry = $propertyMapping->mapperMetadata->getVariableRegistry();
 
@@ -81,7 +81,7 @@ private function propertyExistsForStdClass(PropertyMapping $propertyMapping): Ex
      * array_key_exists('propertyName', $source).
      * ```
      */
-    private function propertyExistsForArray(PropertyMapping $propertyMapping): Expr|null
+    private function propertyExistsForArray(PropertyMapping $propertyMapping): ?Expr
     {
         if (!$propertyMapping->checkExists || 'array' !== $propertyMapping->mapperMetadata->getSource()) {
             return null;
@@ -102,7 +102,7 @@ private function propertyExistsForArray(PropertyMapping $propertyMapping): Expr|
      * MapperContext::isAllowedAttribute($context, 'propertyName', $source).
      * ```
      */
-    private function isAllowedAttribute(PropertyMapping $propertyMapping): Expr|null
+    private function isAllowedAttribute(PropertyMapping $propertyMapping): ?Expr
     {
         $mapperMetadata = $propertyMapping->mapperMetadata;
 
@@ -132,7 +132,7 @@ private function isAllowedAttribute(PropertyMapping $propertyMapping): Expr|null
      * (null !== $context[MapperContext::GROUPS] ?? null && array_intersect($context[MapperContext::GROUPS] ?? [], ['group1', 'group2']))
      * ```
      */
-    private function sourceGroupsCheck(PropertyMapping $propertyMapping): Expr|null
+    private function sourceGroupsCheck(PropertyMapping $propertyMapping): ?Expr
     {
         if (!$propertyMapping->sourceGroups) {
             return null;
@@ -169,7 +169,7 @@ private function sourceGroupsCheck(PropertyMapping $propertyMapping): Expr|null
      * (null !== $context[MapperContext::GROUPS] ?? null && array_intersect($context[MapperContext::GROUPS] ?? [], ['group1', 'group2']))
      * ```
      */
-    private function targetGroupsCheck(PropertyMapping $propertyMapping): Expr|null
+    private function targetGroupsCheck(PropertyMapping $propertyMapping): ?Expr
     {
         if (!$propertyMapping->targetGroups) {
             return null;
@@ -206,7 +206,7 @@ private function targetGroupsCheck(PropertyMapping $propertyMapping): Expr|null
      * ($context[MapperContext::DEPTH] ?? 0) <= $maxDepth
      * ```
      */
-    private function maxDepthCheck(PropertyMapping $propertyMapping): Expr|null
+    private function maxDepthCheck(PropertyMapping $propertyMapping): ?Expr
     {
         if (!$propertyMapping->maxDepth) {
             return null;

diff --git a/src/Generator/Shared/CachedReflectionStatementsGenerator.php b/src/Generator/Shared/CachedReflectionStatementsGenerator.php
@@ -44,7 +44,7 @@
  */
 final readonly class CachedReflectionStatementsGenerator
 {
-    public function createTargetStatement(MapperGeneratorMetadataInterface $mapperMetadata): Stmt|null
+    public function createTargetStatement(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt
     {
         if (!$this->supports($mapperMetadata)) {
             return null;
@@ -64,7 +64,7 @@ public function createTargetStatement(MapperGeneratorMetadataInterface $mapperMe
         )));
     }
 
-    public function mapperConstructorStatement(MapperGeneratorMetadataInterface $mapperMetadata): Stmt\Expression|null
+    public function mapperConstructorStatement(MapperGeneratorMetadataInterface $mapperMetadata): ?Stmt\Expression
     {
         if (!$this->supports($mapperMetadata)) {
             return null;

diff --git a/src/Generator/Shared/ClassDiscriminatorResolver.php b/src/Generator/Shared/ClassDiscriminatorResolver.php
@@ -16,7 +16,7 @@
 final readonly class ClassDiscriminatorResolver
 {
     public function __construct(
-        private ClassDiscriminatorResolverInterface|null $classDiscriminator = null,
+        private ?ClassDiscriminatorResolverInterface $classDiscriminator = null,
     ) {
     }
 
@@ -33,7 +33,7 @@ public function hasClassDiscriminator(MapperGeneratorMetadataInterface $mapperMe
         return true;
     }
 
-    public function propertyMapping(MapperGeneratorMetadataInterface $mapperMetadata): PropertyMapping|null
+    public function propertyMapping(MapperGeneratorMetadataInterface $mapperMetadata): ?PropertyMapping
     {
         $classDiscriminatorMapping = $this->classDiscriminator?->getMappingForClass($mapperMetadata->getTarget());
 

diff --git a/src/MapperGeneratorMetadataInterface.php b/src/MapperGeneratorMetadataInterface.php
@@ -62,7 +62,7 @@ public function canHaveCircularReference(): bool;
      */
     public function shouldMapPrivateProperties(): bool;
 
-    public function getCachedTargetReflectionClass(): \ReflectionClass|null; // @phpstan-ignore-line
+    public function getCachedTargetReflectionClass(): ?\ReflectionClass; // @phpstan-ignore-line
 
     /**
      * Fields to set in the constructor: this allows transforming them before the constructor is called.

diff --git a/src/MapperMetadata.php b/src/MapperMetadata.php
@@ -33,7 +33,7 @@ class MapperMetadata implements MapperGeneratorMetadataInterface
     private array $customMapping = [];
 
     /** @var list<string>|null */
-    private array|null $propertiesInConstructor = null;
+    private ?array $propertiesInConstructor = null;
 
     private VariableRegistry $variableRegistry;
 
@@ -57,7 +57,7 @@ public function __construct(
         $this->variableRegistry = new VariableRegistry();
     }
 
-    public function getCachedTargetReflectionClass(): \ReflectionClass|null
+    public function getCachedTargetReflectionClass(): ?\ReflectionClass
     {
         return $this->targetReflectionClass;
     }

diff --git a/src/Transformer/CustomTransformer/CustomTransformersRegistry.php b/src/Transformer/CustomTransformer/CustomTransformersRegistry.php
@@ -16,7 +16,7 @@ final class CustomTransformersRegistry
     private array $customTransformers = [];
 
     /** @var list<CustomTransformerInterface>|null */
-    private array|null $prioritizedCustomTransformers = null;
+    private ?array $prioritizedCustomTransformers = null;
 
     public function addCustomTransformer(CustomTransformerInterface $customTransformer): void
     {
@@ -31,7 +31,7 @@ public function addCustomTransformer(CustomTransformerInterface $customTransform
      *
      * @return class-string<CustomTransformerInterface>|null
      */
-    public function getCustomTransformerClass(MapperMetadataInterface $mapperMetadata, array $sourceTypes, array $targetTypes, string $propertyName): string|null
+    public function getCustomTransformerClass(MapperMetadataInterface $mapperMetadata, array $sourceTypes, array $targetTypes, string $propertyName): ?string
     {
         foreach ($this->prioritizedCustomTransformers() as $customTransformer) {
             if (

diff --git a/tests/AutoMapperWithCustomTransformerTest.php b/tests/AutoMapperWithCustomTransformerTest.php
@@ -115,7 +115,7 @@ public function testFromSourceToTargetMultipleFieldsTransformation(): void
         self::assertSame('1985-07-01', $birthDateDateTime->date->format('Y-m-d'));
     }
 
-    private static function createUserDTO(string|null $name = null, string|null $city = null): UserDTO
+    private static function createUserDTO(?string $name = null, ?string $city = null): UserDTO
     {
         $user = new UserDTO();
         $user->id = 666;
@@ -128,7 +128,7 @@ private static function createUserDTO(string|null $name = null, string|null $cit
         return $user;
     }
 
-    private static function createUser(string|null $name = null, string|null $city = null): User
+    private static function createUser(?string $name = null, ?string $city = null): User
     {
         $user = new User(666, $name ?? 'name', 666);
         $address = new Address();

diff --git a/tests/Fixtures/ClassWithNullablePropertyInConstructor.php b/tests/Fixtures/ClassWithNullablePropertyInConstructor.php
@@ -6,7 +6,7 @@
 
 readonly class ClassWithNullablePropertyInConstructor
 {
-    public function __construct(public int $foo, public int|null $bar = null)
+    public function __construct(public int $foo, public ?int $bar = null)
     {
     }
 }
diff --git a/tests/Normalizer/AutoMapperNormalizerTest.php b/tests/Normalizer/AutoMapperNormalizerTest.php
@@ -95,7 +95,7 @@ public function testItUsesSerializerContext(): void
     {
         $normalizer = new AutoMapperNormalizer(
             new class() implements AutoMapperInterface, AutoMapperRegistryInterface {
-                public function map(null|array|object $source, string|array|object $target, array $context = []): null|array|object
+                public function map(array|object|null $source, string|array|object $target, array $context = []): array|object|null
                 {
                     return $context;
                 }