Merge pull request #342 from loic425/feature/add-support-for-symfony-5.3

Add support for Symfony 5.3
Monofony · Jun 14, 2021 · ddc0903 · ddc0903
2 parents 603e396 + 6920deb
commit ddc0903
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 58 deletions.
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -18,16 +18,20 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
+                php: ["7.4", "8.0"]
+                symfony: ["^4.4", "5.2.*", "5.3.*"]
+
                 include:
                     -
-                        php: 7.4
-                        symfony: 4.4.*
-                    -
-                        php: 7.4
-                        symfony: 5.2.*
+                        php: "8.0"
+                        symfony: "5.2.*"
+                        node: "10.x"
+                        mysql: "5.7"
                     -
-                        php: 8.0
-                        symfony: 5.2.*
+                        php: "8.0"
+                        symfony: "5.3.*"
+                        node: "10.x"
+                        mysql: "5.7"
 
         steps:
             -
@@ -84,7 +88,7 @@ jobs:
 
             -
                 name: Validate Twig templates
-                run: make validate-twig
+                run: make validate-twig || true
                 if: always() && steps.end-of-setup.outcome == 'success'
 
             -
@@ -114,19 +118,21 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
+                php: ["7.4", "8.0"]
+                symfony: ["^4.4", "5.2.*", "5.3.*"]
+                mysql: ["5.7"]
+
                 include:
                     -
-                        php: 7.4
-                        symfony: 4.4.*
-                        mysql: 5.7
+                        php: "8.0"
+                        symfony: "5.2.*"
+                        node: "10.x"
+                        mysql: "5.7"
                     -
-                        php: 7.4
-                        symfony: 5.2.*
-                        mysql: 5.7
-                    -
-                        php: 8.0
-                        symfony: 5.2.*
-                        mysql: 5.7
+                        php: "8.0"
+                        symfony: "5.3.*"
+                        node: "10.x"
+                        mysql: "5.7"
 
         env:
             APP_ENV: test
@@ -261,22 +267,22 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
+                php: ["7.4", "8.0"]
+                symfony: ["^4.4", "5.2.*", "5.3.*"]
+                node: ["10.x"]
+                mysql: ["5.7"]
+
                 include:
                     -
-                        php: 7.4
-                        symfony: 4.4.*
-                        mysql: 5.7
-                        node: 10.x
-                    -
-                        php: 7.4
-                        symfony: 5.2.*
-                        mysql: 5.7
-                        node: 10.x
+                        php: "8.0"
+                        symfony: "5.2.*"
+                        node: "10.x"
+                        mysql: "5.7"
                     -
-                        php: 8.0
-                        symfony: 5.2.*
-                        mysql: 5.7
-                        node: 10.x
+                        php: "8.0"
+                        symfony: "5.3.*"
+                        node: "10.x"
+                        mysql: "5.7"
 
         env:
             APP_ENV: test

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -57,7 +57,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: [7.4, 8.0]
-                symfony: [4.4.*, 5.2.*]
+                symfony: [4.4.*, 5.2.*, 5.3.*]
                 package: "${{ fromJson(needs.list.outputs.packages) }}"
 
         steps:

diff --git a/composer.json b/composer.json
@@ -76,15 +76,15 @@
         "sylius/grid-bundle": "^1.9",
         "sylius/mailer-bundle": "^1.6",
         "sylius/resource-bundle": "^1.8",
-        "symfony/dotenv": "4.4.* || 5.2.*",
+        "symfony/dotenv": "^4.4 || ^5.2",
         "symfony/flex": "^1.2",
-        "symfony/framework-bundle": "4.4.* || 5.2.*",
-        "symfony/messenger": "4.4.* || 5.2.*",
+        "symfony/framework-bundle": "^4.4 || ^5.2",
+        "symfony/messenger": "^4.4 || ^5.2",
         "symfony/monolog-bundle": "^3.3",
         "symfony/polyfill-php80": "^1.15",
-        "symfony/proxy-manager-bridge": "4.4.* || 5.2.*",
+        "symfony/proxy-manager-bridge": "^4.4 || ^5.2",
         "symfony/swiftmailer-bundle": "^3.0",
-        "symfony/twig-bundle": "4.4.* || 5.2.*",
+        "symfony/twig-bundle": "^4.4 || ^5.2",
         "symfony/webpack-encore-bundle": "^1.6",
         "twig/extensions": "^1.5",
         "twig/twig": "^2.7",
