Merge branch refs/heads/1.12.x into 2.0.x

Author: phpstan-bot

conf/config.neon

@@ -802,15 +802,11 @@ services:
 
 	-
 		class: PHPStan\Reflection\Mixin\MixinMethodsClassReflectionExtension
-		tags:
-			- phpstan.broker.methodsClassReflectionExtension
 		arguments:
 			mixinExcludeClasses: %mixinExcludeClasses%
 
 	-
 		class: PHPStan\Reflection\Mixin\MixinPropertiesClassReflectionExtension
-		tags:
-			- phpstan.broker.propertiesClassReflectionExtension
 		arguments:
 			mixinExcludeClasses: %mixinExcludeClasses%
 

src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php

@@ -8,6 +8,8 @@
 use PHPStan\Reflection\Annotations\AnnotationsMethodsClassReflectionExtension;
 use PHPStan\Reflection\Annotations\AnnotationsPropertiesClassReflectionExtension;
 use PHPStan\Reflection\ClassReflectionExtensionRegistry;
+use PHPStan\Reflection\Mixin\MixinMethodsClassReflectionExtension;
+use PHPStan\Reflection\Mixin\MixinPropertiesClassReflectionExtension;
 use PHPStan\Reflection\Php\PhpClassReflectionExtension;
 use PHPStan\Reflection\RequireExtension\RequireExtendsMethodsClassReflectionExtension;
 use PHPStan\Reflection\RequireExtension\RequireExtendsPropertiesClassReflectionExtension;
@@ -29,10 +31,13 @@ public function getRegistry(): ClassReflectionExtensionRegistry
 			$annotationsMethodsClassReflectionExtension = $this->container->getByType(AnnotationsMethodsClassReflectionExtension::class);
 			$annotationsPropertiesClassReflectionExtension = $this->container->getByType(AnnotationsPropertiesClassReflectionExtension::class);
 
+			$mixinMethodsClassReflectionExtension = $this->container->getByType(MixinMethodsClassReflectionExtension::class);
+			$mixinPropertiesClassReflectionExtension = $this->container->getByType(MixinPropertiesClassReflectionExtension::class);
+
 			$this->registry = new ClassReflectionExtensionRegistry(
 				$this->container->getByType(Broker::class),
-				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsPropertiesClassReflectionExtension]),
-				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsMethodsClassReflectionExtension]),
+				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::PROPERTIES_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsPropertiesClassReflectionExtension, $mixinPropertiesClassReflectionExtension]),
+				array_merge([$phpClassReflectionExtension], $this->container->getServicesByTag(BrokerFactory::METHODS_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsMethodsClassReflectionExtension, $mixinMethodsClassReflectionExtension]),
 				$this->container->getServicesByTag(BrokerFactory::ALLOWED_SUB_TYPES_CLASS_REFLECTION_EXTENSION_TAG),
 				$this->container->getByType(RequireExtendsPropertiesClassReflectionExtension::class),
 				$this->container->getByType(RequireExtendsMethodsClassReflectionExtension::class),