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

Author: phpstan-bot

conf/config.neon

@@ -808,8 +808,6 @@ services:
 
 	-
 		class: PHPStan\Reflection\Php\Soap\SoapClientMethodsClassReflectionExtension
-		tags:
-			- phpstan.broker.methodsClassReflectionExtension
 
 	-
 		class: PHPStan\Reflection\Php\EnumAllowedSubTypesClassReflectionExtension

src/DependencyInjection/Reflection/LazyClassReflectionExtensionRegistryProvider.php

@@ -10,6 +10,7 @@
 use PHPStan\Reflection\Mixin\MixinMethodsClassReflectionExtension;
 use PHPStan\Reflection\Mixin\MixinPropertiesClassReflectionExtension;
 use PHPStan\Reflection\Php\PhpClassReflectionExtension;
+use PHPStan\Reflection\Php\Soap\SoapClientMethodsClassReflectionExtension;
 use PHPStan\Reflection\RequireExtension\RequireExtendsMethodsClassReflectionExtension;
 use PHPStan\Reflection\RequireExtension\RequireExtendsPropertiesClassReflectionExtension;
 use function array_merge;
@@ -32,10 +33,11 @@ public function getRegistry(): ClassReflectionExtensionRegistry
 
 			$mixinMethodsClassReflectionExtension = $this->container->getByType(MixinMethodsClassReflectionExtension::class);
 			$mixinPropertiesClassReflectionExtension = $this->container->getByType(MixinPropertiesClassReflectionExtension::class);
+			$soapClientMethodsClassReflectionExtension = $this->container->getByType(SoapClientMethodsClassReflectionExtension::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::METHODS_CLASS_REFLECTION_EXTENSION_TAG), [$annotationsMethodsClassReflectionExtension, $mixinMethodsClassReflectionExtension]),
+				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),
 				$this->container->getByType(RequireExtendsMethodsClassReflectionExtension::class),

tests/PHPStan/Analyser/nsrt/bug-12834.php

@@ -0,0 +1,16 @@
+<?php declare(strict_types = 1);
+
+namespace Bug12834;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @method int test()
+ */
+class HelloWorld extends \SoapClient
+{
+
+}
+
+$x = new HelloWorld("file.wsdl");
+assertType('int', $x->test());