Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed universal object crate classes not respecting @property annotations #1786

Merged
merged 1 commit into from Oct 3, 2022
Merged

Fixed universal object crate classes not respecting @property annotations #1786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

namespace PHPStan\Reflection\Php;

use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\ParametersAcceptorSelector;
use PHPStan\Reflection\PropertiesClassReflectionExtension;
Expand All @@ -16,7 +17,11 @@ class UniversalObjectCratesClassReflectionExtension
/**
* @param string[] $classes
*/
public function __construct(private ReflectionProvider $reflectionProvider, private array $classes)
public function __construct(
private ReflectionProvider $reflectionProvider,
private array $classes,
private AnnotationsPropertiesClassReflectionExtension $annotationClassReflection,
)
{
}

Expand Down Expand Up @@ -56,6 +61,10 @@ public static function isUniversalObjectCrate(

public function getProperty(ClassReflection $classReflection, string $propertyName): PropertyReflection
{
if ($this->annotationClassReflection->hasProperty($classReflection, $propertyName)) {
return $this->annotationClassReflection->getProperty($classReflection, $propertyName);
}

if ($classReflection->hasNativeMethod('__get')) {
$readableType = ParametersAcceptorSelector::selectSingle($classReflection->getNativeMethod('__get')->getVariants())->getReturnType();
} else {
Expand Down
44 changes: 37 additions & 7 deletions tests/PHPStan/Reflection/Php/UniversalObjectCratesClassReflectionExtensionTest.php
View file
Open in desktop
Expand Up @@ -2,6 +2,7 @@

namespace PHPStan\Reflection\Php;

use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
use PHPStan\Testing\PHPStanTestCase;
use PHPStan\Type\ObjectType;
use PHPStan\Type\StringType;
Expand All @@ -13,10 +14,11 @@ class UniversalObjectCratesClassReflectionExtensionTest extends PHPStanTestCase
public function testNonexistentClass(): void
{
$reflectionProvider = $this->createReflectionProvider();
$extension = new UniversalObjectCratesClassReflectionExtension($reflectionProvider, [
'NonexistentClass',
'stdClass',
]);
$extension = new UniversalObjectCratesClassReflectionExtension(
$reflectionProvider,
['NonexistentClass', 'stdClass'],
new AnnotationsPropertiesClassReflectionExtension(),
);
$this->assertTrue($extension->hasProperty($reflectionProvider->getClass(stdClass::class), 'foo'));
}

Expand All @@ -25,9 +27,11 @@ public function testDifferentGetSetType(): void
require_once __DIR__ . '/data/universal-object-crates.php';

$reflectionProvider = $this->createReflectionProvider();
$extension = new UniversalObjectCratesClassReflectionExtension($reflectionProvider, [
'UniversalObjectCreates\DifferentGetSetTypes',
]);
$extension = new UniversalObjectCratesClassReflectionExtension(
$reflectionProvider,
['UniversalObjectCreates\DifferentGetSetTypes'],
new AnnotationsPropertiesClassReflectionExtension(),
);

$this->assertEquals(
new ObjectType('UniversalObjectCreates\DifferentGetSetTypesValue'),
Expand All @@ -43,4 +47,30 @@ public function testDifferentGetSetType(): void
);
}

public function testAnnotationOverrides(): void
{
require_once __DIR__ . '/data/universal-object-crates-annotations.php';
$className = 'UniversalObjectCratesAnnotations\Model';

$reflectionProvider = $this->createReflectionProvider();
$extension = new UniversalObjectCratesClassReflectionExtension(
$reflectionProvider,
[$className],
new AnnotationsPropertiesClassReflectionExtension(),
);

$this->assertEquals(
new StringType(),
$extension
->getProperty($reflectionProvider->getClass($className), 'foo')
->getReadableType(),
);
$this->assertEquals(
new StringType(),
$extension
->getProperty($reflectionProvider->getClass($className), 'foo')
->getWritableType(),
);
}

}
12 changes: 12 additions & 0 deletions tests/PHPStan/Reflection/Php/data/universal-object-crates-annotations.php
View file
Open in desktop
@@ -0,0 +1,12 @@
<?php declare(strict_types = 1);

namespace UniversalObjectCratesAnnotations;

use StdClass;

/**
* @property string $foo
*/
class Model extends StdClass
{
}