Merge remote-tracking branch 'origin/2.1.x' into 2.2.x

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -124,6 +124,10 @@ jobs:
               mv src/Foo.php.orig src/Foo.php
               echo -n > phpstan-baseline.neon
               ../../bin/phpstan -vvv
+          - script: |
+              cd e2e/bug-14514
+              composer install
+              ../../bin/phpstan analyze bug-14515.php
           - script: |
               cd e2e/bug10449
               ../../bin/phpstan analyze

e2e/bug-14514/.gitignore

@@ -0,0 +1 @@
+/vendor

e2e/bug-14514/autoloader.php

@@ -0,0 +1,7 @@
+<?php
+
+spl_autoload_register(function ($class) {
+	if ($class === 'index') {
+		throw new LogicException("Autoloader should not be called for 'index'");
+	}
+});

e2e/bug-14514/bug-14515.php

@@ -0,0 +1,3 @@
+<?php
+
+throw new Exception("ERROR: " . 'index');

e2e/bug-14514/composer.json

@@ -0,0 +1,5 @@
+{
+	"autoload": {
+		"files": [ "autoloader.php" ]
+	}
+}

e2e/bug-14514/composer.lock

@@ -28,7 +28,11 @@ public function processImplicitToStringCall(Expr $expr, MutatingScope $scope): E
 		$impurePoints = [];
 
 		$exprType = $scope->getType($expr);
-		$toStringMethod = $scope->getMethodReflection($exprType, '__toString');
+
+		$toStringMethod = null;
+		if (!$exprType->isObject()->no()) {
+			$toStringMethod = $scope->getMethodReflection($exprType, '__toString');
+		}
 		if ($toStringMethod === null) {
 			return new ExpressionResult(
 				$scope,

src/Analyser/ExprHandler/Helper/ImplicitToStringCallHelper.php

@@ -214,4 +214,9 @@ public function testBug14504(): void
 		$this->analyse([__DIR__ . '/data/bug-14504.php'], []);
 	}
 
+	public function testBug14511(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14511.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Pure/PureFunctionRuleTest.php

@@ -383,4 +383,10 @@ public function testBug14504(): void
 		$this->analyse([__DIR__ . '/data/bug-14504-method.php'], []);
 	}
 
+	public function testBug14511(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-14511-method.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Pure/PureMethodRuleTest.php

@@ -0,0 +1,47 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14511Method;
+
+class Foo
+{
+
+	/**
+	 * @phpstan-pure
+	 * @template T of mixed
+	 * @param T $val
+	 */
+	public function testStringCast(mixed $val): ?string
+	{
+		if (is_int($val)) {
+			return (string) $val;
+		}
+		return null;
+	}
+
+	/**
+	 * @phpstan-pure
+	 * @template T of mixed
+	 * @param T $val
+	 */
+	public function testStringConcat(mixed $val): ?string
+	{
+		if (is_int($val)) {
+			return 'value: ' . $val;
+		}
+		return null;
+	}
+
+	/**
+	 * @phpstan-pure
+	 * @template T of mixed
+	 * @param T $val
+	 */
+	public function testEmptyNonArray(mixed $val): ?string
+	{
+		if (empty($val) && !\is_array($val)) {
+			return (string) $val;
+		}
+		return null;
+	}
+
+}