feature #298 Add sylius 1.10 to composer and workflow (arti0090)

This PR was merged into the 1.0-dev branch. Discussion ---------- Commits ------- 71b924e Add sylius 1.10 to composer and workflow f3d350d drop 7.3 2717a60 Remove AdminApiBundle records a069492 Exclude sylius 1.9 with php 8.0 cfb99a6 php 8.0 pls work f44f48c Remove unnecessary exclusions 0f27613 Merge branch 'master' into support-1.10
Sylius · Jun 2, 2021 · 905077e · 905077e
2 parents 0223217 + 0f27613
commit 905077e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,16 +18,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [7.4, 7.3]
+                php: [7.4, 8.0]
                 symfony: [^4.4, ^5.2]
-                sylius: [~1.9.0]
+                sylius: [~1.9.0, ~1.10.0@beta]
                 node: [10.x]
                 mysql: [5.7, 8.0]
 
                 exclude:
                     -
-                        php: 7.3
-                        mysql: 8.0
+                        php: 8.0
+                        sylius: ~1.9.0
 
         env:
             APP_ENV: test

diff --git a/composer.json b/composer.json
@@ -19,11 +19,11 @@
         }
     ],
     "require": {
-        "php": "^7.3",
+        "php": "^7.4 || ^8.0",
         "knplabs/knp-snappy-bundle": "^1.7",
         "myclabs/php-enum": "^1.7",
         "sylius/resource-bundle": "^1.6",
-        "sylius/sylius": "^1.9",
+        "sylius/sylius": "^1.9.1 || ~1.10.0@beta",
         "symfony/messenger": "^4.4 || ^5.2"
     },
     "require-dev": {
@@ -33,13 +33,13 @@
         "dmore/chrome-mink-driver": "^2.7",
         "friends-of-behat/mink": "^1.8",
         "friends-of-behat/mink-browserkit-driver": "^1.3",
-        "friends-of-behat/mink-extension": "^2.3",
         "friends-of-behat/mink-debug-extension": "^2.0",
+        "friends-of-behat/mink-extension": "^2.3",
         "friends-of-behat/page-object-extension": "^0.3",
         "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",
+        "friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
         "matthiasnoback/symfony-config-test": "^4.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1",
         "phpspec/phpspec": "^7.0",

diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -45,8 +45,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],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Sylius\RefundPlugin\SyliusRefundPlugin::class => ['all' => true],

diff --git a/tests/Application/config/packages/_sylius.yaml b/tests/Application/config/packages/_sylius.yaml
@@ -2,7 +2,6 @@ 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" }
 

diff --git a/tests/Application/config/packages/fos_rest.yaml b/tests/Application/config/packages/fos_rest.yaml
diff --git a/tests/Application/config/packages/security.yaml b/tests/Application/config/packages/security.yaml
@@ -40,10 +40,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_admin_regex%/.*"
             provider: sylius_api_admin_user_provider
@@ -74,13 +70,6 @@ security:
                 authenticators:
                     - lexik_jwt_authentication.jwt_token_authenticator
 
-        api:
-            pattern: "%sylius.security.api_regex%/.*"
-            provider: sylius_admin_user_provider
-            fos_oauth: true
-            stateless: true
-            anonymous: true
-
         shop:
             switch_user: { role: ROLE_ALLOWED_TO_SWITCH }
             context: shop
@@ -122,17 +111,16 @@ security:
         - { path: "%sylius.security.shop_regex%/_partial", role: ROLE_NO_ACCESS }
 
         - { path: "%sylius.security.admin_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: "%sylius.security.api_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: "%sylius.security.shop_regex%/login", role: IS_AUTHENTICATED_ANONYMOUSLY }
 
         - { path: "%sylius.security.shop_regex%/register", role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: "%sylius.security.shop_regex%/verify", role: IS_AUTHENTICATED_ANONYMOUSLY }
 
         - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
-        - { path: "%sylius.security.api_regex%/.*", role: ROLE_API_ACCESS }
         - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER }
 
         - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
         - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
-        - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
         - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }
diff --git a/tests/Application/config/routes/sylius_admin_api.yaml b/tests/Application/config/routes/sylius_admin_api.yaml
diff --git a/tests/Behat/Page/Admin/OrderRefundsPage.php b/tests/Behat/Page/Admin/OrderRefundsPage.php
@@ -37,12 +37,12 @@ public function pickUnitWithProductToRefund(string $productName, int $unitNumber
 
         $value = $units[$unitNumber]->find('css','td:nth-child(2)');
 
-        $refunded = substr($this->getUnitRefundedTotal($value), 1);
+        $refunded = (double) substr($this->getUnitRefundedTotal($value), 1);
 
         $total = substr($this->getUnitTotal($value), 1);
 
         /** @var double $total */
-        $total = $total - $refunded;
+        $total -= $refunded;
 
         $units[$unitNumber]->find('css','td:nth-child(3) input')->setValue($total);
     }
@@ -68,7 +68,7 @@ public function pickOrderShipment(?string $shippingMethodName = null): void
         if ($this->getUnitRefundedTotal($orderShipment) !== null) {
             $refunded = $this->getUnitRefundedTotal($orderShipment);
 
-            $total = substr($total, 1) - substr($refunded, 1);
+            $total = (double) substr($total, 1) - (double) substr($refunded, 1);
         }
 
         $orderShipment->find('css','td:nth-child(3) input')->setValue($total);