8000 [7.0] Bump to PHP 8.2 minimum · symfony/symfony@4519d88 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4519d88

Browse files
nicolas-grekasnicolas-grekas
committed
[7.0] Bump to PHP 8.2 minimum
1 parent 1e43ecd commit 4519d88

File tree

208 files changed

+968
-1273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+968
-1273
lines changed

‎.github/workflows/integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
strategy:
2525
matrix:
26-
php: ['8.1']
26+
php: ['8.2']
2727
fail-fast: false
2828

2929
services:
@@ -182,7 +182,7 @@ jobs:
182182
POSTGRES_HOST: localhost
183183

184184
#- name: Run HTTP push tests
185-
# if: matrix.php == '8.1'
185+
# if: matrix.php == '8.2'
186186
# run: |
187187
# [ -d .phpunit ] && mv .phpunit .phpunit.bak
188188
# wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin

‎.github/workflows/intl-data-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
coverage: "none"
5858
extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
5959
ini-values: "memory_limit=-1"
60-
php-version: "8.1"
60+
php-version: "8.2"
6161

6262
- name: Install dependencies
6363
run: |

‎.github/workflows/phpunit-bridge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: shivammathur/setup-php@v2
3333
with:
3434
coverage: "none"
35-
php-version: "7.1"
35+
php-version: "7.2"
3636

3737
- name: Lint
3838
run: find ./src/Symfony/Bridge/PhpUnit -name '*.php' | grep -v -e /Tests/ -e ForV7 -e ForV8 -e ForV9 -e ConstraintLogicTrait | parallel -j 4 php -l {}

‎.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: Ubuntu-20.04
2121

2222
env:
23-
php-version: '8.1'
23+
php-version: '8.2'
2424
steps:
2525
- name: Setup PHP
2626
uses: shivammathur/setup-php@v2
@@ -43,7 +43,7 @@ jobs:
4343
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
4444
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
4545
composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
46-
composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
46+
composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
4747
4848
- name: Generate Psalm baseline
4949
run: |

‎.github/workflows/unit-tests.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
strategy:
2727
matrix:
2828
include:
29-
- php: '8.1'
30-
- php: '8.1'
29+
- php: '8.2'
30+
- php: '8.2'
3131
mode: high-deps
32-
- php: '8.1'
33-
mode: low-deps
3432
- php: '8.2'
35-
#mode: experimental
33+
mode: low-deps
34+
#- php: '8.3'
35+
# mode: experimental
3636
fail-fast: false
3737

