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

phpstan-bot · web-flow · commit e2646b1681e8 · 2026-03-11T22:13:22.000+01:00
diff --git a/src/Command/FixerApplication.php b/src/Command/FixerApplication.php
@@ -302,7 +302,7 @@ private function downloadPhar(
 	): void
 	{
 		$currentVersion = null;
-		$branch = '2.0.x';
+		$branch = '2.1.x';
 		if (is_file($pharPath) && is_file($infoPath)) {
 			/** @var array{version: string, date: string, branch?: string} $currentInfo */
 			$currentInfo = Json::decode(FileReader::read($infoPath), Json::FORCE_ARRAY);

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ private function downloadPhar(`
`302`	`302`	`): void`
`303`	`303`	`{`
`304`	`304`	`$currentVersion = null;`
`305`		`- $branch = '2.0.x';`
	`305`	`+ $branch = '2.1.x';`
`306`	`306`	`if (is_file($pharPath) && is_file($infoPath)) {`
`307`	`307`	`/** @var array{version: string, date: string, branch?: string} $currentInfo */`
`308`	`308`	`$currentInfo = Json::decode(FileReader::read($infoPath), Json::FORCE_ARRAY);`