From fa0495548581c94765284b3c159934f6119a5950 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 30 Oct 2025 15:07:41 +0100
Subject: [PATCH] Bump deps, PHP >= 8.1

---
 .github/workflows/ci.yaml      |  8 ++++----
 composer.json                  | 10 +++++-----
 src/Command/DumpEnvCommand.php |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d4e3a0f5..042ca75b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -20,13 +20,12 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                  - php: '8.0'
-                    composer: 2.2.x
                   - php: '8.1'
+                    composer: 2.1.x
                   - php: '8.2'
                   - php: '8.3'
                   - php: '8.4'
-                  - php: '8.1'
+                  - php: '8.5'
                     mode: low-deps
 
         steps:
@@ -40,7 +39,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
@@ -53,6 +52,7 @@ jobs:
               run: |
                 if [[ "${{ matrix.mode }}" = low-deps ]]; then
                     composer u --prefer-lowest --prefer-stable --ansi
+                    composer u symfony/phpunit-bridge
                 else
                     composer u --ansi
                 fi
diff --git a/composer.json b/composer.json
index d6b8f85a..8fdc1b5c 100644
--- a/composer.json
+++ b/composer.json
@@ -11,15 +11,15 @@
     ],
     "minimum-stability": "dev",
     "require": {
-        "php": ">=8.0",
+        "php": ">=8.1",
         "composer-plugin-api": "^2.1"
     },
     "require-dev": {
         "composer/composer": "^2.1",
-        "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"
+        "symfony/dotenv": "^6.4|^7.4|^8.0",
+        "symfony/filesystem": "^6.4|^7.4|^8.0",
+        "symfony/phpunit-bridge": "^6.4|^7.4|^8.0",
+        "symfony/process": "^6.4|^7.4|^8.0"
     },
     "conflict": {
         "composer/semver": "<1.7.2"
diff --git a/src/Command/DumpEnvCommand.php b/src/Command/DumpEnvCommand.php
index 69023a5f..7b109dcf 100644
--- a/src/Command/DumpEnvCommand.php
+++ b/src/Command/DumpEnvCommand.php
@@ -136,7 +136,7 @@ private function loadEnv(string $path, ?string $env, array $runtime): array
                 }
             }
 
-            unset($_ENV['SYMFONY_DOTENV_VARS']);
+            unset($_ENV['SYMFONY_DOTENV_VARS'], $_ENV['SYMFONY_DOTENV_PATH']);
             $env = $_ENV;
         } finally {
             list($_SERVER, $_ENV) = $globalsBackup;