Skip to content

Commit 1a7777f

Browse files
committed
feature #1268 Upgrade to Symfony 5.4 (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Upgrade to Symfony 5.4 Commits ------- 825aa67 Upgrade to Symfony 5.4
2 parents 9962551 + 825aa67 commit 1a7777f

15 files changed

+1151
-1292
lines changed

.github/workflows/tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
6161

6262
- name: "Require symfony/flex"
63-
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main
63+
run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
6464

6565
- run: composer update
6666

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
###< symfony/framework-bundle ###
1313

1414
###> symfony/phpunit-bridge ###
15-
.phpunit
1615
.phpunit.result.cache
1716
/phpunit.xml
1817
###< symfony/phpunit-bridge ###

bin/phpunit

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
#!/usr/bin/env php
22
<?php
3-
if (file_exists(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
4-
require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
3+
4+
if (!ini_get('date.timezone')) {
5+
ini_set('date.timezone', 'UTC');
6+
}
7+
8+
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();
512
} else {
6-
if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
13+
if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
714
echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
815
exit(1);
916
}
1017

11-
if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
12-
putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
13-
}
14-
1518
require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
1619
}

composer.json

+29-28
Original file line numberDiff line numberDiff line change
@@ -14,45 +14,46 @@
1414
"ext-pdo_sqlite": "*",
1515
"composer/package-versions-deprecated": "^1.8",
1616
"doctrine/dbal": "^3.1",
17-
"doctrine/doctrine-bundle": "^2.0",
17+
"doctrine/doctrine-bundle": "^2.5",
1818
"doctrine/doctrine-migrations-bundle": "^3.0",
1919
"doctrine/orm": "^2.10",
2020
"erusev/parsedown": "^1.6",
2121
"sensio/framework-extra-bundle": "^6.1",
2222
"symfony/apache-pack": "^1.0",
23-
"symfony/asset": "^5.3",
24-
"symfony/console": "^5.3",
25-
"symfony/dotenv": "^5.3",
26-
"symfony/expression-language": "^5.3",
27-
"symfony/flex": "^1.1",
28-
"symfony/form": "^5.3",
29-
"symfony/framework-bundle": "^5.3",
30-
"symfony/intl": "^5.3",
31-
"symfony/mailer": "^5.3",
23+
"symfony/asset": "^5.4",
24+
"symfony/console": "^5.4",
25+
"symfony/dotenv": "^5.4",
26+
"symfony/expression-language": "^5.4",
27+
"symfony/flex": "^1.17.1",
28+
"symfony/form": "^5.4",
29+
"symfony/framework-bundle": "^5.4",
30+
"symfony/intl": "^5.4",
31+
"symfony/mailer": "^5.4",
3232
"symfony/monolog-bundle": "^3.1",
3333
"symfony/polyfill-intl-messageformatter": "^1.12",
34-
"symfony/security-bundle": "^5.3",
35-
"symfony/runtime": "^5.3",
36-
"symfony/string": "^5.3",
37-
"symfony/translation": "^5.3",
38-
"symfony/twig-pack": "^1.0",
39-
"symfony/validator": "^5.3",
34+
"symfony/runtime": "^5.4",
35+
"symfony/security-bundle": "^5.4",
36+
"symfony/string": "^5.4",
37+
"symfony/translation": "^5.4",
38+
"symfony/twig-bundle": "^5.4",
39+
"symfony/validator": "^5.4",
4040
"symfony/webpack-encore-bundle": "^1.4",
41-
"symfony/yaml": "^5.3",
42-
"tgalopin/html-sanitizer-bundle": "^1.2",
41+
"symfony/yaml": "^5.4",
42+
"tgalopin/html-sanitizer-bundle": "^1.4",
43+
"twig/extra-bundle": "^3.0",
4344
"twig/intl-extra": "^3.0",
4445
"twig/markdown-extra": "^3.0"
4546
},
4647
"require-dev": {
47-
"dama/doctrine-test-bundle": "^6.2",
48+
"dama/doctrine-test-bundle": "^6.7",
4849
"doctrine/doctrine-fixtures-bundle": "^3.0",
49-
"symfony/browser-kit": "^5.3",
50-
"symfony/css-selector": "^5.3",
51-
"symfony/debug-bundle": "^5.3",
50+
"symfony/browser-kit": "^5.4",
51+
"symfony/css-selector": "^5.4",
52+
"symfony/debug-bundle": "^5.4",
5253
"symfony/maker-bundle": "^1.11",
53-
"symfony/phpunit-bridge": "^5.3",
54-
"symfony/stopwatch": "^5.3",
55-
"symfony/web-profiler-bundle": "^5.3"
54+
"symfony/phpunit-bridge": "^5.4",
55+
"symfony/stopwatch": "^5.4",
56+
"symfony/web-profiler-bundle": "^5.4"
5657
},
5758
"config": {
5859
"platform": {
@@ -76,7 +77,7 @@
7677
"scripts": {
7778
"auto-scripts": {
7879
"cache:clear": "symfony-cmd",
79-
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
80+
"assets:install %PUBLIC_DIR%": "symfony-cmd"
8081
},
8182
"post-install-cmd": [
8283
"@auto-scripts"
@@ -90,8 +91,8 @@
9091
},
9192
"extra": {
9293
"symfony": {
93-
"require": "5.3.*",
94-
"allow-contrib": true
94+
"allow-contrib": true,
95+
"require": "5.4.*"
9596
}
9697
}
9798
}

0 commit comments

Comments
 (0)