fix: PHPStan

good-php · Nov 3, 2023 · 9c8834e · 9c8834e
1 parent e7776c9
commit 9c8834e
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 20 deletions.
diff --git a/src/Serializer/Registry/Factory/FactoryTypeAdapterRegistryBuilder.php b/src/Serializer/Registry/Factory/FactoryTypeAdapterRegistryBuilder.php
@@ -16,7 +16,9 @@ public function __construct(
 	) {}
 
 	/**
-	 * @param TypeAdapterFactory<TypeAdapter<mixed, mixed>> $factory
+	 * @template A of TypeAdapter<mixed, mixed>
+	 *
+	 * @param TypeAdapterFactory<A> $factory
 	 */
 	public function addFactory(TypeAdapterFactory $factory): self
 	{
@@ -32,7 +34,9 @@ public function addMapper(object $adapter): self
 	}
 
 	/**
-	 * @param TypeAdapterFactory<TypeAdapter<mixed, mixed>> $factory
+	 * @template A of TypeAdapter<mixed, mixed>
+	 *
+	 * @param TypeAdapterFactory<A> $factory
 	 */
 	public function addFactoryLast(TypeAdapterFactory $factory): self
 	{

diff --git a/src/TypeAdapter/Primitive/ClassProperties/ClassPropertiesPrimitiveTypeAdapter.php b/src/TypeAdapter/Primitive/ClassProperties/ClassPropertiesPrimitiveTypeAdapter.php
@@ -29,9 +29,6 @@ public function __construct(
 		private readonly Collection $properties,
 	) {}
 
-	/**
-	 * @param T $value
-	 */
 	public function serialize(mixed $value): mixed
 	{
 		return MultipleMappingException::map(

diff --git a/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/DefaultMapperMethodFactory.php b/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/DefaultMapperMethodFactory.php
@@ -3,6 +3,7 @@
 namespace GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\MapperMethod;
 
 use GoodPhp\Reflection\Reflection\MethodReflection;
+use GoodPhp\Reflection\Reflection\Methods\HasMethods;
 use GoodPhp\Reflection\Type\Type;
 use GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\Acceptance\AcceptanceStrategy;
 use GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\Acceptance\BaseTypeEqualsAcceptanceStrategy;
@@ -40,6 +41,12 @@ public function createFrom(object $adapter, MethodReflection $method, MapFrom $m
 		);
 	}
 
+	/**
+	 * @template AdapterType of object
+	 *
+	 * @param AdapterType                                            $adapter
+	 * @param MethodReflection<AdapterType, HasMethods<AdapterType>> $method
+	 */
 	public function create(
 		object $adapter,
 		MethodReflection $method,

diff --git a/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/InstanceMapperMethod.php b/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/InstanceMapperMethod.php
@@ -5,6 +5,7 @@
 use GoodPhp\Reflection\Reflection\Attributes\Attributes;
 use GoodPhp\Reflection\Reflection\FunctionParameterReflection;
 use GoodPhp\Reflection\Reflection\MethodReflection;
+use GoodPhp\Reflection\Reflection\Methods\HasMethods;
 use GoodPhp\Reflection\Type\NamedType;
 use GoodPhp\Reflection\Type\Type;
 use GoodPhp\Serialization\Serializer;
@@ -14,8 +15,15 @@
 use TypeError;
 use Webmozart\Assert\Assert;
 
+/**
+ * @template AdapterType of object
+ */
 final class InstanceMapperMethod implements MapperMethod
 {
+	/**
+	 * @param AdapterType                                            $adapter
+	 * @param MethodReflection<AdapterType, HasMethods<AdapterType>> $method
+	 */
 	public function __construct(
 		private readonly MethodReflection $method,
 		private readonly object $adapter,
@@ -59,7 +67,8 @@ public function invoke(mixed $value, Type $type, Attributes $attributes, Seriali
 				throw $e;
 			}
 
-			throw new UnexpectedTypeException($value, $this->method->parameters()->first()->type());
+			/* @phpstan-ignore-next-line argument.type */
+			throw new UnexpectedTypeException($value, $this->method->parameters()->firstOrFail()->type());
 		}
 	}
 }
diff --git a/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/MapperMethodFactory.php b/src/TypeAdapter/Primitive/MapperMethods/MapperMethod/MapperMethodFactory.php
@@ -3,17 +3,30 @@
 namespace GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\MapperMethod;
 
 use GoodPhp\Reflection\Reflection\MethodReflection;
+use GoodPhp\Reflection\Reflection\Methods\HasMethods;
 use GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\MapFrom;
 use GoodPhp\Serialization\TypeAdapter\Primitive\MapperMethods\MapTo;
 
 interface MapperMethodFactory
 {
+	/**
+	 * @template AdapterType of object
+	 *
+	 * @param AdapterType                                            $adapter
+	 * @param MethodReflection<AdapterType, HasMethods<AdapterType>> $method
+	 */
 	public function createTo(
 		object $adapter,
 		MethodReflection $method,
 		MapTo $mapTo,
 	): MapperMethod;
 
+	/**
+	 * @template AdapterType of object
+	 *
+	 * @param AdapterType                                            $adapter
+	 * @param MethodReflection<AdapterType, HasMethods<AdapterType>> $method
+	 */
 	public function createFrom(
 		object $adapter,
 		MethodReflection $method,

diff --git a/src/TypeAdapter/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapter.php b/src/TypeAdapter/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapter.php
@@ -9,8 +9,16 @@
 use GoodPhp\Serialization\TypeAdapter\Primitive\PrimitiveTypeAdapter;
 use Webmozart\Assert\Assert;
 
+/**
+ * @template T
+ *
+ * @implements PrimitiveTypeAdapter<T>
+ */
 final class MapperMethodsPrimitiveTypeAdapter implements PrimitiveTypeAdapter
 {
+	/**
+	 * @param PrimitiveTypeAdapter<T>|null $fallbackDelegate
+	 */
 	public function __construct(
 		private readonly ?MapperMethod $toMapper,
 		private readonly ?MapperMethod $fromMapper,
@@ -27,15 +35,23 @@ public function __construct(
 
 	public function serialize(mixed $value): mixed
 	{
-		return $this->toMapper ?
-			$this->toMapper->invoke($value, $this->type, $this->attributes, $this->serializer, $this->skipPast) :
-			$this->fallbackDelegate->serialize($value);
+		if (!$this->toMapper) {
+			Assert::notNull($this->fallbackDelegate);
+
+			return $this->fallbackDelegate->serialize($value);
+		}
+
+		return $this->toMapper->invoke($value, $this->type, $this->attributes, $this->serializer, $this->skipPast);
 	}
 
 	public function deserialize(mixed $value): mixed
 	{
-		return $this->fromMapper ?
-			$this->fromMapper->invoke($value, $this->type, $this->attributes, $this->serializer, $this->skipPast) :
-			$this->fallbackDelegate->deserialize($value);
+		if (!$this->fromMapper) {
+			Assert::notNull($this->fallbackDelegate);
+
+			return $this->fallbackDelegate->deserialize($value);
+		}
+
+		return $this->fromMapper->invoke($value, $this->type, $this->attributes, $this->serializer, $this->skipPast);
 	}
 }
diff --git a/...eAdapter/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapterFactory.php b/...eAdapter/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapterFactory.php
@@ -13,7 +13,7 @@
 use Webmozart\Assert\Assert;
 
 /**
- * @implements TypeAdapterFactory<MapperMethodsPrimitiveTypeAdapter>
+ * @implements TypeAdapterFactory<MapperMethodsPrimitiveTypeAdapter<mixed>>
  */
 final class MapperMethodsPrimitiveTypeAdapterFactory implements TypeAdapterFactory
 {

diff --git a/...r/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapterFactoryFactory.php b/...r/Primitive/MapperMethods/TypeAdapter/MapperMethodsPrimitiveTypeAdapterFactoryFactory.php
@@ -30,13 +30,15 @@ public function create(object $adapter): MapperMethodsPrimitiveTypeAdapterFactor
 				->map(fn (MethodReflection $method) => $this->mapperMethodFactory->createTo(
 					$adapter,
 					$method,
+					/* @phpstan-ignore-next-line argument.type */
 					$method->attributes()->sole(MapTo::class),
 				)),
 			$reflection->methods()
 				->filter(fn (MethodReflection $method) => $method->attributes()->has(MapFrom::class))
 				->map(fn (MethodReflection $method) => $this->mapperMethodFactory->createFrom(
 					$adapter,
 					$method,
+					/* @phpstan-ignore-next-line argument.type */
 					$method->attributes()->sole(MapFrom::class)
 				)),
 		);

diff --git a/src/TypeAdapter/Primitive/PhpStandard/ValueEnumMapper.php b/src/TypeAdapter/Primitive/PhpStandard/ValueEnumMapper.php
@@ -32,12 +32,9 @@ public function to(ValueEnum $value): string|int
 	}
 
 	/**
-	 * @template TEnumValue of string|int
-	 *
-	 * @param TEnumValue $value
-	 * @param NamedType  $type
+	 * @param NamedType $type
 	 *
-	 * @return ValueEnum<TEnumValue>
+	 * @return ValueEnum<string|int>
 	 */
 	#[MapFrom(PrimitiveTypeAdapter::class, new BaseTypeAcceptedByAcceptanceStrategy(ValueEnum::class))]
 	public function from(string|int $value, Type $type): ValueEnum

diff --git a/src/TypeAdapter/Primitive/PrimitiveTypeAdapter.php b/src/TypeAdapter/Primitive/PrimitiveTypeAdapter.php
@@ -7,7 +7,7 @@
 /**
  * @template T
  *
- * @implements TypeAdapter<T, mixed>
+ * @extends TypeAdapter<T, mixed>
  */
 interface PrimitiveTypeAdapter extends TypeAdapter
 {

diff --git a/src/TypeAdapter/TypeAdapterFactory.php b/src/TypeAdapter/TypeAdapterFactory.php
@@ -13,7 +13,7 @@
 interface TypeAdapterFactory
 {
 	/**
-	 * @param class-string<T> $typeAdapterType
+	 * @param class-string<TypeAdapter<mixed, mixed>> $typeAdapterType
 	 *
 	 * @return T|null
 	 */