Merge branch refs/heads/1.10.x into 1.11.x

phpstan · Jun 22, 2023 · fdde07f · fdde07f
2 parents 074440e + fcf1939
commit fdde07f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -4,6 +4,7 @@
 
 use Nette\Utils\Strings;
 use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\Internal\CombinationsHelper;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprIntegerNode;
@@ -563,7 +564,11 @@ public function findTypeAndMethodNames(): array
 				continue;
 			}
 
-			if ($has->yes() && !$phpVersion->supportsCallableInstanceMethods()) {
+			if (
+				BleedingEdgeToggle::isBleedingEdge()
+				&& $has->yes()
+				&& !$phpVersion->supportsCallableInstanceMethods()
+			) {
 				$methodReflection = $type->getMethod($method->getValue(), new OutOfClassScope());
 				if ($classOrObject->isString()->yes() && !$methodReflection->isStatic()) {
 					continue;

diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -6,6 +6,7 @@
 use Nette\Utils\Strings;
 use PhpParser\Node\Name;
 use PHPStan\Analyser\OutOfClassScope;
+use PHPStan\DependencyInjection\BleedingEdgeToggle;
 use PHPStan\PhpDocParser\Ast\ConstExpr\QuoteAwareConstExprStringNode;
 use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -212,7 +213,11 @@ public function isCallable(): TrinaryLogic
 			$classRef = $reflectionProvider->getClass($matches[1]);
 			if ($classRef->hasMethod($matches[2])) {
 				$method = $classRef->getMethod($matches[2], new OutOfClassScope());
-				if (!$phpVersion->supportsCallableInstanceMethods() && !$method->isStatic()) {
+				if (
+					BleedingEdgeToggle::isBleedingEdge()
+					&& !$phpVersion->supportsCallableInstanceMethods()
+					&& !$method->isStatic()
+				) {
 					return TrinaryLogic::createNo();
 				}