Merge branch '11.5'

Author: sebastianbergmann

src/Logging/TeamCity/TeamCityLogger.php

@@ -49,7 +49,7 @@ final class TeamCityLogger
     private readonly Printer $printer;
     private bool $isSummaryTestCountPrinted = false;
     private ?HRTime $time                   = null;
-    private ?int $flowId;
+    private ?int $flowId                    = null;
 
     /**
      * @throws EventFacadeIsSealedException

src/Runner/PHPT/PhptTestCase.php

@@ -617,6 +617,7 @@ private function parseExternal(array &$sections): void
             'EXPECTF',
             'EXPECTREGEX',
         ];
+
         $testDirectory = dirname($this->filename) . DIRECTORY_SEPARATOR;
 
         foreach ($allowSections as $section) {
@@ -631,7 +632,11 @@ private function parseExternal(array &$sections): void
                     );
                 }
 
-                $sections[$section] = file_get_contents($testDirectory . $externalFilename);
+                $contents = file_get_contents($testDirectory . $externalFilename);
+
+                assert($contents !== false && $contents !== '');
+
+                $sections[$section] = $contents;
             }
         }
     }
@@ -764,9 +769,11 @@ private function renderForCoverage(string &$job, bool $pathCoverage, ?string $co
 
         file_put_contents($files['job'], $job);
 
-        $job = $template->render();
+        $rendered = $template->render();
+
+        assert($rendered !== '');
 
-        assert($job !== '');
+        $job = $rendered;
     }
 
     private function cleanupForCoverage(): RawCodeCoverageData

src/TextUI/Command/Commands/VersionCheckCommand.php

@@ -41,8 +41,6 @@ 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;
 

src/TextUI/Configuration/Cli/Configuration.php

@@ -1795,7 +1795,7 @@ public function teamcityLogfile(): string
     }
 
     /**
-     * @phpstan-assert-if-true !null $this->teamcityPrinter
+     * @phpstan-assert-if-true !null $this->teamCityPrinter
      */
     public function hasTeamCityPrinter(): bool
     {
@@ -1937,7 +1937,7 @@ public function testSuite(): string
     }
 
     /**
-     * @phpstan-assert-if-true !null $this->excludedTestSuite
+     * @phpstan-assert-if-true !null $this->excludeTestSuite
      */
     public function hasExcludedTestSuite(): bool
     {

src/TextUI/Configuration/Configuration.php

@@ -142,12 +142,12 @@
     /**
      * @var list<non-empty-string>
      */
-    private ?array $groups;
+    private array $groups;
 
     /**
      * @var list<non-empty-string>
      */
-    private ?array $excludeGroups;
+    private array $excludeGroups;
     private int $randomOrderSeed;
     private TestSuiteCollection $testSuite;
     private string $includeTestSuite;

src/TextUI/Help.php

@@ -32,7 +32,7 @@ final class Help
     private const string LEFT_MARGIN       = '  ';
     private int $lengthOfLongestOptionName = 0;
     private readonly int $columnsAvailableForDescription;
-    private ?bool $hasColor;
+    private bool $hasColor;
 
     public function __construct(?int $width = null, ?bool $withColor = null)
     {