Skip Composer loader directories where installed.json is not present

phpstan · Jan 6, 2020 · e4fe64c · e4fe64c
1 parent 9eedeac
commit e4fe64c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/bin/phpstan b/bin/phpstan
@@ -14,40 +14,32 @@ use PHPStan\Command\DumpDependenciesCommand;
 	$autoloaderInWorkingDirectory = getcwd() . '/vendor/autoload.php';
 	$composerAutoloaderProjectPaths = [];
 	if (is_file($autoloaderInWorkingDirectory)) {
-		$composerJsonPath = dirname($autoloaderInWorkingDirectory, 2);
-		if (is_file($composerJsonPath . '/composer.json')) {
-			$composerAutoloaderProjectPaths[] = $composerJsonPath;
-		}
+		$composerAutoloaderProjectPaths[] = dirname($autoloaderInWorkingDirectory, 2);
+
 		require_once $autoloaderInWorkingDirectory;
 	}
 
 	$autoloadProjectAutoloaderFile = function (string $file) use (&$composerAutoloaderProjectPaths): void {
 		$path = dirname(__DIR__) . $file;
 		if (!extension_loaded('phar')) {
 			if (is_file($path)) {
-				$composerJsonPath = dirname($path, 2);
-				if (is_file($composerJsonPath . '/composer.json')) {
-					$composerAutoloaderProjectPaths[] = $composerJsonPath;
-				}
+				$composerAutoloaderProjectPaths[] = dirname($path, 2);
+
 				require_once $path;
 			}
 		} else {
 			$pharPath = \Phar::running(false);
 			if ($pharPath === '') {
 				if (is_file($path)) {
-					$composerJsonPath = dirname($path, 2);
-					if (is_file($composerJsonPath . '/composer.json')) {
-						$composerAutoloaderProjectPaths[] = $composerJsonPath;
-					}
+					$composerAutoloaderProjectPaths[] = dirname($path, 2);
+
 					require_once $path;
 				}
 			} else {
 				$path = dirname($pharPath) . $file;
 				if (is_file($path)) {
-					$composerJsonPath = dirname($path, 2);
-					if (is_file($composerJsonPath . '/composer.json')) {
-						$composerAutoloaderProjectPaths[] = $composerJsonPath;
-					}
+					$composerAutoloaderProjectPaths[] = dirname($path, 2);
+
 					require_once $path;
 				}
 			}

diff --git a/src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php b/src/Reflection/BetterReflection/BetterReflectionSourceLocatorFactory.php
@@ -95,7 +95,11 @@ public function create(): SourceLocator
 		$locators = [];
 
 		foreach ($this->composerAutoloaderProjectPaths as $composerAutoloaderProjectPath) {
-			$locators[] = $this->composerJsonAndInstalledJsonSourceLocatorMaker->create($composerAutoloaderProjectPath);
+			$locator = $this->composerJsonAndInstalledJsonSourceLocatorMaker->create($composerAutoloaderProjectPath);
+			if ($locator === null) {
+				continue;
+			}
+			$locators[] =  $locator;
 		}
 
 		if ($this->enableScanningPaths) {

diff --git a/...lection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php b/...lection/BetterReflection/SourceLocator/ComposerJsonAndInstalledJsonSourceLocatorMaker.php
@@ -37,10 +37,16 @@ public function __construct(
 		$this->enableScanningPaths = $enableScanningPaths;
 	}
 
-	public function create(string $installationPath): SourceLocator
+	public function create(string $installationPath): ?SourceLocator
 	{
 		$composerJsonPath = $installationPath . '/composer.json';
+		if (!is_file($composerJsonPath)) {
+			return null;
+		}
 		$installedJsonPath = $installationPath . '/vendor/composer/installed.json';
+		if (!is_file($installedJsonPath)) {
+			return null;
+		}
 
 		$composerJsonContents = FileReader::read($composerJsonPath);
 		$composer = Json::decode($composerJsonContents, Json::FORCE_ARRAY);