Skip to content

Commit cfb451f

Browse files
nicolas-grekasnicolas-grekas
committed
feature #50404 [7.0] Bump to PHP 8.2 minimum (nicolas-grekas)
This PR was merged into the 7.0 branch. Discussion ---------- [7.0] Bump to PHP 8.2 minimum | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | yes | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - :rocket: Commits ------- 5eb8881 [7.0] Bump to PHP 8.2 minimum
2 parents 48bd035 + 5eb8881 commit cfb451f

File tree

203 files changed

+982
-1278
lines changed

Some content is hidden

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

203 files changed

+982
-1278
lines changed

‎.appveyor.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,29 @@ init:
1313

1414
install:
1515
- mkdir c:\php && cd c:\php
16-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.1.0-Win32-vs16-x86.zip
17-
- 7z x php-8.1.0-Win32-vs16-x86.zip -y >nul
16+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip
17+
- 7z x php-8.2.0-Win32-vs16-x86.zip -y >nul
1818
- cd ext
19-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.21-8.1-ts-vs16-x86.zip
20-
- 7z x php_apcu-5.1.21-8.1-ts-vs16-x86.zip -y >nul
21-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.1-ts-vs16-x86.zip
22-
- 7z x php_redis-5.3.7-8.1-ts-vs16-x86.zip -y >nul
19+
#- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip
20+
#- 7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul
21+
#- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.2-ts-vs16-x86.zip
22+
#- 7z x php_redis-5.3.7-8.2-ts-vs16-x86.zip -y >nul
2323
- cd ..
2424
- copy /Y php.ini-development php.ini-min
2525
- echo memory_limit=-1 >> php.ini-min
2626
- echo serialize_precision=-1 >> php.ini-min
2727
- echo max_execution_time=1200 >> php.ini-min
28-
- echo post_max_size=4G >> php.ini-min
29-
- echo upload_max_filesize=4G >> php.ini-min
28+
- echo post_max_size=2047M >> php.ini-min
29+
- echo upload_max_filesize=2047M >> php.ini-min
3030
- echo date.timezone="America/Los_Angeles" >> php.ini-min
3131
- echo extension_dir=ext >> php.ini-min
3232
- echo extension=php_xsl.dll >> php.ini-min
3333
- copy /Y php.ini-min php.ini-max
3434
- echo zend_extension=php_opcache.dll >> php.ini-max
3535
- echo opcache.enable_cli=1 >> php.ini-max
3636
- echo extension=php_openssl.dll >> php.ini-max
37-
- echo extension=php_apcu.dll >> php.ini-max
38-
- echo extension=php_redis.dll >> php.ini-max
37+
#- echo extension=php_apcu.dll >> php.ini-max
38+
#- echo extension=php_redis.dll >> php.ini-max
3939
- echo apc.enable_cli=1 >> php.ini-max
4040
- echo extension=php_intl.dll >> php.ini-max
4141
- echo extension=php_mbstring.dll >> php.ini-max
@@ -51,7 +51,8 @@ install:
5151
- git config --global user.name "Symfony"
5252
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F)
5353
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
54-
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
54+
#- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
55+
- SET COMPOSER_ROOT_VERSION=6.4.x-dev
5556
- php composer.phar update --no-progress --ansi
5657
- php phpunit install
5758
- choco install memurai-developer

‎.github/build-packages.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
1212
$version = array_shift($dirs);
1313

14+
if ('7.0' === $version) {
15+
$version = '6.4'; // to be removed once deps allow ^7.0
16+
}
17+
1418
$packages = [];
1519
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
1620
$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];

‎.github/workflows/integration-tests.yml

Lines changed: 4 additions & 3 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:
@@ -155,7 +155,8 @@ jobs:
155155
run: |
156156
COMPOSER_HOME="$(composer config home)"
157157
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
158-
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
158+
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
159+
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
159160
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
160161
161162
echo "::group::composer update"
@@ -182,7 +183,7 @@ jobs:
182183
POSTGRES_HOST: localhost
183184

184185
#- name: Run HTTP push tests
185-
# if: matrix.php == '8.1'
186+
# if: matrix.php == '8.2'
186187
# run: |
187188
# [ -d .phpunit ] && mv .phpunit .phpunit.bak
188189
# 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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ 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: |
6464
COMPOSER_HOME="$(composer config home)"
6565
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
66-
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
66+
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
67+
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
6768
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
6869
6970
echo "::group::composer update"

