Skip to content

Commit 0553b6f

Browse files
committed
Fix
1 parent 29b09b9 commit 0553b6f

3 files changed

Lines changed: 20 additions & 6 deletions

File tree

phpstan.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ parameters:
5959
- '#::provideMinPhpVersion\(\) never returns \d+ so it can be removed from the return type#'
6060

6161
-
62-
message: '#Call to an undefined method PHPStan\\Type\\Type\:\:getClassReflection\(\)#'
62+
message: '#Cannot call method getName\(\) on PHPStan\\Reflection\\ClassReflection\|null#'
6363
path: rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php

rules-tests/CodeQuality/Rector/Class_/TypeWillReturnCallableArrowFunctionRector/Fixture/fill_known_param_type_object.php.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class FillKnownParamTypeObject extends TestCase
3030
{
3131
$this->createMock(SomeMockedClass::class)
3232
->method('nativeObject')
33-
->willReturnCallback(fn (object $name): object => $value);
33+
->willReturnCallback(fn (object $object): object => $value);
3434
}
3535
}
3636

rules/CodeQuality/Reflection/MethodParametersAndReturnTypesResolver.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use PHPStan\Type\IntersectionType;
1111
use PHPStan\Type\MixedType;
1212
use PHPStan\Type\ObjectType;
13+
use PHPStan\Type\StaticType;
1314
use PHPStan\Type\Type;
1415
use Rector\Enum\ClassName;
1516
use Rector\PHPUnit\CodeQuality\ValueObject\ParamTypesAndReturnType;
@@ -63,9 +64,9 @@ private function resolveParameterTypes(
6364

6465
$parameterTypes = [];
6566
foreach ($extendedParametersAcceptor->getParameters() as $parameterReflection) {
66-
$parameterType = $parameterReflection->getNativeType();
67+
$parameterType = $this->resolveObjectType($parameterReflection->getNativeType());
6768

68-
if ($parameterType->isObject()->yes() && $currentClassReflection->getName() !== $parameterType->getClassReflection()->getName()) {
69+
if ($parameterType instanceof ObjectType && $currentClassReflection->getName() !== $parameterType->getClassReflection()->getName()) {
6970
return [];
7071
}
7172

@@ -75,6 +76,19 @@ private function resolveParameterTypes(
7576
return $parameterTypes;
7677
}
7778

79+
private function resolveObjectType(Type $type): ObjectType|Type
80+
{
81+
if ($type instanceof ObjectType) {
82+
return $type;
83+
}
84+
85+
if ($type instanceof StaticType) {
86+
return $type->getStaticObjectType();
87+
}
88+
89+
return $type;
90+
}
91+
7892
private function resolveReturnType(
7993
ExtendedMethodReflection $extendedMethodReflection,
8094
ClassReflection $currentClassReflection
@@ -83,9 +97,9 @@ private function resolveReturnType(
8397
$extendedMethodReflection->getVariants()
8498
);
8599

86-
$returnType = $extendedParametersAcceptor->getNativeReturnType();
100+
$returnType = $this->resolveObjectType($extendedParametersAcceptor->getNativeReturnType());
87101

88-
if ($returnType->isObject()->yes() && $currentClassReflection->getName() !== $returnType?->getClassReflection()?->getName()) {
102+
if ($returnType instanceof ObjectType && $currentClassReflection->getName() !== $returnType->getClassReflection()->getName()) {
89103
return new MixedType();
90104
}
91105

0 commit comments

Comments
 (0)