Fix test

phpstan · Jan 4, 2023 · 752baaf · 752baaf
1 parent 02753c6
commit 752baaf
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/Command/AnalyseCommand.php b/src/Command/AnalyseCommand.php
@@ -98,7 +98,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
 		if ((bool) $input->getOption('debug')) {
 			$application = $this->getApplication();
 			if ($application === null) {
-				throw new ShouldNotHappenException();
+				return;
 			}
 			$application->setCatchExceptions(false);
 			return;

diff --git a/tests/PHPStan/Command/AnalyseCommandTest.php b/tests/PHPStan/Command/AnalyseCommandTest.php
@@ -50,12 +50,24 @@ public function testInvalidAutoloadFile(): void
 
 	public function testValidAutoloadFile(): void
 	{
+		$originalDir = getcwd();
+		if ($originalDir === false) {
+			throw new ShouldNotHappenException();
+		}
+
 		$autoloadFile = __DIR__ . DIRECTORY_SEPARATOR . 'data/autoload-file.php';
 
-		$output = $this->runCommand(0, ['--autoload-file' => $autoloadFile]);
-		$this->assertStringContainsString('[OK] No errors', $output);
-		$this->assertStringNotContainsString(sprintf('Autoload file "%s" not found.' . PHP_EOL, $autoloadFile), $output);
-		$this->assertSame('magic value', SOME_CONSTANT_IN_AUTOLOAD_FILE);
+		chdir(__DIR__);
+
+		try {
+			$output = $this->runCommand(0, ['--autoload-file' => $autoloadFile]);
+			$this->assertStringContainsString('[OK] No errors', $output);
+			$this->assertStringNotContainsString(sprintf('Autoload file "%s" not found.' . PHP_EOL, $autoloadFile), $output);
+			$this->assertSame('magic value', SOME_CONSTANT_IN_AUTOLOAD_FILE);
+		} catch (Throwable $e) {
+			chdir($originalDir);
+			throw $e;
+		}
 	}
 
 	/**
@@ -96,9 +108,10 @@ private function runCommand(int $expectedStatusCode, array $parameters = []): st
 
 		$commandTester->execute([
 			'paths' => [__DIR__ . DIRECTORY_SEPARATOR . 'test'],
-		] + $parameters);
+			'--debug' => true,
+		] + $parameters, ['debug' => true]);
 
-		$this->assertSame($expectedStatusCode, $commandTester->getStatusCode());
+		$this->assertSame($expectedStatusCode, $commandTester->getStatusCode(), $commandTester->getDisplay());
 
 		return $commandTester->getDisplay();
 	}

diff --git a/tests/PHPStan/Command/test/empty.php b/tests/PHPStan/Command/test/empty.php
@@ -0,0 +1 @@
+<?php declare(strict_types = 1);