Skip to content

Commit 3edba75

Browse files
committed
feature #1457 Update to Symfony 7 (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Update to Symfony 7 Commits ------- 917ff37 Update to Symfony 7
2 parents 637c294 + 917ff37 commit 3edba75

File tree

9 files changed

+917
-947
lines changed

9 files changed

+917
-947
lines changed

.github/workflows/lint.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
strategy:
3232
matrix:
33-
php-version: ['8.1']
33+
php-version: ['8.2']
3434

3535
steps:
3636
- name: "Checkout code"

.github/workflows/tests.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
fail-fast: true
1111
PHPUNIT_FLAGS: "-v"
1212
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
13-
SYMFONY_DEPRECATIONS_HELPER: 17
13+
SYMFONY_DEPRECATIONS_HELPER: 0
1414

1515
permissions:
1616
contents: read
@@ -24,12 +24,12 @@ jobs:
2424
strategy:
2525
matrix:
2626
operating-system: ['ubuntu-latest']
27-
php-version: ['8.1', '8.2', '8.3']
27+
php-version: ['8.2', '8.3']
2828
include:
2929
- operating-system: 'macos-latest'
30-
php-version: '8.1'
30+
php-version: '8.2'
3131
- operating-system: 'windows-latest'
32-
php-version: '8.1'
32+
php-version: '8.2'
3333

3434
steps:
3535
- name: "Checkout code"
@@ -39,7 +39,7 @@ jobs:
3939
uses: shivammathur/setup-php@v2
4040
with:
4141
coverage: "none"
42-
extensions: "intl, mbstring, pdo_sqlite"
42+
extensions: "intl, mbstring, pdo_sqlite, zip"
4343
php-version: ${{ matrix.php-version }}
4444
tools: composer:v2
4545

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ You can also learn about these practices in [the official Symfony Book][5].
99
Requirements
1010
------------
1111

12-
* PHP 8.1.0 or higher;
12+
* PHP 8.2.0 or higher;
1313
* PDO-SQLite PHP extension enabled;
1414
* and the [usual Symfony application requirements][2].
1515

bin/phpunit

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
66
}
77

88
if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
9-
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
10-
require PHPUNIT_COMPOSER_INSTALL;
11-
PHPUnit\TextUI\Command::main();
9+
if (PHP_VERSION_ID >= 80000) {
10+
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
11+
} else {
12+
define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
13+
require PHPUNIT_COMPOSER_INSTALL;
14+
PHPUnit\TextUI\Command::main();
15+
}
1216
} else {
1317
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
1418
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";

composer.json

+30-30
Original file line numberDiff line numberDiff line change
@@ -13,56 +13,56 @@
1313
"symfony/polyfill-php81": "*"
1414
},
1515
"require": {
16-
"php": ">=8.1",
16+
"php": ">=8.2",
1717
"ext-pdo_sqlite": "*",
1818
"doctrine/dbal": "^3.1",
1919
"doctrine/doctrine-bundle": "^2.11",
2020
"doctrine/doctrine-migrations-bundle": "^3.3",
2121
"doctrine/orm": "^2.16",
2222
"league/commonmark": "^2.1",
2323
"symfony/apache-pack": "^1.0",
24-
"symfony/asset": "6.4.*",
25-
"symfony/asset-mapper": "6.4.*",
26-
"symfony/console": "6.4.*",
27-
"symfony/dotenv": "6.4.*",
28-
"symfony/expression-language": "6.4.*",
24+
"symfony/asset": "^7.0",
25+
"symfony/asset-mapper": "^7.0",
26+
"symfony/console": "^7.0",
27+
"symfony/dotenv": "^7.0",
28+
"symfony/expression-language": "^7.0",
2929
"symfony/flex": "^2",
30-
"symfony/form": "6.4.*",
31-
"symfony/framework-bundle": "6.4.*",
32-
"symfony/html-sanitizer": "6.4.*",
33-
"symfony/http-client": "6.4.*",
34-
"symfony/intl": "6.4.*",
35-
"symfony/mailer": "6.4.*",
30+
"symfony/form": "^7.0",
31+
"symfony/framework-bundle": "^7.0",
32+
"symfony/html-sanitizer": "^7.0",
33+
"symfony/http-client": "^7.0",
34+
"symfony/intl": "^7.0",
35+
"symfony/mailer": "^7.0",
3636
"symfony/monolog-bundle": "^3.7",
3737
"symfony/polyfill-intl-messageformatter": "^1.12",
38-
"symfony/runtime": "6.4.*",
39-
"symfony/security-bundle": "6.4.*",
38+
"symfony/runtime": "^7.0",
39+
"symfony/security-bundle": "^7.0",
4040
"symfony/stimulus-bundle": "^2.12",
41-
"symfony/string": "6.4.*",
42-
"symfony/translation": "6.4.*",
43-
"symfony/twig-bundle": "6.4.*",
41+
"symfony/string": "^7.0",
42+
"symfony/translation": "^7.0",
43+
"symfony/twig-bundle": "^7.0",
4444
"symfony/ux-live-component": "^2.6",
45-
"symfony/validator": "6.4.*",
46-
"symfony/yaml": "6.4.*",
47-
"symfonycasts/sass-bundle": "^0.2.3",
45+
"symfony/validator": "^7.0",
46+
"symfony/yaml": "^7.0",
47+
"symfonycasts/sass-bundle": "^0.3",
4848
"twig/extra-bundle": "^3.3",
4949
"twig/intl-extra": "^3.3",
5050
"twig/markdown-extra": "^3.3"
5151
},
5252
"require-dev": {
53-
"dama/doctrine-test-bundle": "^8.0.0-beta5",
54-
"doctrine/doctrine-fixtures-bundle": "4.0.x-dev",
53+
"dama/doctrine-test-bundle": "^8.0.0",
54+
"doctrine/doctrine-fixtures-bundle": "^3.5",
5555
"phpstan/extension-installer": "^1.2",
5656
"phpstan/phpstan": "^1.2",
5757
"phpstan/phpstan-doctrine": "^1.3",
5858
"phpstan/phpstan-symfony": "^1.2",
59-
"symfony/browser-kit": "6.4.*",
60-
"symfony/css-selector": "6.4.*",
61-
"symfony/debug-bundle": "6.4.*",
59+
"symfony/browser-kit": "^7.0",
60+
"symfony/css-selector": "^7.0",
61+
"symfony/debug-bundle": "^7.0",
6262
"symfony/maker-bundle": "^1.36",
63-
"symfony/phpunit-bridge": "6.4.*",
64-
"symfony/stopwatch": "6.4.*",
65-
"symfony/web-profiler-bundle": "6.4.*",
63+
"symfony/phpunit-bridge": "^7.0.1",
64+
"symfony/stopwatch": "^7.0",
65+
"symfony/web-profiler-bundle": "^7.0",
6666
"twbs/bootstrap": "^4.5.3"
6767
},
6868
"config": {
@@ -72,7 +72,7 @@
7272
"phpstan/extension-installer": true
7373
},
7474
"platform": {
75-
"php": "8.1.0"
75+
"php": "8.2.0"
7676
},
7777
"preferred-install": {
7878
"*": "dist"
@@ -106,7 +106,7 @@
106106
"extra": {
107107
"symfony": {
108108
"allow-contrib": true,
109-
"require": "6.4.*"
109+
"require": "7.0.*"
110110
}
111111
}
112112
}

0 commit comments

Comments
 (0)