Skip to content

fix: place UniversalObjectCratesClassReflectionExtension last #4207

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

Merged
merged 1 commit into from
Aug 6, 2025
Merged

fix: place UniversalObjectCratesClassReflectionExtension last #4207

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions conf/services.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ services:
-
class: PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension

-
class: PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension
arguments:
classes: %universalObjectCratesClasses%

-
class: PHPStan\Reflection\Mixin\MixinMethodsClassReflectionExtension
arguments:
Expand Down
4 changes: 3 additions & 1 deletion src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use PHPStan\Reflection\Mixin\MixinPropertiesClassReflectionExtension;
use PHPStan\Reflection\Php\PhpClassReflectionExtension;
use PHPStan\Reflection\Php\Soap\SoapClientMethodsClassReflectionExtension;
use PHPStan\Reflection\Php\UniversalObjectCratesClassReflectionExtension;
use PHPStan\Reflection\RequireExtension\RequireExtendsMethodsClassReflectionExtension;
use PHPStan\Reflection\RequireExtension\RequireExtendsPropertiesClassReflectionExtension;
use function array_merge;
Expand All @@ -36,9 +37,10 @@ public function getRegistry(): ClassReflectionExtensionRegistry
$mixinMethodsClassReflectionExtension = $this->container->getByType(MixinMethodsClassReflectionExtension::class);
$mixinPropertiesClassReflectionExtension = $this->container->getByType(MixinPropertiesClassReflectionExtension::class);
$soapClientMethodsClassReflectionExtension = $this->container->getByType(SoapClientMethodsClassReflectionExtension::class);
$universalObjectCratesClassReflectionExtension = $this->container->getByType(UniversalObjectCratesClassReflectionExtension::class);

$this->registry = new ClassReflectionExtensionRegistry(
array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsPropertiesClassReflectionExtension, $mixinPropertiesClassReflectionExtension]),
array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsPropertiesClassReflectionExtension, $mixinPropertiesClassReflectionExtension, $universalObjectCratesClassReflectionExtension]),
array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsMethodsClassReflectionExtension, $mixinMethodsClassReflectionExtension, $soapClientMethodsClassReflectionExtension]),
$this->container->getServicesByTag(BrokerFactory::ALLOWED_SUB_TYPES_CLASS_REFLECTION_EXTENSION_TAG),
$this->container->getByType(RequireExtendsPropertiesClassReflectionExtension::class),
Expand Down
4 changes: 0 additions & 4 deletions src/Reflection/Php/UniversalObjectCratesClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@

namespace PHPStan\Reflection\Php;

use PHPStan\DependencyInjection\AutowiredParameter;
use PHPStan\DependencyInjection\AutowiredService;
use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\PropertiesClassReflectionExtension;
use PHPStan\Reflection\PropertyReflection;
use PHPStan\Reflection\ReflectionProvider;
use PHPStan\Type\MixedType;

#[AutowiredService]
final class UniversalObjectCratesClassReflectionExtension
implements PropertiesClassReflectionExtension
{
Expand All @@ -21,7 +18,6 @@ final class UniversalObjectCratesClassReflectionExtension
*/
public function __construct(
private ReflectionProvider $reflectionProvider,
#[AutowiredParameter(ref: '%universalObjectCratesClasses%')]
private array $classes,
private AnnotationsPropertiesClassReflectionExtension $annotationClassReflection,
)
Expand Down
22 changes: 22 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13342.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php declare(strict_types = 1);

namespace Bug13342;

use stdClass;
use function PHPStan\Testing\assertType;

class Mixin { public bool $test = true; }

/** @mixin Mixin */
#[\AllowDynamicProperties]
class TestNormal {}

/** @mixin Mixin */
#[\AllowDynamicProperties]
class TestUniversalObjectCrate extends stdClass {}

function test(TestNormal $normal, TestUniversalObjectCrate $crate): void
{
assertType('bool', $normal->test);
assertType('bool', $crate->test);
}
Loading