Consult bootstrap-registered custom autoloaders only after the static source locators

.github/workflows/e2e-tests.yml

@@ -128,6 +128,14 @@ jobs:
               cd e2e/bug-14514
               composer install
               ../../bin/phpstan analyze bug-14515.php
+          - script: |
+              cd e2e/bug-12972b
+              composer install
+              ../../bin/phpstan analyze
+          - script: |
+              cd e2e/bug-12972c
+              composer install
+              ../../bin/phpstan analyze
           - script: |
               cd e2e/bug-14724
               composer install

bin/phpstan

@@ -91,31 +91,15 @@ use Symfony\Component\Console\Helper\ProgressBar;
 	$autoloadFunctionsAfter = spl_autoload_functions();
 
 	if ($autoloadFunctionsBefore !== false && $autoloadFunctionsAfter !== false) {
-		$newAutoloadFunctions = [];
-		foreach ($autoloadFunctionsAfter as $after) {
-			if (
-				is_array($after)
-				&& count($after) > 0
-			) {
-				if (is_object($after[0])
-					&& get_class($after[0]) === \Composer\Autoload\ClassLoader::class
-				) {
-					continue;
-				}
-				if ($after[0] === 'PHPStan\\PharAutoloader') {
-					continue;
-				}
-			}
-			foreach ($autoloadFunctionsBefore as $before) {
-				if ($after === $before) {
-					continue 2;
-				}
-			}
-
-			$newAutoloadFunctions[] = $after;
-		}
-
-		$GLOBALS['__phpstanAutoloadFunctions'] = $newAutoloadFunctions;
+		$collectedAutoloadFunctions = \PHPStan\collectNewAutoloadFunctions($autoloadFunctionsBefore, $autoloadFunctionsAfter);
+		$GLOBALS['__phpstanAutoloadFunctions'] = array_merge(
+			$GLOBALS['__phpstanAutoloadFunctions'] ?? [],
+			$collectedAutoloadFunctions['appended'],
+		);
+		$GLOBALS['__phpstanAutoloadFunctionsPrependedToComposer'] = array_merge(
+			$GLOBALS['__phpstanAutoloadFunctionsPrependedToComposer'] ?? [],
+			$collectedAutoloadFunctions['prepended'],
+		);
 	}
 
 	$devOrPharLoader->register(true);

e2e/bug-12972b/.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+composer.lock

e2e/bug-12972b/autoloader.php

@@ -0,0 +1,9 @@
+<?php
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+spl_autoload_register(function($class) {
+	if ($class === \other12972\MyClass::class) {
+		throw new LogicException('this should not happen');
+	}
+});

e2e/bug-12972b/composer.json

@@ -0,0 +1,7 @@
+{
+	"autoload": {
+		"classmap": [
+			"src/"
+		]
+	}
+}

e2e/bug-12972b/phpstan.dist.neon

@@ -0,0 +1,8 @@
+parameters:
+    level: 9
+
+    paths:
+        - src
+
+    bootstrapFiles:
+        - autoloader.php

e2e/bug-12972b/real-world.php

@@ -0,0 +1,6 @@
+<?php
+
+require 'autoloader.php';
+
+$root = new \Foo12972\MyRoot();
+$root->doBar(new \other12972\MyClass());

e2e/bug-12972b/src/folder/file2.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace Foo12972;
+
+use other12972\MyClass;
+
+class MyRoot {
+	function doBar(MyClass $myClass):void {}
+}

e2e/bug-12972b/src/other/file.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace other12972;
+
+class MyClass {
+	public function doSomething(): int
+	{
+		return 1;
+	}
+}

e2e/bug-12972c/.gitignore

@@ -0,0 +1,2 @@
+/vendor/
+composer.lock

e2e/bug-12972c/autoloader.php

@@ -0,0 +1,12 @@
+<?php
+
+require_once __DIR__ . '/vendor/autoload.php';
+
+// Registered *before* Composer's class loader (third argument = prepend).
+// At runtime this resolves \shared12972c\Thing before Composer ever sees it,
+// so PHPStan must consult it before the Composer class map as well.
+spl_autoload_register(function ($class) {
+	if ($class === \shared12972c\Thing::class) {
+		require __DIR__ . '/prepended/Thing.php';
+	}
+}, true, true);

e2e/bug-12972c/classmap/Thing.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace shared12972c;
+
+class Thing {
+	public function composerOnly(): int
+	{
+		return 1;
+	}
+}

e2e/bug-12972c/composer.json

@@ -0,0 +1,7 @@
+{
+	"autoload": {
+		"classmap": [
+			"classmap/"
+		]
+	}
+}

e2e/bug-12972c/consumer/consumer.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace consumer12972c;
+
+use shared12972c\Thing;
+
+function run(Thing $thing): int
+{
+	return $thing->prependedOnly();
+}

e2e/bug-12972c/phpstan.dist.neon

@@ -0,0 +1,8 @@
+parameters:
+    level: 9
+
+    paths:
+        - consumer
+
+    bootstrapFiles:
+        - autoloader.php

e2e/bug-12972c/prepended/Thing.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace shared12972c;
+
+class Thing {
+	public function prependedOnly(): int
+	{
+		return 2;
+	}
+}

e2e/bug-12972c/real-world.php

