Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Internal/AgentDetector.php

@@ -4,51 +4,40 @@
 
 use function file_exists;
 use function getenv;
-use function is_string;
 use function trim;
 
 final class AgentDetector
 {
 
+	public const ENV_VARS = [
+		'AI_AGENT',
+		'CURSOR_TRACE_ID',
+		'CURSOR_AGENT',
+		'GEMINI_CLI',
+		'CODEX_SANDBOX',
+		'AUGMENT_AGENT',
+		'OPENCODE_CLIENT',
+		'OPENCODE',
+		'CLAUDECODE',
+		'CLAUDE_CODE',
+		'REPL_ID',
+	];
+
 	public static function isRunningInAgent(): bool
 	{
 		// Copyright (c) Pushpak Chhajed pushpak1300@gmail.com
 		// from https://github.com/shipfastlabs/agent-detector/blob/98766473b2dfe183b0c2605ceb04e587a78d1872/src/AgentDetector.php
 
-		$aiAgent = getenv('AI_AGENT');
-		if (is_string($aiAgent) && trim($aiAgent) !== '') {
-			return true;
-		}
-
-		if (getenv('CURSOR_TRACE_ID') !== false) {
-			return true;
-		}
-
-		if (getenv('CURSOR_AGENT') !== false) {
-			return true;
-		}
-
-		if (getenv('GEMINI_CLI') !== false) {
-			return true;
-		}
+		foreach (self::ENV_VARS as $envVar) {
+			$value = getenv($envVar);
+			if ($value === false) {
+				continue;
+			}
 
-		if (getenv('CODEX_SANDBOX') !== false) {
-			return true;
-		}
-
-		if (getenv('AUGMENT_AGENT') !== false) {
-			return true;
-		}
-
-		if (getenv('OPENCODE_CLIENT') !== false || getenv('OPENCODE') !== false) {
-			return true;
-		}
-
-		if (getenv('CLAUDECODE') !== false || getenv('CLAUDE_CODE') !== false) {
-			return true;
-		}
+			if ($envVar === 'AI_AGENT' && trim($value) === '') {
+				continue;
+			}
 
-		if (getenv('REPL_ID') !== false) {
 			return true;
 		}
 

tests/PHPStan/Command/ErrorFormatter/RawErrorFormatterTest.php

@@ -2,13 +2,37 @@
 
 namespace PHPStan\Command\ErrorFormatter;
 
+use Override;
+use PHPStan\Internal\AgentDetector;
 use PHPStan\Testing\ErrorFormatterTestCase;
 use PHPUnit\Framework\Attributes\DataProvider;
+use function getenv;
+use function putenv;
 use function sprintf;
 
 class RawErrorFormatterTest extends ErrorFormatterTestCase
 {
 
+	/** @var array<string, string|false> */
+	private array $originalEnvVars = [];
+
+	#[Override]
+	protected function setUp(): void
+	{
+		foreach (AgentDetector::ENV_VARS as $var) {
+			$this->originalEnvVars[$var] = getenv($var);
+			putenv($var);
+		}
+	}
+
+	#[Override]
+	protected function tearDown(): void
+	{
+		foreach (AgentDetector::ENV_VARS as $var) {
+			putenv($var . ($this->originalEnvVars[$var] !== false ? '=' . $this->originalEnvVars[$var] : ''));
+		}
+	}
+
 	public static function dataFormatterOutputProvider(): iterable
 	{
 		yield [
@@ -125,4 +149,21 @@ public function testFormatErrors(
 		$this->assertSame($expected, $this->getOutputContent(false, $verbose), sprintf('%s: output do not match', $message));
 	}
 
+	public function testFormatErrorsInAgent(): void
+	{
+		putenv('AI_AGENT=1');
+
+		$formatter = new RawErrorFormatter();
+
+		$this->assertSame(1, $formatter->formatErrors(
+			$this->getAnalysisResult([5, 1], 0),
+			$this->getOutput(false, false),
+		));
+
+		$this->assertSame(
+			'/data/folder/with space/and unicode 😃/project/foo.php:5:Foobar\Buz [identifier=foobar.buz]' . "\n",
+			$this->getOutputContent(false, false),
+		);
+	}
+
 }