refactor: Code style

autaut03 · autaut03 · commit ee52703d4b85 · 2025-07-07T15:13:34.000+02:00
diff --git a/src/Serializer.php b/src/Serializer.php
@@ -26,5 +26,5 @@ public function reflector(): Reflector;
 	 *
 	 * @return A
 	 */
-	public function adapter(string $typeAdapterType, Type|string $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter;
+	public function adapter(string $typeAdapterType, Type|string $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter;
 }
diff --git a/src/Serializer/Registry/Cache/MemoizingTypeAdapterRegistry.php b/src/Serializer/Registry/Cache/MemoizingTypeAdapterRegistry.php
@@ -29,7 +29,7 @@ public function __construct(
 	 *
 	 * @return TypeAdapterType
 	 */
-	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter
+	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter
 	{
 		$this->resolved[$typeAdapterType][(string) $type] ??= new WeakMap();
 
diff --git a/src/Serializer/Registry/Factory/FactoryTypeAdapterRegistry.php b/src/Serializer/Registry/Factory/FactoryTypeAdapterRegistry.php
@@ -30,7 +30,7 @@ public function __construct(
 	 *
 	 * @return TypeAdapterType
 	 */
-	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter
+	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter
 	{
 		if ($skipPast) {
 			$skipPastIndex = array_search($skipPast, $this->factories, true);
diff --git a/src/Serializer/Registry/TypeAdapterNotFoundException.php b/src/Serializer/Registry/TypeAdapterNotFoundException.php
@@ -14,7 +14,7 @@ final class TypeAdapterNotFoundException extends RuntimeException
 	/**
 	 * @param TypeAdapterFactory<TypeAdapter<mixed, mixed>>|null $skipPast
 	 */
-	public function __construct(string $typeAdapterType, Type $type, Attributes $attributes, ?TypeAdapterFactory $skipPast, Throwable $previous = null)
+	public function __construct(string $typeAdapterType, Type $type, Attributes $attributes, ?TypeAdapterFactory $skipPast, ?Throwable $previous = null)
 	{
 		$message = "A matching type adapter of type '{$typeAdapterType}' for type '{$type}' " .
 			($attributes->has() ? 'with attributes ' . $attributes : '') .
diff --git a/src/Serializer/Registry/TypeAdapterRegistry.php b/src/Serializer/Registry/TypeAdapterRegistry.php
@@ -19,5 +19,5 @@ interface TypeAdapterRegistry
 	 *
 	 * @return TypeAdapterType
 	 */
-	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter;
+	public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter;
 }
diff --git a/src/Serializer/TypeAdapterRegistrySerializer.php b/src/Serializer/TypeAdapterRegistrySerializer.php
@@ -19,7 +19,7 @@ public function __construct(
 		private readonly Reflector $reflector,
 	) {}
 
-	public function adapter(string $typeAdapterType, Type|string $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter
+	public function adapter(string $typeAdapterType, Type|string $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter
 	{
 		if (is_string($type)) {
 			$type = new NamedType($type);
diff --git a/src/TypeAdapter/Exception/UnexpectedEnumValueException.php b/src/TypeAdapter/Exception/UnexpectedEnumValueException.php
@@ -13,7 +13,7 @@ class UnexpectedEnumValueException extends RuntimeException implements Unexpecte
 	public function __construct(
 		public readonly string|int $value,
 		public readonly array $expectedValues,
-		Throwable $previous = null
+		?Throwable $previous = null
 	) {
 		parent::__construct(
 			'Expected one of [' .
diff --git a/src/TypeAdapter/Exception/UnexpectedPolymorphicTypeException.php b/src/TypeAdapter/Exception/UnexpectedPolymorphicTypeException.php
@@ -14,7 +14,7 @@ public function __construct(
 		public readonly string $typeNameField,
 		public readonly string $value,
 		public readonly array $expectedTypeNames,
-		Throwable $previous = null
+		?Throwable $previous = null
 	) {
 		parent::__construct(
 			"Only the following polymorphic types for field '{$this->typeNameField}' are allowed: [" .
diff --git a/src/TypeAdapter/Exception/UnexpectedTypeException.php b/src/TypeAdapter/Exception/UnexpectedTypeException.php
@@ -11,7 +11,7 @@ class UnexpectedTypeException extends RuntimeException
 	public function __construct(
 		public readonly mixed $value,
 		public readonly Type $expectedType,
-		Throwable $previous = null
+		?Throwable $previous = null
 	) {
 		parent::__construct(
 			"Expected value of type '{$expectedType}', but got '" .
diff --git a/src/TypeAdapter/Exception/UnexpectedValueException.php b/src/TypeAdapter/Exception/UnexpectedValueException.php
@@ -4,6 +4,4 @@
 
 use Throwable;
 
-interface UnexpectedValueException extends Throwable
-{
-}
+interface UnexpectedValueException extends Throwable {}
diff --git a/src/TypeAdapter/Json/JsonTypeAdapter.php b/src/TypeAdapter/Json/JsonTypeAdapter.php
@@ -9,6 +9,4 @@
  *
  * @extends TypeAdapter<T, string>
  */
-interface JsonTypeAdapter extends TypeAdapter
-{
-}
+interface JsonTypeAdapter extends TypeAdapter {}
diff --git a/src/TypeAdapter/Primitive/BuiltIn/ArrayMapper.php b/src/TypeAdapter/Primitive/BuiltIn/ArrayMapper.php
@@ -18,10 +18,10 @@ final class ArrayMapper
 	/**
 	 * @template T
 	 *
-	 * @param array<T>  $value
+	 * @param list<T>   $value
 	 * @param NamedType $type
 	 *
-	 * @return array<mixed>
+	 * @return list<mixed>
 	 */
 	#[MapTo(PrimitiveTypeAdapter::class)]
 	public function to(array $value, Type $type, Serializer $serializer): array|stdClass
@@ -49,10 +49,10 @@ public function to(array $value, Type $type, Serializer $serializer): array|stdC
 	}
 
 	/**
-	 * @param array<mixed> $value
-	 * @param NamedType    $type
+	 * @param list<mixed> $value
+	 * @param NamedType   $type
 	 *
-	 * @return array<mixed>
+	 * @return list<mixed>
 	 */
 	#[MapFrom(PrimitiveTypeAdapter::class)]
 	public function from(array $value, Type $type, Serializer $serializer): array
diff --git a/src/TypeAdapter/Primitive/ClassProperties/ClassPropertiesPrimitiveTypeAdapter.php b/src/TypeAdapter/Primitive/ClassProperties/ClassPropertiesPrimitiveTypeAdapter.php
@@ -19,7 +19,7 @@
 final class ClassPropertiesPrimitiveTypeAdapter implements PrimitiveTypeAdapter
 {
 	/**
-	 * @param class-string<T>                        $className
+	 * @param class-string<T>             $className
 	 * @param list<BoundClassProperty<T>> $properties
 	 */
 	public function __construct(
diff --git a/src/TypeAdapter/Primitive/ClassProperties/MissingValueException.php b/src/TypeAdapter/Primitive/ClassProperties/MissingValueException.php
@@ -7,7 +7,7 @@
 
 class MissingValueException extends RuntimeException
 {
-	public function __construct(Throwable $previous = null)
+	public function __construct(?Throwable $previous = null)
 	{
 		parent::__construct('Missing value.', 0, $previous);
 	}
diff --git a/src/TypeAdapter/Primitive/ClassProperties/Property/Flattening/Flatten.php b/src/TypeAdapter/Primitive/ClassProperties/Property/Flattening/Flatten.php
@@ -5,6 +5,4 @@
 use Attribute;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
-class Flatten
-{
-}
+class Flatten {}
diff --git a/src/TypeAdapter/Primitive/ClassProperties/Property/UseDefaultForUnexpected.php b/src/TypeAdapter/Primitive/ClassProperties/Property/UseDefaultForUnexpected.php
@@ -5,6 +5,4 @@
 use Attribute;
 
 #[Attribute(Attribute::TARGET_PROPERTY)]
-class UseDefaultForUnexpected
-{
-}
+class UseDefaultForUnexpected {}
diff --git a/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/InstanceMapperMethod.php b/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/InstanceMapperMethod.php
@@ -21,8 +21,8 @@
 final class InstanceMapperMethod implements MapperMethod
 {
 	/**
-	 * @param AdapterType                                            $adapter
 	 * @param MethodReflection<AdapterType, HasMethods<AdapterType>> $method
+	 * @param AdapterType                                            $adapter
 	 */
 	public function __construct(
 		private readonly MethodReflection $method,
diff --git a/src/TypeAdapter/Primitive/PrimitiveTypeAdapter.php b/src/TypeAdapter/Primitive/PrimitiveTypeAdapter.php
@@ -9,6 +9,4 @@
  *
  * @extends TypeAdapter<T, mixed>
  */
-interface PrimitiveTypeAdapter extends TypeAdapter
-{
-}
+interface PrimitiveTypeAdapter extends TypeAdapter {}
diff --git a/src/TypeAdapter/TypeAdapterFactory.php b/src/TypeAdapter/TypeAdapterFactory.php
@@ -14,8 +14,6 @@ interface TypeAdapterFactory
 {
 	/**
 	 * @param class-string<TypeAdapter<mixed, mixed>> $typeAdapterType
-	 *
-	 * @return T|null
 	 */
 	public function create(string $typeAdapterType, Type $type, Attributes $attributes, Serializer $serializer): ?TypeAdapter;
 }
diff --git a/tests/Integration/JsonSerializationTest.php b/tests/Integration/JsonSerializationTest.php
@@ -5,7 +5,6 @@
 use Carbon\CarbonImmutable;
 use DateMalformedStringException;
 use DateTime;
-use Exception;
 use GoodPhp\Reflection\Type\Combinatorial\UnionType;
 use GoodPhp\Reflection\Type\NamedType;
 use GoodPhp\Reflection\Type\PrimitiveType;
@@ -24,6 +23,7 @@
 use GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\PropertyMappingException;
 use GoodPhp\Serialization\TypeAdapter\Primitive\Polymorphic\ClassPolymorphicTypeAdapterFactory;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Tests\Stubs\BackedEnumStub;
 use Tests\Stubs\ClassStub;
@@ -37,9 +37,7 @@
 
 class JsonSerializationTest extends TestCase
 {
-	/**
-	 * @dataProvider serializesProvider
-	 */
+	#[DataProvider('serializesProvider')]
 	public function testSerializes(string|Type $type, mixed $data, string $expectedSerialized): void
 	{
 		$adapter = $this->serializer()->adapter(JsonTypeAdapter::class, $type);
@@ -211,7 +209,9 @@ public static function serializesProvider(): iterable
 		];
 
 		yield 'ClassStub with empty optional and null nullable' => [
-			new NamedType(ClassStub::class, [
+			new NamedType(
+				ClassStub::class,
+				[
 					new NamedType(DateTime::class),
 				]
 			),
@@ -242,9 +242,7 @@ public static function serializesProvider(): iterable
 		];
 	}
 
-	/**
-	 * @dataProvider deserializesProvider
-	 */
+	#[DataProvider('deserializesProvider')]
 	public function testDeserializes(string|Type $type, mixed $expectedData, string $serialized): void
 	{
 		$adapter = $this->serializer()->adapter(JsonTypeAdapter::class, $type);
@@ -363,7 +361,9 @@ public static function deserializesProvider(): iterable
 		];
 
 		yield 'Collection of DateTime' => [
-			new NamedType(Collection::class, [
+			new NamedType(
+				Collection::class,
+				[
 					PrimitiveType::integer(),
 					new NamedType(DateTime::class),
 				]
@@ -377,7 +377,9 @@ public static function deserializesProvider(): iterable
 		];
 
 		yield 'ClassStub with all fields' => [
-			new NamedType(ClassStub::class, [
+			new NamedType(
+				ClassStub::class,
+				[
 					new NamedType(DateTime::class),
 				]
 			),
@@ -426,7 +428,9 @@ public static function deserializesProvider(): iterable
 		];
 
 		yield 'ClassStub with empty optional and null nullable' => [
-			new NamedType(ClassStub::class, [
+			new NamedType(
+				ClassStub::class,
+				[
 					new NamedType(DateTime::class),
 				]
 			),
@@ -456,8 +460,8 @@ public static function deserializesProvider(): iterable
 
 		yield 'ClassStub with the least default fields' => [
 			new NamedType(ClassStub::class, [
-					new NamedType(DateTime::class),
-				]),
+				new NamedType(DateTime::class),
+			]),
 			new ClassStub(
 				1,
 				new NestedStub(),
@@ -501,9 +505,7 @@ public static function deserializesProvider(): iterable
 		];
 	}
 
-	/**
-	 * @dataProvider deserializesWithAnExceptionProvider
-	 */
+	#[DataProvider('deserializesWithAnExceptionProvider')]
 	public function testDeserializesWithAnException(Throwable $expectedException, string|Type $type, string $serialized): void
 	{
 		$adapter = $this->serializer()->adapter(JsonTypeAdapter::class, $type);
@@ -642,7 +644,9 @@ public static function deserializesWithAnExceptionProvider(): iterable
 
 		yield 'Collection of DateTime #1' => [
 			new CollectionItemMappingException(0, new UnexpectedTypeException(null, PrimitiveType::string())),
-			new NamedType(Collection::class, [
+			new NamedType(
+				Collection::class,
+				[
 					PrimitiveType::integer(),
 					new NamedType(DateTime::class),
 				]
@@ -657,7 +661,9 @@ public static function deserializesWithAnExceptionProvider(): iterable
 				new CollectionItemMappingException(0, new UnexpectedTypeException(null, PrimitiveType::string())),
 				new CollectionItemMappingException(1, new UnexpectedTypeException(null, PrimitiveType::string())),
 			]),
-			new NamedType(Collection::class, [
+			new NamedType(
+				Collection::class,
+				[
 					PrimitiveType::integer(),
 					new NamedType(DateTime::class),
 				]
@@ -669,7 +675,9 @@ public static function deserializesWithAnExceptionProvider(): iterable
 
 		yield 'ClassStub with wrong primitive type' => [
 			new PropertyMappingException('primitive', new UnexpectedTypeException('1', PrimitiveType::integer())),
-			new NamedType(ClassStub::class, [
+			new NamedType(
+				ClassStub::class,
+				[
 					new NamedType(DateTime::class),
 				]
 			),
@@ -687,7 +695,9 @@ public static function deserializesWithAnExceptionProvider(): iterable
 
 		yield 'ClassStub with wrong nested field type' => [
 			new PropertyMappingException('nested.Field', new UnexpectedTypeException(123, PrimitiveType::string())),
-			new NamedType(ClassStub::class, [
+			new NamedType(
+				ClassStub::class,
+				[
 					new NamedType(DateTime::class),
 				]
 			),
diff --git a/tests/Stubs/ClassStub.php b/tests/Stubs/ClassStub.php
@@ -21,7 +21,7 @@ public function __construct(
 		public NestedStub $nested,
 		#[SerializedName('date')]
 		public mixed $generic,
-		public int|null|MissingValue $optional,
+		public int|MissingValue|null $optional,
 		public ?int $nullable,
 		public int|MissingValue $nonNullOptional,
 		#[Flatten]
diff --git a/tests/Stubs/Polymorphic/Change.php b/tests/Stubs/Polymorphic/Change.php
@@ -2,6 +2,4 @@
 
 namespace Tests\Stubs\Polymorphic;
 
-interface Change
-{
-}
+interface Change {}

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ public function reflector(): Reflector;`
`26`	`26`	`*`
`27`	`27`	`* @return A`
`28`	`28`	`*/`
`29`		`- public function adapter(string $typeAdapterType, Type\|string $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter;`
	`29`	`+ public function adapter(string $typeAdapterType, Type\|string $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(`
`29`	`29`	`*`
`30`	`30`	`* @return TypeAdapterType`
`31`	`31`	`*/`
`32`		`- public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter`
	`32`	`+ public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter`
`33`	`33`	`{`
`34`	`34`	`$this->resolved[$typeAdapterType][(string) $type] ??= new WeakMap();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(`
`30`	`30`	`*`
`31`	`31`	`* @return TypeAdapterType`
`32`	`32`	`*/`
`33`		`- public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter`
	`33`	`+ public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter`
`34`	`34`	`{`
`35`	`35`	`if ($skipPast) {`
`36`	`36`	`$skipPastIndex = array_search($skipPast, $this->factories, true);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ final class TypeAdapterNotFoundException extends RuntimeException`
`14`	`14`	`/**`
`15`	`15`	`* @param TypeAdapterFactory<TypeAdapter<mixed, mixed>>\|null $skipPast`
`16`	`16`	`*/`
`17`		`- public function __construct(string $typeAdapterType, Type $type, Attributes $attributes, ?TypeAdapterFactory $skipPast, Throwable $previous = null)`
	`17`	`+ public function __construct(string $typeAdapterType, Type $type, Attributes $attributes, ?TypeAdapterFactory $skipPast, ?Throwable $previous = null)`
`18`	`18`	`{`
`19`	`19`	`$message = "A matching type adapter of type '{$typeAdapterType}' for type '{$type}' " .`
`20`	`20`	`($attributes->has() ? 'with attributes ' . $attributes : '') .`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@ interface TypeAdapterRegistry`
`19`	`19`	`*`
`20`	`20`	`* @return TypeAdapterType`
`21`	`21`	`*/`
`22`		`- public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter;`
	`22`	`+ public function forType(string $typeAdapterType, Serializer $serializer, Type $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter;`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public function __construct(`
`19`	`19`	`private readonly Reflector $reflector,`
`20`	`20`	`) {}`
`21`	`21`
`22`		`- public function adapter(string $typeAdapterType, Type\|string $type, Attributes $attributes = new ArrayAttributes(), TypeAdapterFactory $skipPast = null): TypeAdapter`
	`22`	`+ public function adapter(string $typeAdapterType, Type\|string $type, Attributes $attributes = new ArrayAttributes(), ?TypeAdapterFactory $skipPast = null): TypeAdapter`
`23`	`23`	`{`
`24`	`24`	`if (is_string($type)) {`
`25`	`25`	`$type = new NamedType($type);`