Bump dependencies and fix configuration

mpysiak · Sep 24, 2024 · 550954f · 550954f
1 parent 5548386
commit 550954f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 51 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
             fail-fast: false
             matrix:
                 php: ["8.3"]
-                symfony: ["^6.4"]
+                symfony: ["^6.4", "^7.0"]
                 node: ["20.x"]
                 mysql: ["8.4"]
 
@@ -57,13 +57,6 @@ jobs:
                     composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4"
                     composer config extra.symfony.require "${{ matrix.symfony }}"
 
-            # These dependencies since Sylius 1.13 have been shifted to dev ones: https://github.com/Sylius/Sylius/pull/15485
-            -
-                name: Add Payum dependencies
-                run: |
-                    composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/paypal-express-checkout-nvp:^1.7.3"
-                    composer require --dev --no-update --no-progress --no-scripts --no-plugins "payum/stripe:^1.7.3"
-
             -
                 name: Setup Node
                 uses: actions/setup-node@v4
@@ -165,7 +158,7 @@ jobs:
             -
                 name: Validate composer.json
                 run: composer validate --ansi --strict --no-check-all
-#                Restore before Sylius 1.13 release
+#                Restore before Sylius 2.0 release
 #                run: composer validate --ansi --strict --no-check-publish
 
             -
@@ -204,14 +197,14 @@ jobs:
                 name: Run non-JS Behat
                 run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
 
-            -   
-                name: Run Behat (Chromedriver)
-                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
-
-            -   
-                name: Run Behat (Panther)
-                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun
-
+#            -   
+#                name: Run Behat (Chromedriver)
+#                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
+#
+#            -   
+#                name: Run Behat (Panther)
+#                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun
+#            
             -
                 name: Upload Behat logs
                 uses: actions/upload-artifact@v4

diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
         "cart",
         "shopping"
     ],
+    "minimum-stability": "dev",
     "homepage": "https://sylius.com",
     "license": "MIT",
     "authors": [
@@ -25,10 +26,10 @@
     ],
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "2.0.x-dev",
-        "symfony/dotenv": "^6.4",
+        "sylius/sylius": "symfony-7-dev",
+        "symfony/dotenv": "^6.4 || ^7.0",
         "symfony/flex": "^2.4",
-        "symfony/runtime": "^6.4"
+        "symfony/runtime": "^6.4 || ^7.0"
     },
     "require-dev": {
         "behat/behat": "^3.7",
@@ -54,18 +55,14 @@
         "phpunit/phpunit": "^10.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
         "robertfausk/behat-panther-extension": "^1.1",
-        "stripe/stripe-php": "^7.0 || ^8.0",
         "sylius-labs/coding-standard": "^4.0",
         "sylius-labs/suite-tags-extension": "^0.2",
         "sylius/sylius-rector": "^2.0",
-        "symfony/browser-kit": "^6.4",
-        "symfony/debug-bundle": "^6.4",
-        "symfony/http-client": "^6.4",
-        "symfony/intl": "^6.4",
-        "symfony/web-profiler-bundle": "^6.4"
-    },
-    "conflict": {
-        "behat/mink-selenium2-driver": ">=1.7.0"
+        "symfony/browser-kit": "^6.4 || ^7.0",
+        "symfony/debug-bundle": "^6.4 || ^7.0",
+        "symfony/http-client": "^6.4 || ^7.0",
+        "symfony/intl": "^6.4 || ^7.0",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.0"
     },
     "config": {
         "preferred-install": {
@@ -87,7 +84,7 @@
         },
         "symfony": {
             "allow-contrib": false,
-            "require": "^6.4",
+            "require": "^7.0",
             "endpoint": [
                 "https://api.github.com/repos/Sylius/SyliusRecipes/contents/index.json?ref=flex/main",
                 "flex://defaults"

diff --git a/config/bundles.php b/config/bundles.php
@@ -31,7 +31,6 @@
     Sylius\Bundle\GridBundle\SyliusGridBundle::class => ['all' => true],
     winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
     Sonata\BlockBundle\SonataBlockBundle::class => ['all' => true],
-    Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
     JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     Knp\Bundle\GaufretteBundle\KnpGaufretteBundle::class => ['all' => true],
@@ -56,7 +55,6 @@
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
-    SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
     Sylius\TwigHooks\TwigHooksBundle::class => ['all' => true],

diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml
@@ -3,8 +3,8 @@ framework:
     secret: '%env(APP_SECRET)%'
     form:
         enabled: true
-        legacy_error_messages: false
     csrf_protection: true
+    http_method_override: true
     session:
         handler_id: ~
     serializer:

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

diff --git a/config/packages/validator.yaml b/config/packages/validator.yaml
@@ -1,3 +1,3 @@
 framework:
     validation:
-        enable_annotations: true
+        enable_attributes: true
diff --git a/config/routes/annotations.yaml → config/routes/attributes.yaml b/config/routes/annotations.yaml → config/routes/attributes.yaml
@@ -1,3 +1,3 @@
 controllers:
     resource: ../../src/Controller/
-    type: annotation
+    type: attribute
diff --git a/symfony.lock b/symfony.lock
@@ -488,9 +488,6 @@
             "ref": "6c1ceb662f8997085f739cd089bfbef67f245983"
         }
     },
-    "stripe/stripe-php": {
-        "version": "v6.28.1"
-    },
     "sylius-labs/association-hydrator": {
         "version": "v1.1.0"
     },
@@ -503,12 +500,6 @@
     "sylius-labs/polyfill-symfony-event-dispatcher": {
         "version": "v1.0.0"
     },
-    "sylius-labs/polyfill-symfony-framework-bundle": {
-        "version": "v1.0.0"
-    },
-    "sylius-labs/polyfill-symfony-security": {
-        "version": "v1.0.0"
-    },
     "sylius/fixtures-bundle": {
         "version": "v1.4.1"
     },
@@ -927,12 +918,6 @@
     "webmozart/assert": {
         "version": "1.3.0"
     },
-    "willdurand/hateoas": {
-        "version": "2.12.0"
-    },
-    "willdurand/hateoas-bundle": {
-        "version": "1.4.0"
-    },
     "willdurand/jsonp-callback-validator": {
         "version": "v1.1.0"
     },