Merge branch '8.5' into 9.6

Author: sebastianbergmann

src/TextUI/Command.php

@@ -598,17 +598,31 @@ protected function handleVersionCheck(): void
     {
         $this->printVersionString();
 
-        $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit');
-        $isOutdated    = version_compare($latestVersion, Version::id(), '>');
+        $latestVersion           = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit');
+        $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]);
 
-        if ($isOutdated) {
+        $notLatest           = version_compare($latestVersion, Version::id(), '>');
+        $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>');
+
+        if ($notLatest || $notLatestCompatible) {
+            print 'You are not using the latest version of PHPUnit.' . PHP_EOL;
+        } else {
+            print 'You are using the latest version of PHPUnit.' . PHP_EOL;
+        }
+
+        if ($notLatestCompatible) {
+            printf(
+                'The latest version compatible with PHPUnit %s is PHPUnit %s.' . PHP_EOL,
+                Version::id(),
+                $latestCompatibleVersion
+            );
+        }
+
+        if ($notLatest) {
             printf(
-                'You are not using the latest version of PHPUnit.' . PHP_EOL .
                 'The latest version is PHPUnit %s.' . PHP_EOL,
                 $latestVersion,
             );
-        } else {
-            print 'You are using the latest version of PHPUnit.' . PHP_EOL;
         }
 
         exit(TestRunner::SUCCESS_EXIT);

src/TextUI/Help.php

@@ -273,7 +273,7 @@ private function elements(): array
             ['arg' => '-h|--help', 'desc' => 'Prints this usage information'],
             ['arg' => '--version', 'desc' => 'Prints the version and exits'],
             ['arg' => '--atleast-version <min>', 'desc' => 'Checks that version is greater than min and exits'],
-            ['arg' => '--check-version', 'desc' => 'Check whether PHPUnit is the latest version'],
+            ['arg' => '--check-version', 'desc' => 'Checks whether PHPUnit is the latest version and exits'],
         ];
 
         return $elements;

tests/end-to-end/_files/output-cli-help-color.txt

@@ -139,6 +139,6 @@
   --version                   Prints the version and exits
   --atleast-version <min>     Checks that version is greater than min
                               and exits
-  --check-version             Check whether PHPUnit is the latest
-                              version
+  --check-version             Checks whether PHPUnit is the latest
+                              version and exits
 

tests/end-to-end/_files/output-cli-usage.txt

@@ -109,4 +109,4 @@ Miscellaneous Options:
   -h|--help                   Prints this usage information
   --version                   Prints the version and exits
   --atleast-version <min>     Checks that version is greater than min and exits
-  --check-version             Check whether PHPUnit is the latest version
+  --check-version             Checks whether PHPUnit is the latest version and exits