Upgrade PHPUnit

Author: kylekatarnls

.github/workflows/tests.yml

@@ -45,7 +45,6 @@ jobs:
       if: steps.composer-cache.outputs.cache-hit != 'true'
       run: |
         composer config version 1.9.0
-        ${{ matrix.php >= 7.2 && matrix.php < 8 && matrix.setup == 'lowest' && 'composer require --no-update "phpunit/phpunit:^5.7.27||^6.5.14||^7.5.20" --no-interaction;' || '' }}
         composer update --prefer-dist ${{ matrix.setup != 'next' && format('--prefer-{0}', matrix.setup) || '' }} --no-progress ${{ matrix.php >= 8.1 && '--ignore-platform-req=php' || '' }} --no-interaction
 
     - name: Prepare git config

composer.json

@@ -29,7 +29,7 @@
         "friendsofphp/php-cs-fixer": "^2.15.0 || ^3.23.0",
         "nette/utils": "^3.2.10",
         "phan/phan": "^3.2.10 || ^5.4.2",
-        "phpunit/phpunit": "^8.5.33 || ^9.6.11",
+        "phpunit/phpunit": "^8.5.52 || ^9.6.34",
         "phpmd/phpmd": "^2.13.0",
         "phpstan/phpstan": "^0.11.15 || ^1.10.29",
         "squizlabs/php_codesniffer": "^3.7.2",

src/Phug/Split/Command/Analyze.php

@@ -16,7 +16,7 @@ class Analyze extends CommandBase
      *
      * Root project directory.
      *
-     * @var string
+     * @var truthy-string|false
      */
     public $directory = '.';
 
@@ -78,6 +78,7 @@ protected function calculatePackagesTree(Split $cli): bool
         return true;
     }
 
+    /** @psalm-suppress RiskyTruthyFalsyComparison */
     protected function getPackages(): iterable
     {
         if ($this->ast instanceof Traversable) {
@@ -121,6 +122,7 @@ protected function mapDirectories(string $directory, callable $callback): iterab
         }
     }
 
+    /** @return array{name: string, directory: string, children: array} */
     protected function getPackage(string $directory, array $data): array
     {
         return [

src/Phug/Split/Command/Dist.php

@@ -78,14 +78,14 @@ protected function distribute(Split $cli): bool
             return $cli->error('Unable to create output directory.');
         }
 
-        if (!preg_match('/^\* (.+)$/m', $this->git('branch', [], '2>&1') ?: '', $branch)) {
+        if (!preg_match('/^\* (.+)$/m', (string) $this->git('branch', [], '2>&1') ?: '', $branch)) {
             return $cli->error('You must be on a branch in a git repository to run this command.');
         }
 
         $branch = $branch[1];
 
         if (substr($branch, 0, 18) === '(HEAD detached at ') {
-            $branch = trim(explode("\n", $this->git('describe --contains --all HEAD', [], '2>&1') ?: '')[0]);
+            $branch = trim(explode("\n", (string) $this->git('describe --contains --all HEAD', [], '2>&1') ?: '')[0]);
         }
 
         foreach ($this->getPackages() as $package) {