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

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -243,6 +243,9 @@ jobs:
           - script: |
               cd e2e/bug-15102b
               ../../bin/phpstan analyze
+          - script: |
+              cd e2e/bug-15231
+              ../../bin/phpstan analyze
           - script: |
               cd e2e/bug-15102
               composer install

conf/parsers.neon

@@ -52,8 +52,8 @@ services:
 	pathRoutingParser:
 		class: PHPStan\Parser\PathRoutingParser
 		arguments:
-			currentPhpVersionRichParser: @currentPhpVersionRichParser
-			currentPhpVersionSimpleParser: @currentPhpVersionSimpleParser
+			currentPhpVersionRichParser: @cachedRichParser
+			currentPhpVersionSimpleParser: @cachedSimpleParser
 			php8Parser: @php8Parser
 			singleReflectionFile: %singleReflectionFile%
 		autowired: false
@@ -64,14 +64,29 @@ services:
 			wrappedParser: @defaultAnalysisParser
 		autowired: false
 
-	defaultAnalysisParser:
+	# the cache sits behind the routing: CachedParser keys by source code, so
+	# one cache in front of it would hand the body-stripped AST of a file
+	# outside the analysed paths to an analysed file with the same contents
+	cachedRichParser:
+		class: PHPStan\Parser\CachedParser
+		arguments:
+			originalParser: @currentPhpVersionRichParser
+			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
+			cachedSourceBytesMax: %cache.nodesByStringSourceBytesMax%
+		autowired: false
+
+	cachedSimpleParser:
 		class: PHPStan\Parser\CachedParser
 		arguments:
-			originalParser: @pathRoutingParser
+			originalParser: @currentPhpVersionSimpleParser
 			cachedNodesByStringCountMax: %cache.nodesByStringCountMax%
 			cachedSourceBytesMax: %cache.nodesByStringSourceBytesMax%
 		autowired: false
 
+	defaultAnalysisParser:
+		factory: @pathRoutingParser
+		autowired: false
+
 	freshStubParser:
 		class: PHPStan\Parser\StubParser
 		arguments:

e2e/bug-15231/autoload.php

@@ -0,0 +1,7 @@
+<?php
+
+spl_autoload_register(function (string $class): void {
+    if ($class === 'Demo\\Zeta') {
+        require __DIR__ . '/lib/Zeta.php';
+    }
+});

e2e/bug-15231/lib/Zeta.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Demo;
+
+class Zeta
+{
+    public function name(): string
+    {
+        return 'zeta';
+    }
+
+    public function size(): int
+    {
+        return 1;
+    }
+}

e2e/bug-15231/phpstan.dist.neon

@@ -0,0 +1,6 @@
+parameters:
+	level: 7
+	bootstrapFiles:
+		- autoload.php
+	paths:
+		- src

e2e/bug-15231/src/Alpha.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Demo;
+
+class Alpha
+{
+    public function label(): string
+    {
+        return (new Zeta)->name();
+    }
+}

e2e/bug-15231/src/Zeta.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Demo;
+
+class Zeta
+{
+    public function name(): string
+    {
+        return 'zeta';
+    }
+
+    public function size(): int
+    {
+        return 1;
+    }
+}