Upgrade to PHP 8.1 & PHPUnit 12

Author: HypeMC

.github/workflows/ci.yaml

@@ -3,12 +3,6 @@ name: "CI"
 on:
     pull_request:
     push:
-        branches:
-            - '1.x'
-            - '2.x'
-
-env:
-    SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
 
 jobs:
     tests:
@@ -20,9 +14,8 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                  - php: '8.0'
-                    composer: 2.2.x
                   - php: '8.1'
+                    composer: 2.2.x
                   - php: '8.2'
                   - php: '8.3'
                   - php: '8.4'
@@ -40,7 +33,7 @@ jobs:
                   php-version: ${{ matrix.php }}
                   tools: composer:${{ matrix.composer }}
 
-            - if: matrix.php == '8.0'
+            - if: matrix.php == '8.1'
               name: "Lint PHP files"
               run: |
                 find src/ -name '*.php' | xargs -n1 php -l
@@ -57,7 +50,5 @@ jobs:
                     composer u --ansi
                 fi
 
-            - name: "Install PHPUnit"
-              run: vendor/bin/simple-phpunit install
-
-            - run: vendor/bin/simple-phpunit
+            - name: "Run tests"
+              run: vendor/bin/phpunit

.gitignore

@@ -1,5 +1,5 @@
 /vendor/
 /build/
-.phpunit.result.cache
+/.phpunit.cache
 .php_cs.cache
 composer.lock

composer.json

@@ -11,14 +11,14 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "composer-plugin-api": "^2.1"
     },
     "require-dev": {
         "composer/composer": "^2.1",
+        "phpunit/phpunit": "^10.5|^11.5|^12.4",
         "symfony/dotenv": "^5.4|^6.0",
         "symfony/filesystem": "^5.4|^6.0",
-        "symfony/phpunit-bridge": "^5.4|^6.0",
         "symfony/process": "^5.4|^6.0"
     },
     "conflict": {

phpunit.xml.dist

@@ -1,30 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         backupGlobals="true"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
+         failOnNotice="true"
+         failOnWarning="true"
          bootstrap="tests/bootstrap.php"
+         cacheDirectory=".phpunit.cache"
 >
-  <testsuites>
-    <testsuite name="Symfony Flex Test Suite">
-      <directory>./tests</directory>
-    </testsuite>
-  </testsuites>
+    <testsuites>
+        <testsuite name="Symfony Flex Test Suite">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
 
-  <php>
-    <ini name="error_reporting" value="-1" />
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-    <env name="LC_ALL" value="C" />
-  </php>
-
-  <filter>
-      <whitelist>
-          <directory>./src/</directory>
-      </whitelist>
-  </filter>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
 </phpunit>

src/Command/DumpEnvCommand.php

@@ -33,7 +33,7 @@ public function __construct(Config $config, Options $options)
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('symfony:dump-env')
             ->setAliases(['dump-env'])

src/Command/InstallRecipesCommand.php

@@ -38,7 +38,7 @@ public function __construct(/* cannot be type-hinted */ $flex, string $rootDir,
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('symfony:recipes:install')
             ->setAliases(['recipes:install', 'symfony:sync-recipes', 'sync-recipes', 'fix-recipes'])

src/Command/RecipesCommand.php

@@ -44,7 +44,7 @@ public function __construct(/* cannot be type-hinted */ $flex, Lock $symfonyLock
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('symfony:recipes')
             ->setAliases(['recipes'])

src/Command/UpdateRecipesCommand.php

@@ -51,7 +51,7 @@ public function __construct(/* cannot be type-hinted */ $flex, Downloader $downl
         parent::__construct();
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->setName('symfony:recipes:update')
             ->setAliases(['recipes:update'])

src/Flex.php

@@ -197,10 +197,12 @@ class_exists(__NAMESPACE__.str_replace('/', '\\', substr($file, \strlen(__DIR__)
                 BasePackage::$stabilities['dev'] = 1 + BasePackage::STABILITY_STABLE;
             }
 
-            $app->add(new Command\RecipesCommand($this, $this->lock, $rfs));
-            $app->add(new Command\InstallRecipesCommand($this, $this->options->get('root-dir'), $this->options->get('runtime')['dotenv_path'] ?? '.env'));
-            $app->add(new Command\UpdateRecipesCommand($this, $this->downloader, $rfs, $this->configurator, $this->options->get('root-dir')));
-            $app->add(new Command\DumpEnvCommand($this->config, $this->options));
+            $app->addCommands([
+                new Command\RecipesCommand($this, $this->lock, $rfs),
+                new Command\InstallRecipesCommand($this, $this->options->get('root-dir'), $this->options->get('runtime')['dotenv_path'] ?? '.env'),
+                new Command\UpdateRecipesCommand($this, $this->downloader, $rfs, $this->configurator, $this->options->get('root-dir')),
+                new Command\DumpEnvCommand($this->config, $this->options),
+            ]);
 
             break;
         }

tests/Command/DumpEnvCommandTest.php

@@ -13,6 +13,8 @@
 
 use Composer\Config;
 use Composer\Console\Application;
+use PHPUnit\Framework\Attributes\BackupGlobals;
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Flex\Command\DumpEnvCommand;
@@ -82,9 +84,7 @@ public function testEmptyOptionMustIgnoreContent()
         unlink($envLocal);
     }
 
-    /**
-     * @backupGlobals enabled
-     */
+    #[BackupGlobals(true)]
     public function testEnvCanBeReferenced()
     {
         @mkdir(FLEX_TEST_DIR);
@@ -164,9 +164,7 @@ public function testDoesNotRequireToSpecifyEnvArgumentWhenLocalFileIsPresent()
         unlink($envLocalPhp);
     }
 
-    /**
-     * @runInSeparateProcess
-     */
+    #[RunInSeparateProcess]
     public function testLoadLocalEnvWhenTestEnvIsNotEqual()
     {
         @mkdir(FLEX_TEST_DIR);
@@ -210,7 +208,11 @@ private function createCommandDumpEnv(array $options = [])
         );
 
         $application = new Application();
-        $application->add($command);
+        if (method_exists($application, 'addCommand')) {
+            $application->addCommand($command);
+        } else {
+            $application->add($command);
+        }
         $command = $application->find('dump-env');
 
         return new CommandTester($command);