[UPMERGE] 1.13 -> 2.0 (#15519)

composer-require-checker.json

@@ -53,11 +53,12 @@
     "Payum\\Core\\Security\\TokenInterface",
     "Payum\\Core\\Security\\Util\\Random",
     "Payum\\Core\\Storage\\AbstractStorage",
+    "Payum\\Paypal\\ExpressCheckout\\Nvp\\PaypalExpressCheckoutGatewayFactory",
+    "Payum\\Stripe\\StripeCheckoutGatewayFactory",
     "PHPUnit\\Framework\\ExpectationFailedException",
     "Psr\\Container\\ContainerInterface",
     "Psr\\Http\\Message\\RequestFactoryInterface",
     "Psr\\Http\\Message\\StreamFactoryInterface",
-    "Stripe\\Stripe",
     "Symfony\\Component\\Security\\Core\\Encoder\\EncoderFactoryInterface"
   ],
   "php-core-extensions" : [

composer.json

@@ -62,9 +62,7 @@
         "liip/imagine-bundle": "^2.10",
         "nyholm/psr7": "^1.6",
         "pagerfanta/pagerfanta": "^3.0",
-        "payum/core": "^1.7.3",
         "payum/offline": "^1.7.3",
-        "payum/paypal-express-checkout-nvp": "^1.7.3",
         "payum/payum-bundle": "^2.5",
         "php-http/httplug": "^2.4",
         "php-http/message-factory": "^1.0",
@@ -212,6 +210,8 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.2",
         "mikey179/vfsstream": "^1.6",
         "mockery/mockery": "^1.4",
+        "payum/paypal-express-checkout-nvp": "^1.7.3",
+        "payum/stripe": "^1.7.3",
         "phparkitect/phparkitect": "^0.2.9",
         "phpspec/phpspec": "^7.2",
         "phpspec/prophecy-phpunit": "^2.0",
@@ -224,7 +224,6 @@
         "psalm/plugin-mockery": "1.1.0",
         "psr/event-dispatcher": "^1.0",
         "rector/rector": "^0.18.0",
-        "stripe/stripe-php": "^12.0",
         "sylius-labs/coding-standard": "^4.2",
         "symfony/browser-kit": "^6.3.2",
         "symfony/debug-bundle": "^6.3.2",

features/channel/managing_channels/adding_channel.feature

@@ -10,7 +10,7 @@ Feature: Adding a new channel
         And the store operates in "United States" and "Poland"
         And I am logged in as an administrator
 
-    @ui @api
+    @api @ui
     Scenario: Adding a new channel
         When I want to create a new channel
         And I specify its code as "MOBILE"
@@ -23,7 +23,7 @@ Feature: Adding a new channel
         Then I should be notified that it has been successfully created
         And the channel "Mobile channel" should appear in the registry
 
-    @ui @api
+    @api @ui
     Scenario: Adding a new channel with additional fields
         When I want to create a new channel
         And I specify its code as "MOBILE"

features/channel/managing_channels/adding_channel_with_shop_billing_data.feature

@@ -10,7 +10,7 @@ Feature: Adding a new channel with shop billing data
         And the store operates in "United States"
         And I am logged in as an administrator
 
-    @ui @api
+    @api @ui
     Scenario: Adding a new channel with shop billing data
         When I want to create a new channel
         And I specify its code as "MOBILE"

features/channel/managing_channels/browsing_channels.feature

@@ -9,7 +9,7 @@ Feature: Browsing channels
         And the store operates on another channel named "Mobile Channel"
         And I am logged in as an administrator
 
-    @ui @api
+    @api @ui
     Scenario: Browsing defined channels
         When I want to browse channels
         Then I should see 2 channels in the list

features/channel/managing_channels/channel_unique_code_validation.feature

@@ -8,7 +8,7 @@ Feature: Channel unique code validation
         Given the store operates on a channel identified by "WEB" code
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Trying to add channel with taken code
         When I want to create a new channel
         And I specify its code as "WEB"

features/channel/managing_channels/channel_validation.feature

@@ -7,7 +7,7 @@ Feature: Channel validation
     Background:
         Given I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Trying to add a new channel without specifying its code
         When I want to create a new channel
         And I name it "Mobile channel"
@@ -16,7 +16,7 @@ Feature: Channel validation
         Then I should be notified that code is required
         And channel with name "Mobile channel" should not be added
 
-    @ui
+    @api @ui
     Scenario: Trying to add a new channel without specifying its name
         When I want to create a new channel
         And I specify its code as "MOBILE"
@@ -25,7 +25,7 @@ Feature: Channel validation
         Then I should be notified that name is required
         And channel with code "MOBILE" should not be added
 
-    @ui
+    @api @ui
     Scenario: Trying to add a new channel without base currency
         When I want to create a new channel
         And I specify its code as "MOBILE"
@@ -34,7 +34,7 @@ Feature: Channel validation
         Then I should be notified that base currency is required
         And channel with code "MOBILE" should not be added
 
-    @ui
+    @api @ui
     Scenario: Trying to add a new channel without default locale
         When I want to create a new channel
         And I specify its code as "MOBILE"
@@ -43,7 +43,7 @@ Feature: Channel validation
         Then I should be notified that default locale is required
         And channel with code "MOBILE" should not be added
 
-    @ui
+    @api @ui
     Scenario: Trying to remove name from existing channel
         Given the store operates on a channel named "Web Channel"
         When I want to modify this channel

features/channel/managing_channels/deleting_channel.feature

@@ -9,7 +9,7 @@ Feature: Deleting a channel
         And the store operates on another channel named "Mobile Store"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Deleted channel should disappear from the registry
         When I delete channel "Web Store"
         Then I should be notified that it has been successfully deleted

features/channel/managing_channels/editing_channel.feature

@@ -8,28 +8,20 @@ Feature: Editing channel
         Given the store operates on a channel named "Web Channel"
         And I am logged in as an administrator
 
-    @todo
-    Scenario: Trying to change channel code
+    @api @ui
+    Scenario: Being unable to change the code of an existing channel
         When I want to modify a channel "Web Channel"
-        And I change its code to "MOBILE"
-        And I save my changes
-        Then I should be notified that code cannot be changed
-        And channel "Web Channel" should still have code "MOBILE"
-
-    @ui
-    Scenario: Seeing disabled code field when editing channel
-        When I want to modify a channel "Web Channel"
-        Then the code field should be disabled
+        Then I should not be able to edit its code
 
-    @ui
+    @api @ui
     Scenario: Renaming the channel
         When I want to modify a channel "Web Channel"
         And I rename it to "Website store"
         And I save my changes
         Then I should be notified that it has been successfully edited
         And this channel name should be "Website store"
 
-    @ui
-    Scenario: Seeing disabled base currency field during channel edition
+    @api @ui
+    Scenario: Being unable to change base currency of an existing channel
         When I want to modify a channel "Web Channel"
-        Then the base currency field should be disabled
+        Then I should not be able to edit its base currency

features/channel/managing_channels/editing_menu_taxon_on_channel.feature

@@ -11,7 +11,7 @@ Feature: Editing menu taxon on channel
         And channel "Web Store" has menu taxon "Clothes"
         And I am logged in as an administrator
 
-    @ui @javascript
+    @api @ui @javascript
     Scenario: Editing menu taxon on the channel
         When I want to modify a channel "Web Store"
         And I change its menu taxon to "Guns"

features/channel/managing_channels/editing_shop_billing_data_on_channel.feature

@@ -10,14 +10,20 @@ Feature: Editing shop billing data on channel
         And channel "Web Store" billing data is "Ragnarok", "Pacific Coast Hwy", "90806" "Los Angeles", "United States" with "1100110011" tax ID
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Editing shop billing data on channel
         When I want to modify a channel "Web Store"
-        And I specify company as "Götterdämmerung"
-        And I specify tax ID as "666777"
-        And I specify shop billing address as "Valhalla", "123" "Asgard", "United States"
+        And I specify shop billing data for this channel as "Götterdämmerung", "Valhalla", "123", "Asgard", "666777" tax ID and "United States" country
         And I save my changes
         Then I should be notified that it has been successfully edited
         And this channel company should be "Götterdämmerung"
         And this channel tax ID should be "666777"
-        And this channel shop billing address should be "Valhalla", "123" "Asgard", "United States"
+        And this channel shop billing address should be "Valhalla", "123" "Asgard" and "United States" country
+
+    @api @no-ui
+    Scenario: Editing shop billing data with wrong country code
+        When I want to modify a channel "Web Store"
+        And I specify new country code for this channel as "ZZ"
+        And I save my changes
+        Then I should be notified that it is not a valid country
+        And this channel shop billing address should still be "Pacific Coast Hwy", "90806" "Los Angeles" and "United States" country

features/channel/managing_channels/not_being_able_to_add_disabled_channel_when_no_other_exist.feature

@@ -9,8 +9,8 @@ Feature: Not being able to add a disabled channel when no other exist
         And the store has locale "English (United States)"
         And I am logged in as an administrator
 
-    @ui
-    Scenario: Adding a new disabled channel should result
+    @api @ui
+    Scenario: Trying to add a new disabled channel when no other exist
         When I want to create a new channel
         And I specify its code as "MOBILE"
         And I name it "Mobile channel"

features/channel/managing_channels/not_being_able_to_delete_last_available_channel.feature

@@ -8,8 +8,8 @@ Feature: Not being able to delete a last available channel
         Given the store operates on a channel named "Web Store"
         And I am logged in as an administrator
 
-    @ui
-    Scenario: Prevented from deleting only channel
+    @api @ui
+    Scenario: Preventing from deleting only channel
         When I delete channel "Web Store"
         Then I should be notified that it cannot be deleted
         And this channel should still be in the registry

features/channel/managing_channels/not_being_able_to_disable_last_available_channel.feature

@@ -8,7 +8,7 @@ Feature: Toggling a channel
         Given the store operates on a channel named "Web Channel"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Disabling the last available channel
         Given the channel "Web Channel" is enabled
         When I want to modify this channel

features/channel/managing_channels/selecting_currencies_available_for_channel.feature

@@ -7,20 +7,24 @@ Feature: Selecting available currencies for a channel
     Background:
         Given the store has currency "Euro"
         And the store has locale "English (United States)"
+        And the store operates in "United States"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Adding a new channel with currencies
         When I want to create a new channel
         And I specify its code as MOBILE
+        And I choose "Euro" as the base currency
         And I name it "Mobile store"
         And I allow for paying in "Euro"
+        And I make it available in "English (United States)"
         And I choose "English (United States)" as a default locale
+        And I select the "Order items based" as tax calculation strategy
         And I add it
         Then I should be notified that it has been successfully created
         And paying in Euro should be possible for the "Mobile store" channel
 
-    @ui
+    @api @ui
     Scenario: Adding currencies to an existing channel
         Given the store operates on a channel named "Web store"
         When I want to modify this channel

features/channel/managing_channels/selecting_default_tax_zone_for_channel.feature

@@ -8,19 +8,21 @@ Feature: Selecting default tax zone for a channel
         Given the store operates on a single channel in "United States"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Adding a new channel with default tax zone
         When I want to create a new channel
         And I specify its code as "MOBILE"
         And I name it "Mobile store"
         And I select the "United States" as default tax zone
         And I choose "USD" as the base currency
+        And I make it available in "English (United States)"
         And I choose "English (United States)" as a default locale
+        And I select the "Order items based" as tax calculation strategy
         And I add it
         Then I should be notified that it has been successfully created
         And the default tax zone for the "Mobile store" channel should be "United States"
 
-    @ui
+    @api @ui
     Scenario: Selecting default tax zone for existing channel
         Given the store operates on a channel named "Web store"
         When I want to modify this channel
@@ -29,7 +31,7 @@ Feature: Selecting default tax zone for a channel
         Then I should be notified that it has been successfully edited
         And the default tax zone for the "Web store" channel should be "United States"
 
-    @ui
+    @api @ui
     Scenario: Removing existing channel default tax zone
         Given the store operates on a channel named "Web store"
         And its default tax zone is zone "US"

features/channel/managing_channels/selecting_locales_available_for_channel.feature

@@ -9,19 +9,20 @@ Feature: Selecting available locales for a channel
         And the store has locale "English (United States)"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Adding a new channel with locales
         When I want to create a new channel
         And I specify its code as "MOBILE"
         And I name it "Mobile Channel"
         And I make it available in "English (United States)"
         And I choose "Euro" as the base currency
         And I choose "English (United States)" as a default locale
+        And I select the "Order items based" as tax calculation strategy
         And I add it
         Then I should be notified that it has been successfully created
         And the channel "Mobile Channel" should be available in "English (United States)"
 
-    @ui
+    @api @ui
     Scenario: Adding locales to an existing channel
         Given the store operates on a channel named "Web Channel"
         When I want to modify this channel
@@ -30,23 +31,23 @@ Feature: Selecting available locales for a channel
         Then I should be notified that it has been successfully edited
         And the channel "Web Channel" should be available in "English (United States)"
 
-    @ui
+    @api @ui
     Scenario: Being unable to disable locale used as the default one for a channel
         Given the store operates on a channel named "Web"
         And this channel allows to shop using "English (United States)" and "Polish (Poland)" locales
         And this channel uses the "English (United States)" locale as default
-        And I am modifying a channel "Web"
-        When I make it available only in "Polish (Poland)"
+        When I want to modify this channel
+        And I make it available only in "Polish (Poland)"
         And I try to save my changes
         Then I should be notified that the default locale has to be enabled
 
-    @ui
+    @api @ui
     Scenario: Being unable to set disabled locale as a default one for a channel
         Given the store has locale "Polish (Poland)"
         And the store operates on a channel named "Web"
         And this channel allows to shop using the "English (United States)" locale
         And this channel uses the "English (United States)" locale as default
-        And I am modifying a channel "Web"
-        When I choose "Polish (Poland)" as a default locale
+        When I want to modify this channel
+        And I choose "Polish (Poland)" as a default locale
         And I try to save my changes
         Then I should be notified that the default locale has to be enabled

features/channel/managing_channels/selecting_tax_calculation_strategy_for_channel.feature

@@ -20,19 +20,20 @@ Feature: Selecting tax calculation strategy for a channel
         Then I should be notified that it has been successfully created
         And the tax calculation strategy for the "Mobile store" channel should be "Order items based"
 
-    @ui
+    @api @ui
     Scenario: Adding a new channel with tax calculation strategy
         When I want to create a new channel
         And I specify its code as "MOBILE"
         And I select the "Order item units based" as tax calculation strategy
         And I name it "Mobile store"
         And I choose "Euro" as the base currency
+        And I make it available in "English (United States)"
         And I choose "English (United States)" as a default locale
         And I add it
         Then I should be notified that it has been successfully created
         And the tax calculation strategy for the "Mobile store" channel should be "Order item units based"
 
-    @ui
+    @api @ui
     Scenario: Changing tax calculation strategy of existing channel
         Given the store operates on a channel named "Web store"
         When I want to modify this channel

features/channel/managing_channels/toggling_channel.feature

@@ -9,7 +9,7 @@ Feature: Toggling a channel
         And the store operates on another channel named "Mobile Channel"
         And I am logged in as an administrator
 
-    @ui
+    @api @ui
     Scenario: Disabling the channel
         Given the channel "Web Channel" is enabled
         When I want to modify this channel
@@ -18,7 +18,7 @@ Feature: Toggling a channel
         Then I should be notified that it has been successfully edited
         And this channel should be disabled
 
-    @ui
+    @api @ui
     Scenario: Enabling the channel
         Given the channel "Web Channel" is disabled
         When I want to modify this channel