Merge pull request #43 from tgrochowski/update_sylius_1.10

Update to sylius 1.10

composer.json

@@ -5,8 +5,8 @@
     "description": "MailChimp plugin for Sylius.",
     "license": "MIT",
     "require": {
-        "php": "^7.3",
-        "sylius/sylius": "~1.8.0 || ~1.9.0",
+        "php": "^7.4 || ^8.0",
+        "sylius/sylius": "^1.10",
         "drewm/mailchimp-api": "^v2.5.4"
     },
     "require-dev": {
@@ -21,7 +21,6 @@
         "friends-of-behat/suite-settings-extension": "^1.0",
         "friends-of-behat/symfony-extension": "^2.1",
         "friends-of-behat/variadic-extension": "^1.3",
-        "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
         "lakion/mink-debug-extension": "^2.0.0",
         "phpspec/phpspec": "^7.0",
         "phpstan/extension-installer": "^1.0",
@@ -39,9 +38,6 @@
         "symfony/web-profiler-bundle": "^4.4 || ^5.2",
         "vimeo/psalm": "4.6.4"
     },
-    "conflict": {
-        "api-platform/core": "^2.6"
-    },
     "prefer-stable": true,
     "autoload": {
         "psr-4": {

src/Resources/config/services.yml

@@ -59,7 +59,7 @@ services:
         public: true
         arguments:
             - "@bitbag_sylius_mailchimp_plugin.handler.newsletter_subscription_handler"
-            - "@fos_oauth_server.entity_manager"
+            - "@doctrine.orm.entity_manager"
         tags:
             - { name: "kernel.event_listener", event: "sylius.customer.post_register", method: customerCreateEvent }
             - { name: "kernel.event_listener", event: "sylius.customer.pre_update", method: customerPreUpdateEvent }

tests/Application/.env.test

@@ -6,4 +6,4 @@ DATABASE_URL=sqlite:///%kernel.project_dir%/var/data.db
 
 MAIL_CHIMP_API_KEY='YourAPIKey'
 MAIL_CHIMP_LIST_ID='YourMailingListID'
-MAIL_CHIMP_WEBHOOK_SECRET=''
+MAIL_CHIMP_WEBHOOK_SECRET=''

tests/Application/config/bundles.php

@@ -47,8 +47,6 @@
     Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
     Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
-    FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],
-    Sylius\Bundle\AdminApiBundle\SyliusAdminApiBundle::class => ['all' => true],
     BitBag\SyliusMailChimpPlugin\BitBagSyliusMailChimpPlugin::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
@@ -58,5 +56,4 @@
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
-    Symplify\ConsoleColorDiff\ConsoleColorDiffBundle::class => ['dev' => true, 'test' => true],
 ];

tests/Application/config/packages/_sylius.yaml

@@ -1,11 +1,7 @@
 imports:
     - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" }
-
     - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" }
-    - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
-
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
-
     - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
 
 parameters:

tests/Application/config/packages/security.yaml

@@ -50,10 +50,6 @@ security:
                 target: sylius_admin_login
             anonymous: true
 
-        oauth_token:
-            pattern: "%sylius.security.api_regex%/oauth/v2/token"
-            security: false
-
         new_api_admin_user:
             pattern: "%sylius.security.new_api_route%/admin-user-authentication-token"
             provider: sylius_admin_user_provider
@@ -96,7 +92,6 @@ security:
         api:
             pattern: "%sylius.security.api_regex%/.*"
             provider: sylius_admin_user_provider
-            fos_oauth: true
             stateless: true
             anonymous: true