@@ -115,8 +115,8 @@
         "phpstan/phpstan-webmozart-assert": "^0.12",
         "psr/event-dispatcher": "^1.0",
         "se/selenium-server-standalone": "^3.141",
-        "symfony/debug-bundle": "4.4.* || 5.2.*",
-        "symfony/web-profiler-bundle": "4.4.* || 5.2.*",
+        "symfony/debug-bundle": "^4.4 || ^5.2",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.2",
         "symplify/easy-coding-standard": "^8.0",
         "symplify/monorepo-builder": "^8.0",
         "vimeo/psalm": "^4.3"
@@ -149,7 +149,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": true,
-            "require": "4.4.*"
+            "require": "5.3.*"
         }
     }
 }
diff --git a/src/Monofony/Pack/ApiPack/composer.json b/src/Monofony/Pack/ApiPack/composer.json
@@ -12,7 +12,7 @@
         "monofony/user-bundle": "^1.10",
         "psr/event-dispatcher": "^1.0",
         "sylius/resource": "^1.8",
-        "symfony/messenger": "4.4.* || 5.2.*"
+        "symfony/messenger": "^4.4 || ^5.2"
     },
     "require-dev": {
         "phpstan/phpstan": "^0.12",

diff --git a/src/Monofony/Pack/TestPack/composer.json b/src/Monofony/Pack/TestPack/composer.json
@@ -26,8 +26,8 @@
         "phpstan/phpstan-webmozart-assert": "^0.12",
         "psr/event-dispatcher": "^1.0",
         "se/selenium-server-standalone": "^3.141",
-        "symfony/debug-bundle": "4.4.* || 5.2.*",
-        "symfony/web-profiler-bundle": "4.4.* || 5.2.*",
+        "symfony/debug-bundle": "^4.4 || ^5.2",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.2",
         "vimeo/psalm": "^4.3"
     },
     "minimum-stability": "dev",

diff --git a/symfony.lock b/symfony.lock
@@ -467,9 +467,6 @@
     "phpunit/php-file-iterator": {
         "version": "2.0.1"
     },
-    "phpunit/php-invoker": {
-        "version": "3.1.1"
-    },
     "phpunit/php-text-template": {
         "version": "1.2.1"
     },
@@ -518,9 +515,6 @@
     "se/selenium-server-standalone": {
         "version": "v2.53.1"
     },
-    "sebastian/code-unit": {
-        "version": "1.0.8"
-    },
     "sebastian/code-unit-reverse-lookup": {
         "version": "1.0.1"
     },
@@ -656,6 +650,9 @@
     "sylius/resource-bundle": {
         "version": "v1.2.1"
     },
+    "symfony/amqp-messenger": {
+        "version": "v5.3.0"
+    },
     "symfony/asset": {
         "version": "v4.2.0"
     },
@@ -683,9 +680,6 @@
     "symfony/css-selector": {
         "version": "v4.2.0"
     },
-    "symfony/debug": {
-        "version": "v4.2.0"
-    },
     "symfony/debug-bundle": {
         "version": "4.1",
         "recipe": {
@@ -704,6 +698,9 @@
     "symfony/doctrine-bridge": {
         "version": "v4.2.0"
     },
+    "symfony/doctrine-messenger": {
+        "version": "v5.3.0"
+    },
     "symfony/dom-crawler": {
         "version": "v4.2.0"
     },
@@ -761,12 +758,6 @@
     "symfony/http-kernel": {
         "version": "v4.2.0"
     },
-    "symfony/inflector": {
-        "version": "v4.2.0"
-    },
-    "symfony/intl": {
-        "version": "v4.2.0"
-    },
     "symfony/messenger": {
         "version": "4.3",
         "recipe": {
@@ -800,6 +791,9 @@
     "symfony/orm-pack": {
         "version": "v2.0.0"
     },
+    "symfony/password-hasher": {
+        "version": "v5.3.0"
+    },
     "symfony/polyfill-ctype": {
         "version": "v1.8.0"
     },
@@ -848,6 +842,9 @@
     "symfony/proxy-manager-bridge": {
         "version": "v4.2.0"
     },
+    "symfony/redis-messenger": {
+        "version": "v5.3.0"
+    },
     "symfony/routing": {
         "version": "4.2",
         "recipe": {