Skip to content

Commit b83d56d

Browse files
committed
Fix PHPStan generics
1 parent 2067771 commit b83d56d

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased](https://github.com/orisai/object-mapper/compare/0.3.0...v1.x)
99

10+
### Fixed
11+
12+
- PHPStan generics
13+
1014
## [0.3.0](https://github.com/orisai/object-mapper/compare/0.2.0...0.3.0) - 2025-01-21
1115

1216
### Added

src/Callbacks/Callback.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function getArgsType(): string;
3838
* @param T_ARGS $args
3939
* @param ObjectContext|FieldContext $context
4040
* @param ObjectHolder<MappedObject> $holder
41-
* @param ReflectionClass<MappedObject> $declaringClass
41+
* @param ReflectionClass<covariant MappedObject> $declaringClass
4242
* @return mixed
4343
* @throws ValueDoesNotMatch
4444
* @throws InvalidData

src/Meta/MetaResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ private function resolveClassMeta(ReflectionClass $rootClass, CompileMeta $meta)
129129
}
130130

131131
/**
132-
* @param ReflectionClass<MappedObject> $rootClass
133-
* @param ReflectionClass<object> $reflector
132+
* @param ReflectionClass<covariant MappedObject> $rootClass
133+
* @param ReflectionClass<covariant object> $reflector
134134
* @return never
135135
*/
136136
private function throwClassMetaOutsideOfMappedObject(

src/Meta/Runtime/CallbackRuntimeMeta.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ final class CallbackRuntimeMeta
2121
/** @var T */
2222
private Args $args;
2323

24-
/** @var ReflectionClass<MappedObject> */
24+
/** @var ReflectionClass<covariant MappedObject> */
2525
private ReflectionClass $declaringClass;
2626

2727
/**
2828
* @param class-string<Callback<T>> $type
2929
* @param T $args
30-
* @param ReflectionClass<MappedObject> $declaringClass
30+
* @param ReflectionClass<covariant MappedObject> $declaringClass
3131
*/
3232
public function __construct(string $type, Args $args, ReflectionClass $declaringClass)
3333
{
@@ -53,7 +53,7 @@ public function getArgs(): Args
5353
}
5454

5555
/**
56-
* @return ReflectionClass<MappedObject>
56+
* @return ReflectionClass<covariant MappedObject>
5757
*/
5858
public function getDeclaringClass(): ReflectionClass
5959
{

src/Meta/Source/MetaSource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface MetaSource
1010
{
1111

1212
/**
13-
* @param ReflectionClass<MappedObject> $class
13+
* @param ReflectionClass<covariant MappedObject> $class
1414
*/
1515
public function load(ReflectionClass $class): CompileMeta;
1616

src/Meta/Source/ReflectorMetaSource.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function load(ReflectionClass $class): CompileMeta
6060
}
6161

6262
/**
63-
* @param ReflectionClass<MappedObject> $class
63+
* @param ReflectionClass<covariant MappedObject> $class
6464
*/
6565
private function getStructureGroup(ReflectionClass $class): StructureGroup
6666
{
@@ -72,7 +72,7 @@ private function getStructureGroup(ReflectionClass $class): StructureGroup
7272
}
7373

7474
/**
75-
* @param ReflectionClass<MappedObject> $rootClass
75+
* @param ReflectionClass<covariant MappedObject> $rootClass
7676
* @return list<ClassCompileMeta>
7777
*/
7878
private function loadClassMeta(ReflectionClass $rootClass, StructureGroup $group): array
@@ -134,7 +134,7 @@ private function loadClassMeta(ReflectionClass $rootClass, StructureGroup $group
134134
}
135135

136136
/**
137-
* @param ReflectionClass<MappedObject> $rootClass
137+
* @param ReflectionClass<covariant MappedObject> $rootClass
138138
* @return list<FieldCompileMeta>
139139
*/
140140
private function loadPropertiesMeta(ReflectionClass $rootClass, StructureGroup $group): array
@@ -262,7 +262,7 @@ private function checkDefinitionType(MetaDefinition $definition): MetaDefinition
262262
}
263263

264264
/**
265-
* @param ReflectionClass<MappedObject> $rootClass
265+
* @param ReflectionClass<covariant MappedObject> $rootClass
266266
* @param list<FieldCompileMeta> $resolvedGroup
267267
*/
268268
private function checkFieldInvariance(ReflectionClass $rootClass, array $resolvedGroup): void
@@ -291,7 +291,7 @@ private function checkFieldInvariance(ReflectionClass $rootClass, array $resolve
291291
}
292292

293293
/**
294-
* @param ReflectionClass<MappedObject> $rootClass
294+
* @param ReflectionClass<covariant MappedObject> $rootClass
295295
*/
296296
private function getRelativePropertyName(PropertyStructure $propertyStructure, ReflectionClass $rootClass): string
297297
{

0 commit comments

Comments
 (0)