Merge branch '1.6.x' into 1.7.x

Author: ondrejmirtes

src/Reflection/BetterReflection/SourceLocator/AutoloadSourceLocator.php

@@ -28,6 +28,7 @@
 use function interface_exists;
 use function is_file;
 use function is_string;
+use function opcache_invalidate;
 use function restore_error_handler;
 use function set_error_handler;
 use function spl_autoload_functions;
@@ -134,12 +135,23 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
 		if ($locateResult === null) {
 			return null;
 		}
-		[$potentiallyLocatedFile, $className, $startLine] = $locateResult;
+		[$potentiallyLocatedFiles, $className, $startLine] = $locateResult;
 		if ($startLine !== null) {
 			$this->startLineByClass[strtolower($className)] = $startLine;
 		}
 
-		return $this->findReflection($reflector, $potentiallyLocatedFile, new Identifier($className, $identifier->getType()), $startLine);
+		$newIdentifier = new Identifier($className, $identifier->getType());
+
+		foreach ($potentiallyLocatedFiles as $potentiallyLocatedFile) {
+			$reflection = $this->findReflection($reflector, $potentiallyLocatedFile, $newIdentifier, $startLine);
+			if ($reflection === null) {
+				continue;
+			}
+
+			return $reflection;
+		}
+
+		return null;
 	}
 
 	private function findReflection(Reflector $reflector, string $file, Identifier $identifier, ?int $startLine): ?Reflection
@@ -312,7 +324,7 @@ private function getReflectionClass(string $className): ?ReflectionClass
 	 * that it cannot find the file, so we squelch the errors by overriding the
 	 * error handler temporarily.
 	 *
-	 * @return array{string, string, int|null}|null
+	 * @return array{string[], string, int|null}|null
 	 */
 	private function locateClassByName(string $className): ?array
 	{
@@ -323,7 +335,7 @@ private function locateClassByName(string $className): ?array
 				return null;
 			}
 
-			return [$filename, $reflection->getName(), $reflection->getStartLine() !== false ? $reflection->getStartLine() : null];
+			return [[$filename], $reflection->getName(), $reflection->getStartLine() !== false ? $reflection->getStartLine() : null];
 		}
 
 		if (!$this->disableRuntimeReflectionProvider) {
@@ -333,8 +345,8 @@ private function locateClassByName(string $className): ?array
 		$this->silenceErrors();
 
 		try {
-			/** @var array{string, string, null}|null */
-			return FileReadTrapStreamWrapper::withStreamWrapperOverride(
+			/** @var array{string[], string, null}|null */
+			$result = FileReadTrapStreamWrapper::withStreamWrapperOverride(
 				static function () use ($className): ?array {
 					$functions = spl_autoload_functions();
 					if ($functions === false) {
@@ -350,14 +362,23 @@ static function () use ($className): ?array {
 						 *
 						 * This will not be `null` when the autoloader tried to read a file.
 						 */
-						if (FileReadTrapStreamWrapper::$autoloadLocatedFile !== null) {
-							return [FileReadTrapStreamWrapper::$autoloadLocatedFile, $className, null];
+						if (FileReadTrapStreamWrapper::$autoloadLocatedFiles !== []) {
+							return [FileReadTrapStreamWrapper::$autoloadLocatedFiles, $className, null];
 						}
 					}
 
 					return null;
 				},
 			);
+			if ($result === null) {
+				return null;
+			}
+
+			foreach ($result[0] as $file) {
+				opcache_invalidate($file, true);
+			}
+
+			return $result;
 		} finally {
 			restore_error_handler();
 		}

src/Reflection/BetterReflection/SourceLocator/FileReadTrapStreamWrapper.php

@@ -34,7 +34,8 @@ final class FileReadTrapStreamWrapper
 	/** @var string[]|null */
 	private static ?array $registeredStreamWrapperProtocols;
 
-	public static ?string $autoloadLocatedFile = null;
+	/** @var string[] */
+	public static array $autoloadLocatedFiles = [];
 
 	private bool $readFromFile = false;
 
@@ -55,7 +56,7 @@ public static function withStreamWrapperOverride(
 	)
 	{
 		self::$registeredStreamWrapperProtocols = $streamWrapperProtocols;
-		self::$autoloadLocatedFile = null;
+		self::$autoloadLocatedFiles = [];
 
 		try {
 			foreach ($streamWrapperProtocols as $protocol) {
@@ -71,7 +72,7 @@ public static function withStreamWrapperOverride(
 		}
 
 		self::$registeredStreamWrapperProtocols = null;
-		self::$autoloadLocatedFile = null;
+		self::$autoloadLocatedFiles = [];
 
 		return $result;
 	}
@@ -93,9 +94,7 @@ public static function withStreamWrapperOverride(
 	 */
 	public function stream_open($path, $mode, $options, &$openedPath): bool
 	{
-		if (self::$autoloadLocatedFile === null) {
-			self::$autoloadLocatedFile = $path;
-		}
+		self::$autoloadLocatedFiles[] = $path;
 		$this->readFromFile = false;
 		$this->seekPosition = 0;
 
@@ -139,11 +138,11 @@ public function stream_close(): void
 	 */
 	public function stream_stat()
 	{
-		if (self::$autoloadLocatedFile === null) {
+		if (self::$autoloadLocatedFiles === []) {
 			return false;
 		}
 
-		return $this->url_stat(self::$autoloadLocatedFile, STREAM_URL_STAT_QUIET);
+		return $this->url_stat(self::$autoloadLocatedFiles[0], STREAM_URL_STAT_QUIET);
 	}
 
 	/**