‎.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: 4 additions & 3 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
@@ -41,9 +41,10 @@ jobs:
4141
run: |
4242
COMPOSER_HOME="$(composer config home)"
4343
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
44-
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
44+
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
45+
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
4546
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
47+
composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
4748
4849
- name: Generate Psalm baseline
4950
run: |

‎.github/workflows/unit-tests.yml

Lines changed: 14 additions & 13 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
@@ -122,7 +122,8 @@ jobs:
122122
[[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true
123123
124124
echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
125-
echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
125+
#echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
126+
echo COMPOSER_ROOT_VERSION=6.4.x-dev >> $GITHUB_ENV # to be removed once all deps allow ^7.0
126127
echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
127128
[[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
128129
@@ -137,19 +138,19 @@ jobs:
137138
echo "::endgroup::"
138139
139140
- name: Patch return types
140-
if: "matrix.php == '8.1' && ! matrix.mode"
141+
if: "matrix.php == '8.2' && ! matrix.mode"
141142
run: |
142143
patch -sp1 < .github/expected-missing-return-types.diff
143144
git add .
144145
composer install -q --optimize-autoloader || composer install --optimize-autoloader
145-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
146+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php
146147
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
148+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.2' php .github/patch-types.php # ensure the script is idempotent
148149
git checkout src/Symfony/Contracts/Service/ResetInterface.php
149150
git diff --exit-code
150151
151152
- name: Check interface return types
152-
if: "matrix.php == '8.1' && ! matrix.mode"
153+
if: "matrix.php == '8.2' && ! matrix.mode"
153154
run: |
154155
php .github/patch-types.php lint
155156
@@ -227,12 +228,12 @@ jobs:
227228
script -e -c './phpunit --group tty' /dev/null
228229
229230
- name: Run tests with SIGCHLD enabled PHP
230-
if: "matrix.php == '8.1' && ! matrix.mode"
231+
if: "false && matrix.php == '8.2' && ! matrix.mode"
231232
run: |
232233
mkdir build
233234
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
235+
wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.6-pcntl-sigchild.tar.bz2
236+
tar -xjf php-8.2.6-pcntl-sigchild.tar.bz2
236237
cd ..
237238
238239
./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|^7.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|^7.0",
29-
"symfony/config": "^5.4|^6.0|^7.0",
30-
"symfony/dependency-injection": "^6.2|^7.0",
31-
"symfony/doctrine-messenger": "^5.4|^6.0|^7.0",
32-
"symfony/expression-language": "^5.4|^6.0|^7.0",
33-
"symfony/form": "^5.4.21|^6.2.7|^7.0",
34-
"symfony/http-kernel": "^6.3|^7.0",
35-
"symfony/lock": "^6.3|^7.0",
36-
"symfony/messenger": "^5.4|^6.0|^7.0",
37-
"symfony/property-access": "^5.4|^6.0|^7.0",
38-
"symfony/property-info": "^5.4|^6.0|^7.0",
39-
"symfony/proxy-manager-bridge": "^5.4|^6.0|^7.0",
40-
"symfony/security-core": "^6.0|^7.0",
41-
"symfony/stopwatch": "^5.4|^6.0|^7.0",
42-
"symfony/translation": "^5.4|^6.0|^7.0",
43-
"symfony/uid": "^5.4|^6.0|^7.0",
44-
"symfony/validator": "^5.4|^6.0|^7.0",
45-
"symfony/var-dumper": "^5.4|^6.0|^7.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|^7.0"
22+
"symfony/http-kernel": "^6.4|^7.0"
2323
},
2424
"require-dev": {
25-
"symfony/console": "^5.4|^6.0|^7.0",
26-
"symfony/http-client": "^5.4|^6.0|^7.0",
27-
"symfony/security-core": "^6.0|^7.0",
28-
"symfony/var-dumper": "^5.4|^6.0|^7.0",
29-
"symfony/mailer": "^5.4|^6.0|^7.0",
30-
"symfony/mime": "^5.4|^6.0|^7.0",
31-
"symfony/messenger": "^5.4|^6.0|^7.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\\": "" },

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy