bump symofny verion from 5.4.0-RC1 to 5.4

lchrusciel · Nov 30, 2021 · fef6243 · fef6243
1 parent d2c39e4
commit fef6243
Show file tree

Hide file tree

Showing 38 changed files with 148 additions and 149 deletions.
diff --git a/.github/workflows/application.yml b/.github/workflows/application.yml
@@ -32,7 +32,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.0"]
-                symfony: ["^4.4", "5.4.0-RC1"]
+                symfony: ["^4.4", "^5.4"]
 
         steps:
             -
@@ -116,7 +116,7 @@ jobs:
         strategy:
             matrix:
                 php: ["8.0"]
-                symfony: ["5.4.0-RC1"]
+                symfony: ["^5.4"]
                 postgres: ["13.3"]
 
         env:
@@ -197,7 +197,7 @@ jobs:
         strategy:
             matrix:
                 php: ["8.0"]
-                symfony: ["5.4.0-RC1"]
+                symfony: ["^5.4"]
                 mariadb: ["10.4.10"]
 
         env:
@@ -327,7 +327,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.0"]
-                symfony: ["^4.4", "5.4.0-RC1"]
+                symfony: ["^4.4", "^5.4"]
                 node: ["14.x"]
                 mysql: ["5.7", "8.0"]
 
@@ -458,7 +458,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.0"]
-                symfony: ["^4.4", "5.4.0-RC1"]
+                symfony: ["^4.4", "^5.4"]
                 node: ["14.x"]
                 mysql: ["5.7", "8.0"]
 

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
@@ -49,7 +49,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.0"]
-                symfony: ["^4.4", "5.4.0-RC1"]
+                symfony: ["^4.4", "^5.4"]
                 package: "${{ fromJson(needs.list.outputs.packages) }}"
 
         steps:

diff --git a/composer.json b/composer.json
@@ -68,46 +68,46 @@
         "sylius/resource": "^1.7",
         "sylius/resource-bundle": "^1.7",
         "sylius/theme-bundle": "^2.1.1",
-        "symfony/asset": "^4.4 || ^5.4.0-RC1",
-        "symfony/config": "^4.4 || ^5.4.0-RC1",
-        "symfony/console": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/doctrine-bridge": "^4.4 || ^5.4.0-RC1",
-        "symfony/event-dispatcher": "^4.4 || ^5.4.0-RC1",
-        "symfony/expression-language": "^4.4 || ^5.4.0-RC1",
-        "symfony/filesystem": "^4.4 || ^5.4.0-RC1",
-        "symfony/finder": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/http-foundation": "^4.4 || ^5.4.0-RC1",
-        "symfony/http-kernel": "^4.4 || ^5.4.0-RC1",
-        "symfony/intl": "^4.4 || ^5.4.0-RC1",
-        "symfony/messenger": "^4.4 || ^5.4.0-RC1",
+        "symfony/asset": "^4.4 || ^5.4",
+        "symfony/config": "^4.4 || ^5.4",
+        "symfony/console": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/doctrine-bridge": "^4.4 || ^5.4",
+        "symfony/event-dispatcher": "^4.4 || ^5.4",
+        "symfony/expression-language": "^4.4 || ^5.4",
+        "symfony/filesystem": "^4.4 || ^5.4",
+        "symfony/finder": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4",
+        "symfony/framework-bundle": "^4.4 || ^5.4",
+        "symfony/http-foundation": "^4.4 || ^5.4",
+        "symfony/http-kernel": "^4.4 || ^5.4",
+        "symfony/intl": "^4.4 || ^5.4",
+        "symfony/messenger": "^4.4 || ^5.4",
         "symfony/monolog-bundle": "^3.5",
-        "symfony/options-resolver": "^4.4 || ^5.4.0-RC1",
+        "symfony/options-resolver": "^4.4 || ^5.4",
         "symfony/polyfill-iconv": "^1.17",
         "symfony/polyfill-intl-icu": "^1.22",
         "symfony/polyfill-mbstring": "^1.17",
         "symfony/polyfill-php80": "^1.17",
-        "symfony/process": "^4.4 || ^5.4.0-RC1",
-        "symfony/property-access": "^4.4 || ^5.4.0-RC1",
-        "symfony/property-info": "^4.4 || ^5.4.0-RC1",
-        "symfony/proxy-manager-bridge": "^4.4 || ^5.4.0-RC1",
-        "symfony/routing": "^4.4 || ^5.4.0-RC1",
-        "symfony/security-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/security-core": "^4.4 || ^5.4.0-RC1",
-        "symfony/security-csrf": "^4.4 || ^5.4.0-RC1",
-        "symfony/security-guard": "^4.4 || ^5.4.0-RC1",
-        "symfony/security-http": "^4.4 || ^5.4.0-RC1",
-        "symfony/serializer": "^4.4 || ^5.4.0-RC1",
+        "symfony/process": "^4.4 || ^5.4",
+        "symfony/property-access": "^4.4 || ^5.4",
+        "symfony/property-info": "^4.4 || ^5.4",
+        "symfony/proxy-manager-bridge": "^4.4 || ^5.4",
+        "symfony/routing": "^4.4 || ^5.4",
+        "symfony/security-bundle": "^4.4 || ^5.4",
+        "symfony/security-core": "^4.4 || ^5.4",
+        "symfony/security-csrf": "^4.4 || ^5.4",
+        "symfony/security-guard": "^4.4 || ^5.4",
+        "symfony/security-http": "^4.4 || ^5.4",
+        "symfony/serializer": "^4.4 || ^5.4",
         "symfony/string": "^5.3",
         "symfony/swiftmailer-bundle": "^3.4",
-        "symfony/templating": "^4.4 || ^5.4.0-RC1",
+        "symfony/templating": "^4.4 || ^5.4",
         "symfony/thanks": "^1.2",
-        "symfony/translation": "^4.4 || ^5.4.0-RC1",
-        "symfony/twig-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/validator": "^4.4 || ^5.4.0-RC1",
-        "symfony/yaml": "^4.4 || ^5.4.0-RC1",
+        "symfony/translation": "^4.4 || ^5.4",
+        "symfony/twig-bundle": "^4.4 || ^5.4",
+        "symfony/validator": "^4.4 || ^5.4",
+        "symfony/yaml": "^4.4 || ^5.4",
         "twig/intl-extra": "^2.12",
         "twig/twig": "^2.12",
         "webmozart/assert": "^1.9",
@@ -196,11 +196,11 @@
         "rector/rector": "^0.11.52",
         "stripe/stripe-php": "^6.43",
         "sylius-labs/coding-standard": "^4.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/debug-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/dotenv": "^4.4 || ^5.4.0-RC1",
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/debug-bundle": "^4.4 || ^5.4",
+        "symfony/dotenv": "^4.4 || ^5.4",
         "symfony/flex": "^1.7",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.4.0-RC1",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.4",
         "vimeo/psalm": "4.7.2"
     },
     "suggest": {

diff --git a/config/packages/security.yaml b/config/packages/security.yaml
@@ -1,5 +1,4 @@
 security:
-    always_authenticate_before_granting: true
     providers:
         sylius_admin_user_provider:
             id: sylius.admin_user_provider.email_or_name_based

diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json
@@ -30,8 +30,8 @@
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius/addressing": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/intl": "^4.4 || ^5.4.0-RC1"
+        "symfony/framework-bundle": "^4.4 || ^5.4",
+        "symfony/intl": "^4.4 || ^5.4"
     },
     "conflict": {
         "twig/twig": "^1.0 || ^3.0"
@@ -41,10 +41,10 @@
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1",
-        "symfony/validator": "^4.4 || ^5.4.0-RC1"
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4",
+        "symfony/validator": "^4.4 || ^5.4"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json
@@ -33,14 +33,14 @@
         "php": "^8.0",
         "sylius/core-bundle": "^1.6",
         "sylius/ui-bundle": "^1.6",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
+        "symfony/framework-bundle": "^4.4 || ^5.4",
         "twig/intl-extra": "^2.12",
         "twig/twig": "^2.12"
     },
     "require-dev": {
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1"
+        "symfony/dependency-injection": "^4.4 || ^5.4"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json
@@ -28,17 +28,17 @@
         "api-platform/core": "^2.6",
         "lexik/jwt-authentication-bundle": "^2.6",
         "sylius/core-bundle": "^1.7",
-        "symfony/messenger": "^4.4 || ^5.4.0-RC1"
+        "symfony/messenger": "^4.4 || ^5.4"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "nelmio/alice": "^3.8",
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/debug-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/dotenv": "^4.4 || ^5.4.0-RC1",
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/debug-bundle": "^4.4 || ^5.4",
+        "symfony/dotenv": "^4.4 || ^5.4",
         "symfony/http-client": "^5.2",
         "theofidry/alice-data-fixtures": "^1.4"
     },

diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json
@@ -31,15 +31,15 @@
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius/attribute": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1"
+        "symfony/framework-bundle": "^4.4 || ^5.4"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1"
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json
@@ -28,17 +28,17 @@
         "php": "^8.0",
         "sylius/channel": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1"
+        "symfony/framework-bundle": "^4.4 || ^5.4"
     },
     "require-dev": {
         "doctrine/orm": "^2.7",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1",
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4",
         "twig/twig": "^2.12"
     },
     "config": {

diff --git a/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php b/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php
@@ -114,7 +114,7 @@ private function updatePositions(string $position, int $id): void
      * @deprecated This function will be removed in Sylius 2.0, since Symfony 5.4, use explicit input sources instead
      * based on Symfony\Component\HttpFoundation\Request::get
      */
-    public function getParameterFromRequest(Request $request, string $key)
+    private function getParameterFromRequest(Request $request, string $key)
     {
         if ($request !== $result = $request->attributes->get($key, $request)) {
             return $result;
@@ -124,7 +124,7 @@ public function getParameterFromRequest(Request $request, string $key)
             return $request->query->all()[$key];
         }
 
-        if ($request->request->has('key')) {
+        if ($request->request->has($key)) {
             return $request->request->all()[$key];
         }
 

diff --git a/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php b/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php
@@ -62,7 +62,7 @@ public function updatePositionsAction(Request $request): Response
      * @deprecated This function will be removed in Sylius 2.0, since Symfony 5.4, use explicit input sources instead
      * based on Symfony\Component\HttpFoundation\Request::get
      */
-    public function getParameterFromRequest(Request $request, string $key)
+    private function getParameterFromRequest(Request $request, string $key)
     {
         if ($request !== $result = $request->attributes->get($key, $request)) {
             return $result;
@@ -72,7 +72,7 @@ public function getParameterFromRequest(Request $request, string $key)
             return $request->query->all()[$key];
         }
 
-        if ($request->request->has('key')) {
+        if ($request->request->has($key)) {
             return $request->request->all()[$key];
         }
 

diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json
@@ -63,11 +63,11 @@
         "sylius/theme-bundle": "^2.1.1",
         "sylius/ui-bundle": "^1.6",
         "sylius/user-bundle": "^1.6",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/intl": "^4.4 || ^5.4.0-RC1",
-        "symfony/messenger": "^4.4 || ^5.4.0-RC1",
+        "symfony/framework-bundle": "^4.4 || ^5.4",
+        "symfony/intl": "^4.4 || ^5.4",
+        "symfony/messenger": "^4.4 || ^5.4",
         "symfony/swiftmailer-bundle": "^3.4",
-        "symfony/templating": "^4.4 || ^5.4.0-RC1",
+        "symfony/templating": "^4.4 || ^5.4",
         "winzou/state-machine-bundle": "^0.5"
     },
     "require-dev": {
@@ -77,7 +77,7 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.2",
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1"
+        "symfony/dependency-injection": "^4.4 || ^5.4"
     },
     "conflict": {
         "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5"

diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json
@@ -28,9 +28,9 @@
         "php": "^8.0",
         "sylius/currency": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/intl": "^4.4 || ^5.4.0-RC1",
-        "symfony/templating": "^4.4 || ^5.4.0-RC1"
+        "symfony/framework-bundle": "^4.4 || ^5.4",
+        "symfony/intl": "^4.4 || ^5.4",
+        "symfony/templating": "^4.4 || ^5.4"
     },
     "conflict": {
         "twig/twig": "^1.0"
@@ -40,9 +40,9 @@
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1",
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4",
         "twig/twig": "^2.12"
     },
     "config": {

diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json
@@ -40,7 +40,7 @@
         "egulias/email-validator": "^3.0",
         "sylius/customer": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
+        "symfony/framework-bundle": "^4.4 || ^5.4",
         "webmozart/assert": "^1.8"
     },
     "conflict": {
@@ -50,9 +50,9 @@
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
-        "symfony/form": "^4.4 || ^5.4.0-RC1"
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
+        "symfony/form": "^4.4 || ^5.4"
     },
     "config": {
         "bin-dir": "bin"

diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json
@@ -29,9 +29,9 @@
         "php": "^8.0",
         "sylius/inventory": "^1.6",
         "sylius/resource-bundle": "^1.7",
-        "symfony/framework-bundle": "^4.4 || ^5.4.0-RC1",
-        "symfony/templating": "^4.4 || ^5.4.0-RC1",
-        "symfony/validator": "^4.4 || ^5.4.0-RC1"
+        "symfony/framework-bundle": "^4.4 || ^5.4",
+        "symfony/templating": "^4.4 || ^5.4",
+        "symfony/validator": "^4.4 || ^5.4"
     },
     "conflict": {
         "twig/twig": "^1.0"
@@ -41,8 +41,8 @@
         "phpspec/phpspec": "^7.0",
         "phpunit/phpunit": "^8.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^4.4 || ^5.4.0-RC1",
-        "symfony/dependency-injection": "^4.4 || ^5.4.0-RC1",
+        "symfony/browser-kit": "^4.4 || ^5.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4",
         "twig/twig": "^2.12"
     },
     "config": {