Fix composerAutoloaderProjectPaths array so that the items always refer to dir with composer.json in it

Author: ondrejmirtes

bin/phpstan

@@ -20,12 +20,13 @@ use Symfony\Component\Console\Helper\ProgressBar;
 
 	$devOrPharLoader = require_once __DIR__ . '/../vendor/autoload.php';
 	require_once __DIR__ . '/../preload.php';
+	$composerJsonPath = ComposerHelper::getComposerJsonPath(getcwd());
 	$composer = ComposerHelper::getComposerConfig(getcwd());
 
 	if ($composer !== null) {
 		$vendorDirectory = ComposerHelper::getVendorDirFromComposerConfig(getcwd(), $composer);
 	} else {
-		$vendorDirectory = getcwd() . '/' . 'vendor';
+		$vendorDirectory = getcwd() . '/vendor';
 	}
 	$devOrPharLoader->unregister();
 
@@ -43,7 +44,9 @@ use Symfony\Component\Console\Helper\ProgressBar;
 	$autoloadFunctionsBefore = spl_autoload_functions();
 
 	if (@is_file($autoloaderInWorkingDirectory)) {
-		$composerAutoloaderProjectPaths[] = dirname($autoloaderInWorkingDirectory, 2);
+		if ($composerJsonPath !== null) {
+			$composerAutoloaderProjectPaths[] = dirname($composerJsonPath);
+		}
 
 		require_once $autoloaderInWorkingDirectory;
 	}

src/Internal/ComposerHelper.php

@@ -26,10 +26,6 @@ public static function getComposerConfig(string $root): ?array
 	{
 		$composerJsonPath = self::getComposerJsonPath($root);
 
-		if (!is_file($composerJsonPath)) {
-			return null;
-		}
-
 		try {
 			$composerJsonContents = FileReader::read($composerJsonPath);
 
@@ -39,13 +35,18 @@ public static function getComposerConfig(string $root): ?array
 		}
 	}
 
-	private static function getComposerJsonPath(string $root): string
+	public static function getComposerJsonPath(string $root): ?string
 	{
 		$envComposer = getenv('COMPOSER');
 		$fileName = is_string($envComposer) ? $envComposer : 'composer.json';
 		$fileName = basename(trim($fileName));
 
-		return $root . '/' . $fileName;
+		$path = $root . '/' . $fileName;
+		if (!is_file($path)) {
+			return null;
+		}
+
+		return $path;
 	}
 
 	/**