3838
runs-on: ubuntu-20.04
@@ -64,7 +64,7 @@ jobs:
6464
6565
echo COLUMNS=120 >> $GITHUB_ENV
6666
echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data,integration" >> $GITHUB_ENV
67-
echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.php }}" = "8.2" ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
67+
echo COMPOSER_UP='composer update --no-progress --ansi'$([[ "${{ matrix.php }}" = "8.3" ]] && echo ' --ignore-platform-req=php+') >> $GITHUB_ENV
6868
6969
SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
7070
SYMFONY_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | cut -d "'" -f2 | cut -d '.' -f 1-2)
@@ -123,7 +123,7 @@ jobs:
123123
124124
echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
125125
echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
126-
echo SYMFONY_REQUIRE="&g 57AE t;=$([ '${{ matrix.mode }}' = low-deps ] && echo 4.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
126+
echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
127127
[[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
128128
129129
- name: Install dependencies
@@ -137,19 +137,19 @@ jobs:
137137
echo "::endgroup::"
138138
139139
- name: Patch return types
140-
if: "matrix.php == '8.1' && ! matrix.mode"
140+
if: "matrix.php == '8.2' && ! matrix.mode"
141141
run: |
142142
patch -sp1 < .github/expected-missing-return-types.diff
143143
git add .
144144
composer install -q --optimize-autoloader || composer install --optimize-autoloader
145-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
145+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php
146146
git checkout src/Symfony/Contracts/Service/ResetInterface.php
147-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
147+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent
148148
git checkout src/Symfony/Contracts/Service/ResetInterface.php
149149
git diff --exit-code
150150
151151
- name: Check interface return types
152-
if: "matrix.php == '8.1' && ! matrix.mode"
152+
if: "matrix.php == '8.2' && ! matrix.mode"
153153
run: |
154154
php .github/patch-types.php lint
155155
@@ -199,8 +199,8 @@ jobs:
199199
(cd src/Symfony/Component/Lock; mv composer.bak composer.json)
200200
PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
201201
202-
# for 5.4 LTS, checkout and test previous major with the patched components (only for patched components)
203-
if [[ $PATCHED_COMPONENTS && $SYMFONY_VERSION = 5.4 ]]; then
202+
# for 6.4 LTS, checkout and test previous major with the patched components (only for patched components)
203+
if [[ $PATCHED_COMPONENTS && $SYMFONY_VERSION = 6.4 ]]; then
204204
export FLIP='^'
205205
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
206206
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
@@ -227,12 +227,12 @@ jobs:
227227
script -e -c './phpunit --group tty' /dev/null
228228
229229
- name: Run tests with SIGCHLD enabled PHP
230-
if: "matrix.php == '8.1' && ! matrix.mode"
230+
if: "matrix.php == '8.2' && ! matrix.mode"
231231
run: |
232232
mkdir build
233233
cd build
234-
wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.2-pcntl-sigchild.tar.bz2
235-
tar -xjf php-8.1.2-pcntl-sigchild.tar.bz2
234+
wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.6-pcntl-sigchild.tar.bz2
235+
tar -xjf php-8.2.6-pcntl-sigchild.tar.bz2
236236
cd ..
237237
238238
./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"symfony/translation-implementation": "2.3|3.0"
3434
},
3535
"require": {
36-
"php": ">=8.1",
36+
"php": ">=8.2",
3737
"composer-runtime-api": ">=2.1",
3838
"ext-xml": "*",
3939
"friendsofphp/proxy-manager-lts": "^1.0.2",
@@ -150,7 +150,7 @@
150150
"psr/http-client": "^1.0",
151151
"psr/simple-cache": "^1.0|^2.0|^3.0",
152152
"symfony/mercure-bundle": "^0.3",
153-
"symfony/phpunit-bridge": "^5.4|^6.0",
153+
"symfony/phpunit-bridge": "^6.4|^7.0",
154154
"symfony/runtime": "self.version",
155155
"symfony/security-acl": "~2.8|~3.0",
156156
"twig/cssinliner-extra": "^2.12|^3",

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=8.1",
19+
"php": ">=8.2",
2020
"doctrine/event-manager": "^1.2|^2",
2121
"doctrine/persistence": "^2|^3",
2222
"symfony/deprecation-contracts": "^2.5|^3",
@@ -25,24 +25,24 @@
2525
"symfony/service-contracts": "^2.5|^3"
2626
},
2727
"require-dev": {
28-
"symfony/cache": "^5.4|^6.0",
29-
"symfony/config": "^5.4|^6.0",
30-
"symfony/dependency-injection": "^6.2",
31-
"symfony/doctrine-messenger": "^5.4|^6.0",
32-
"symfony/expression-language": "^5.4|^6.0",
33-
"symfony/form": "^5.4.21|^6.2.7",
34-
"symfony/http-kernel": "^6.3",
35-
"symfony/lock": "^6.3",
36-
"symfony/messenger": "^5.4|^6.0",
37-
"symfony/property-access": "^5.4|^6.0",
38-
"symfony/property-info": "^5.4|^6.0",
39-
"symfony/proxy-manager-bridge": "^5.4|^6.0",
40-
"symfony/security-core": "^6.0",
41-
"symfony/stopwatch": "^5.4|^6.0",
42-
"symfony/translation": "^5.4|^6.0",
43-
"symfony/uid": "^5.4|^6.0",
44-
"symfony/validator": "^5.4|^6.0",
45-
"symfony/var-dumper": "^5.4|^6.0",
28+
"symfony/cache": "^6.4|^7.0",
29+
"symfony/config": "^6.4|^7.0",
30+
"symfony/dependency-injection": "^6.4|^7.0",
31+
"symfony/doctrine-messenger": "^6.4|^7.0",
32+
"symfony/expression-language": "^6.4|^7.0",
33+
"symfony/form": "^6.4|^7.0",
34+
"symfony/http-kernel": "^6.4|^7.0",
35+
"symfony/lock": "^6.4|^7.0",
36+
"symfony/messenger": "^6.4|^7.0",
37+
"symfony/property-access": "^6.4|^7.0",
38+
"symfony/property-info": "^6.4|^7.0",
39+
"symfony/proxy-manager-bridge": "^6.4|^7.0",
40+
"symfony/security-core": "^6.4|^7.0",
41+
"symfony/stopwatch": "^6.4|^7.0",
42+
"symfony/translation": "^6.4|^7.0",
43+
"symfony/uid": "^6.4|^7.0",
44+
"symfony/validator": "^6.4|^7.0",
45+
"symfony/var-dumper": "^6.4|^7.0",
4646
"doctrine/annotations": "^1.13.1|^2",
4747
"doctrine/collections": "^1.0|^2.0",
4848
"doctrine/data-fixtures": "^1.1",
@@ -56,17 +56,17 @@
5656
"doctrine/lexer": "<1.1",
5757
"doctrine/orm": "<2.12",
5858
"phpunit/phpunit": "<5.4.3",
59-
"symfony/cache": "<5.4",
60-
"symfony/dependency-injection": "<6.2",
61-
"symfony/form": "<5.4.21|>=6,<6.2.7",
62-
"symfony/http-foundation": "<6.3",
63-
"symfony/http-kernel": "<6.2",
64-
"symfony/lock": "<6.3",
65-
"symfony/messenger": "<5.4",
66-
"symfony/property-info": "<5.4",
67-
"symfony/security-bundle": "<5.4",
68-
"symfony/security-core": "<6.0",
69-
"symfony/validator": "<5.4"
59+
"symfony/cache": "<6.4",
60+
"symfony/dependency-injection": "<6.4",
61+
"symfony/form": "<6.4",
62+
"symfony/http-foundation": "<6.4",
63+
"symfony/http-kernel": "<6.4",
64+
"symfony/lock": "<6.4",
65+
"symfony/messenger": "<6.4",
66+
"symfony/property-info": "<6.4",
67+
"symfony/security-bundle": "<6.4",
68+
"symfony/security-core": "<6.4",
69+
"symfony/validator": "<6.4"
7070
},
7171
"autoload": {
7272
"psr-4": { "Symfony\\Bridge\\Doctrine\\": "" },

‎src/Symfony/Bridge/Monolog/composer.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=8.1",
19+
"php": ">=8.2",
2020
"monolog/monolog": "^1.25.1|^2|^3",
2121
"symfony/service-contracts": "^2.5|^3",
22-
"symfony/http-kernel": "^5.4|^6.0"
22+
"symfony/http-kernel": "^6.4|^7.0"
2323
},
2424
"require-dev": {
25-
"symfony/console": "^5.4|^6.0",
26-
"symfony/http-client": "^5.4|^6.0",
27-
"symfony/security-core": "^6.0",
28-
"symfony/var-dumper": "^5.4|^6.0",
29-
"symfony/mailer": "^5.4|^6.0",
30-
"symfony/mime": "^5.4|^6.0",
31-
"symfony/messenger": "^5.4|^6.0"
25+
"symfony/console": "^6.4|^7.0",
26+
"symfony/http-client": "^6.4|^7.0",
27+
"symfony/security-core": "^6.4|^7.0",
28+
"symfony/var-dumper": "^6.4|^7.0",
29+
"symfony/mailer": "^6.4|^7.0",
30+
"symfony/mime": "^6.4|^7.0",
31+
"symfony/messenger": "^6.4|^7.0"
3232
},
3333
"conflict": {
34-
"symfony/console": "<5.4",
35-
"symfony/http-foundation": "<5.4",
36-
"symfony/security-core": "<6.0"
34+
"symfony/console": "<6.4",
35+
"symfony/http-foundation": "<6.4",
36+
"symfony/security-core": "<6.4"
3737
},
3838
"autoload": {
3939
"psr-4": { "Symfony\\Bridge\\Monolog\\": "" },

‎src/Symfony/Bridge/PhpUnit/Tests/EnumExistsMockTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
use Symfony\Bridge\PhpUnit\Tests\Fixtures\ExistingEnum;
1717
use Symfony\Bridge\PhpUnit\Tests\Fixtures\ExistingEnumReal;
1818

19-
/**
20-
* @requires PHP 8.1
21-
*/
2219
class EnumExistsMockTest extends TestCase
2320
{
2421
public static function setUpBeforeClass(): void

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,11 +100,9 @@
100100
if (\PHP_VERSION_ID >= 80000) {
101101
// PHP 8 requires PHPUnit 9.3+, PHP 8.1 requires PHPUnit 9.5+
102102
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.5') ?: '9.5';
103-
} elseif (\PHP_VERSION_ID >= 70200) {
103+
} else {
104104
// PHPUnit 8 requires PHP 7.2+
105105
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '8.5') ?: '8.5';
106-
} else {
107-
$PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '7.5') ?: '7.5';
108106
}
109107

110108
$MAX_PHPUNIT_VERSION = $getEnvVar('SYMFONY_MAX_PHPUNIT_VERSION', false);

‎src/Symfony/Bridge/PhpUnit/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=7.1.3 EVEN ON LATEST SYMFONY VERSIONS TO ALLOW USING",
19+
"php": ">=7.2.5 EVEN ON LATEST SYMFONY VERSIONS TO ALLOW USING",
2020
"php": "THIS BRIDGE WHEN TESTING LOWEST SYMFONY VERSIONS.",
21-
"php": ">=7.1.3"
21+
"php": ">=7.2.5"
2222
},
2323
"require-dev": {
2424
"symfony/deprecation-contracts": "^2.5|^3.0",
25-
"symfony/error-handler": "^5.4|^6.0",
25+
"symfony/error-handler": "^6.4|^7.0",
2626
"symfony/polyfill-php81": "^1.27"
2727
},
2828
"conflict": {

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=8.1",
19+
"php": ">=8.2",
2020
"friendsofphp/proxy-manager-lts": "^1.0.2",
21-
"symfony/dependency-injection": "^6.3",
21+
"symfony/dependency-injection": "^6.4|^7.0",
2222
"symfony/deprecation-contracts": "^2.5|^3"
2323
},
2424
"require-dev": {
25-
"symfony/config": "^6.1"
25+
"symfony/config": "^6.4|^7.0"
2626
},
2727
"autoload": {
2828
"psr-4": { "Symfony\\Bridge\\ProxyManager\\": "" },

0 commit comments

Comments
 (0)
0