Upgrade to Symfony 5.4

Author: javiereguiluz

.github/workflows/tests.yaml

@@ -60,7 +60,7 @@ jobs:
                   restore-keys: ${{ runner.os }}-${{ matrix.php-version }}-composer-
 
             - name: "Require symfony/flex"
-              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-main
+              run: composer global require --no-progress --no-scripts --no-plugins symfony/flex
 
             - run: composer update
 

.gitignore

@@ -12,7 +12,6 @@
 ###< symfony/framework-bundle ###
 
 ###> symfony/phpunit-bridge ###
-.phpunit
 .phpunit.result.cache
 /phpunit.xml
 ###< symfony/phpunit-bridge ###

bin/phpunit

@@ -1,16 +1,19 @@
 #!/usr/bin/env php
 <?php
-if (file_exists(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
+
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'UTC');
+}
+
+if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
+    define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
+    require PHPUNIT_COMPOSER_INSTALL;
+    PHPUnit\TextUI\Command::main();
 } else {
-    if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
+    if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
         echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
         exit(1);
     }
 
-    if (false === getenv('SYMFONY_PHPUNIT_DIR')) {
-        putenv('SYMFONY_PHPUNIT_DIR='.__DIR__.'/.phpunit');
-    }
-
     require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php';
 }

composer.json

@@ -14,45 +14,46 @@
         "ext-pdo_sqlite": "*",
         "composer/package-versions-deprecated": "^1.8",
         "doctrine/dbal": "^3.1",
-        "doctrine/doctrine-bundle": "^2.0",
+        "doctrine/doctrine-bundle": "^2.5",
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.10",
         "erusev/parsedown": "^1.6",
         "sensio/framework-extra-bundle": "^6.1",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "^5.3",
-        "symfony/console": "^5.3",
-        "symfony/dotenv": "^5.3",
-        "symfony/expression-language": "^5.3",
-        "symfony/flex": "^1.1",
-        "symfony/form": "^5.3",
-        "symfony/framework-bundle": "^5.3",
-        "symfony/intl": "^5.3",
-        "symfony/mailer": "^5.3",
+        "symfony/asset": "^5.4",
+        "symfony/console": "^5.4",
+        "symfony/dotenv": "^5.4",
+        "symfony/expression-language": "^5.4",
+        "symfony/flex": "^1.17.1",
+        "symfony/form": "^5.4",
+        "symfony/framework-bundle": "^5.4",
+        "symfony/intl": "^5.4",
+        "symfony/mailer": "^5.4",
         "symfony/monolog-bundle": "^3.1",
         "symfony/polyfill-intl-messageformatter": "^1.12",
-        "symfony/security-bundle": "^5.3",
-        "symfony/runtime": "^5.3",
-        "symfony/string": "^5.3",
-        "symfony/translation": "^5.3",
-        "symfony/twig-pack": "^1.0",
-        "symfony/validator": "^5.3",
+        "symfony/runtime": "^5.4",
+        "symfony/security-bundle": "^5.4",
+        "symfony/string": "^5.4",
+        "symfony/translation": "^5.4",
+        "symfony/twig-bundle": "^5.4",
+        "symfony/validator": "^5.4",
         "symfony/webpack-encore-bundle": "^1.4",
-        "symfony/yaml": "^5.3",
-        "tgalopin/html-sanitizer-bundle": "^1.2",
+        "symfony/yaml": "^5.4",
+        "tgalopin/html-sanitizer-bundle": "^1.4",
+        "twig/extra-bundle": "^3.0",
         "twig/intl-extra": "^3.0",
         "twig/markdown-extra": "^3.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^6.2",
+        "dama/doctrine-test-bundle": "^6.7",
         "doctrine/doctrine-fixtures-bundle": "^3.0",
-        "symfony/browser-kit": "^5.3",
-        "symfony/css-selector": "^5.3",
-        "symfony/debug-bundle": "^5.3",
+        "symfony/browser-kit": "^5.4",
+        "symfony/css-selector": "^5.4",
+        "symfony/debug-bundle": "^5.4",
         "symfony/maker-bundle": "^1.11",
-        "symfony/phpunit-bridge": "^5.3",
-        "symfony/stopwatch": "^5.3",
-        "symfony/web-profiler-bundle": "^5.3"
+        "symfony/phpunit-bridge": "^5.4",
+        "symfony/stopwatch": "^5.4",
+        "symfony/web-profiler-bundle": "^5.4"
     },
     "config": {
         "platform": {
@@ -76,7 +77,7 @@
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
-            "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"
@@ -90,8 +91,8 @@
     },
     "extra": {
         "symfony": {
-            "require": "5.3.*",
-            "allow-contrib": true
+            "allow-contrib": true,
+            "require": "5.4.*"
         }
     }
 }