@@ -0,0 +1,6 @@
+<?php
+
+require 'autoloader.php';
+
+$thing = new \shared12972c\Thing();
+echo $thing->prependedOnly(), "\n";

src/Command/CommandHelper.php

@@ -41,6 +41,7 @@
 use function array_filter;
 use function array_key_exists;
 use function array_map;
+use function array_merge;
 use function array_values;
 use function class_exists;
 use function count;
@@ -56,6 +57,7 @@
 use function is_file;
 use function is_readable;
 use function is_string;
+use function PHPStan\collectNewAutoloadFunctions;
 use function register_shutdown_function;
 use function spl_autoload_functions;
 use function sprintf;
@@ -526,18 +528,15 @@ public static function begin(
 		$autoloadFunctionsAfter = spl_autoload_functions();
 
 		if ($autoloadFunctionsBefore !== false && $autoloadFunctionsAfter !== false) {
-			$newAutoloadFunctions = $GLOBALS['__phpstanAutoloadFunctions'] ?? [];
-			foreach ($autoloadFunctionsAfter as $after) {
-				foreach ($autoloadFunctionsBefore as $before) {
-					if ($after === $before) {
-						continue 2;
-					}
-				}
-
-				$newAutoloadFunctions[] = $after;
-			}
-
-			$GLOBALS['__phpstanAutoloadFunctions'] = $newAutoloadFunctions;
+			$collectedAutoloadFunctions = collectNewAutoloadFunctions($autoloadFunctionsBefore, $autoloadFunctionsAfter);
+			$GLOBALS['__phpstanAutoloadFunctions'] = array_merge(
+				$GLOBALS['__phpstanAutoloadFunctions'] ?? [],
+				$collectedAutoloadFunctions['appended'],
+			);
+			$GLOBALS['__phpstanAutoloadFunctionsPrependedToComposer'] = array_merge(
+				$GLOBALS['__phpstanAutoloadFunctionsPrependedToComposer'] ?? [],
+				$collectedAutoloadFunctions['prepended'],
+			);
 		}
 
 		if (PHP_VERSION_ID >= 80000) {

src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php

@@ -98,12 +98,18 @@ public function create(): SourceLocator
 			}
 
 			$astLocator = new Locator($this->parser);
+
+			// Custom autoloaders that bootstrap files registered *before* Composer's
+			// class loader (e.g. spl_autoload_register($fn, true, true)) run before
+			// Composer resolves the class at runtime, so they are consulted before
+			// the static source locators below - mirroring that runtime order.
 			$locators[] = new AutoloadFunctionsSourceLocator(
 				new AutoloadSourceLocator($this->fileNodesFetcher, false),
 				new ReflectionClassSourceLocator(
 					$astLocator,
 					$this->reflectionSourceStubber,
 				),
+				true,
 			);
 
 			$analysedDirectories = [];
@@ -184,6 +190,22 @@ public function create(): SourceLocator
 				$this->phpVersion,
 			));
 
+			// Custom autoloaders registered *after* Composer's class loader are
+			// consulted only as a fallback, after the static locators above
+			// (analysed files, Composer class map/PSR-4, PHP internals). At runtime
+			// Composer's class loader resolves such classes first, so these custom
+			// autoloaders are never invoked for them - invoking them eagerly here
+			// would run code paths that cannot happen at runtime. They remain useful
+			// for classes that only a custom autoloader can produce (e.g. eval'd).
+			$locators[] = new AutoloadFunctionsSourceLocator(
+				new AutoloadSourceLocator($this->fileNodesFetcher, false),
+				new ReflectionClassSourceLocator(
+					$astLocator,
+					$this->reflectionSourceStubber,
+				),
+				false,
+			);
+
 			$locators[] = new AutoloadSourceLocator($this->fileNodesFetcher, true);
 			$locators[] = new PhpVersionBlacklistSourceLocator(new PhpInternalSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);
 			$locators[] = new PhpVersionBlacklistSourceLocator(new EvaledCodeSourceLocator($astLocator, $this->reflectionSourceStubber), $this->phpstormStubsSourceStubber);

src/Reflection/BetterReflection/SourceLocator/AutoloadFunctionsSourceLocator.php

@@ -11,14 +11,21 @@
 use function class_exists;
 use function interface_exists;
 use function PHPStan\autoloadFunctions;
+use function PHPStan\autoloadFunctionsPrependedToComposer;
 use function trait_exists;
 
 final class AutoloadFunctionsSourceLocator implements SourceLocator
 {
 
+	/**
+	 * @param bool $prependedToComposer When true, consult only the autoloaders
+	 *   registered before Composer's class loader (prepended); otherwise consult
+	 *   the ones registered after it (appended).
+	 */
 	public function __construct(
 		private AutoloadSourceLocator $autoloadSourceLocator,
 		private ReflectionClassSourceLocator $reflectionClassSourceLocator,
+		private bool $prependedToComposer,
 	)
 	{
 	}
@@ -35,7 +42,9 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
 			return null;
 		}
 
-		$autoloadFunctions = autoloadFunctions();
+		$autoloadFunctions = $this->prependedToComposer
+			? autoloadFunctionsPrependedToComposer()
+			: autoloadFunctions();
 		foreach ($autoloadFunctions as $autoloadFunction) {
 			$autoloadFunction($className);
 			$reflection = $this->autoloadSourceLocator->locateIdentifier($reflector, $identifier);