Merge branch '11.4' into 11.5

Author: sebastianbergmann

src/TextUI/Command/Commands/VersionCheckCommand.php

@@ -41,6 +41,8 @@ public function execute(): Result
 
         $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $this->majorVersionNumber);
 
+        assert($latestCompatibleVersion !== false);
+
         $notLatest           = version_compare($latestVersion, $this->versionId, '>');
         $notLatestCompatible = false;
 

tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php

@@ -9,7 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
-use function trim;
+use const PHP_EOL;
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Small;
@@ -28,27 +28,27 @@ public static function provider(): array
     {
         return [
             [
-                'You are using the latest version of PHPUnit.',
+                'You are using the latest version of PHPUnit.' . PHP_EOL,
                 Result::SUCCESS,
                 10,
                 '10.5.0',
                 '10.5.0',
                 '10.5.0',
             ],
             [
-                'You are not using the latest version of PHPUnit.
-The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.
-The latest version is PHPUnit 10.5.1.',
+                'You are not using the latest version of PHPUnit.' . PHP_EOL .
+                'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL .
+                'The latest version is PHPUnit 10.5.1.' . PHP_EOL,
                 Result::FAILURE,
                 10,
                 '10.5.0',
                 '10.5.1',
                 '10.5.1',
             ],
             [
-                'You are not using the latest version of PHPUnit.
-The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.
-The latest version is PHPUnit 11.0.0.',
+                'You are not using the latest version of PHPUnit.' . PHP_EOL .
+                'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL .
+                'The latest version is PHPUnit 11.0.0.' . PHP_EOL,
                 Result::FAILURE,
                 10,
                 '10.5.0',
@@ -77,7 +77,7 @@ public function testChecksVersion(string $expectedMessage, int $expectedShellExi
 
         $result = $command->execute();
 
-        $this->assertSame($expectedMessage, trim($result->output()));
+        $this->assertSame($expectedMessage, $result->output());
         $this->assertSame($expectedShellExitCode, $result->shellExitCode());
     }