Skip to content

Commit 556ab3b

Browse files
Bump deps, PHP >= 8.1
1 parent 2d3822e commit 556ab3b

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/ci.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ jobs:
2020
fail-fast: false
2121
matrix:
2222
include:
23-
- php: '8.0'
24-
composer: 2.2.x
2523
- php: '8.1'
24+
composer: 2.1.x
2625
- php: '8.2'
2726
- php: '8.3'
2827
- php: '8.4'
29-
- php: '8.1'
28+
- php: '8.5'
3029
mode: low-deps
3130

3231
steps:
@@ -40,7 +39,7 @@ jobs:
4039
php-version: ${{ matrix.php }}
4140
tools: composer:${{ matrix.composer }}
4241

43-
- if: matrix.php == '8.0'
42+
- if: matrix.php == '8.1'
4443
name: "Lint PHP files"
4544
run: |
4645
find src/ -name '*.php' | xargs -n1 php -l
@@ -53,6 +52,7 @@ jobs:
5352
run: |
5453
if [[ "${{ matrix.mode }}" = low-deps ]]; then
5554
composer u --prefer-lowest --prefer-stable --ansi
55+
composer u symfony/phpunit-bridge
5656
else
5757
composer u --ansi
5858
fi

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
],
1212
"minimum-stability": "dev",
1313
"require": {
14-
"php": ">=8.0",
14+
"php": ">=8.1",
1515
"composer-plugin-api": "^2.1"
1616
},
1717
"require-dev": {
1818
"composer/composer": "^2.1",
19-
"symfony/dotenv": "^5.4|^6.0",
20-
"symfony/filesystem": "^5.4|^6.0",
21-
"symfony/phpunit-bridge": "^5.4|^6.0",
22-
"symfony/process": "^5.4|^6.0"
19+
"symfony/dotenv": "^6.4|^7.4|^8.0",
20+
"symfony/filesystem": "^6.4|^7.4|^8.0",
21+
"symfony/phpunit-bridge": "^6.4|^7.4|^8.0",
22+
"symfony/process": "^6.4|^7.4|^8.0"
2323
},
2424
"conflict": {
2525
"composer/semver": "<1.7.2"

src/Command/DumpEnvCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private function loadEnv(string $path, ?string $env, array $runtime): array
136136
}
137137
}
138138

139-
unset($_ENV['SYMFONY_DOTENV_VARS']);
139+
unset($_ENV['SYMFONY_DOTENV_VARS'], $_ENV['SYMFONY_DOTENV_PATH']);
140140
$env = $_ENV;
141141
} finally {
142142
list($_SERVER, $_ENV) = $globalsBackup;

0 commit comments

Comments
 (0)