Merge branch '2.0' into SYL-3092-remove-autoconfigure-with-attributes-parameter

UPGRADE-2.0.md

@@ -16,6 +16,13 @@
   * `Sylius\Bundle\OrderBundle\Attribute\AsCartContext`
   * `Sylius\Bundle\OrderBundle\Attribute\AsOrderProcessor`
 
+* The `sylius_user.resources.{name}.user.resetting.pin` configuration parameter has been removed.
+  The corresponding email `reset_password_pin` and `Sylius\Bundle\UserBundle\Controller\UserController::requestPasswordResetPinAction`
+  method have been removed. The related services have been removed as well:
+
+    * `sylius.{user_type}_user.pin_generator.password_reset`
+    * `sylius.{user_type}_user.pin_uniqueness_checker.password_reset`
+
 ## Dependencies
 
 * The following dependencies have been removed, install them in your application, if you still want to use Winzou State Machine:
@@ -131,6 +138,9 @@
 | `sylius.expired_carts_remover`                                                                             | `sylius.remover.expired_carts`                                                       |
 | `sylius.sequential_order_number_generator`                                                                 | `sylius.number_generator.sequential_order`                                           |
 | `Sylius\Bundle\OrderBundle\Console\Command\RemoveExpiredCartsCommand`                                      | `sylius.console.command.remove_expired_carts`                                        |
+| **PaymentBundle**                                                                                          |                                                                                      |
+| `sylius.payment_methods_resolver`                                                                          | `sylius.resolver.payment_methods`                                                    |
+| `sylius.payment_methods_resolver.default`                                                                  | `sylius.resolver.payment_methods.default`                                            |
 | **ProductBundle**                                                                                          |                                                                                      |
 | `sylius.form.type.sylius_product_associations`                                                             | `sylius.form.type.product_associations`                                              |
 | `sylius.form.event_subscriber.product_variant_generator`                                                   | `sylius.form.event_subscriber.generate_product_variants`                             |
@@ -431,21 +441,42 @@
           - 'sylius_zone_member_zone'
   ```
 
+* The `locked`, `expiresAt` and `credentialsExpireAt` fields have been removed from the User model, both ShopUser and AdminUser, 
+  as well as the corresponding methods in the User model and columns in the database tables.
+
 * The following classes and interfaces have been removed:
 
     * `Sylius\Bundle\CoreBundle\Templating\Helper\CheckoutStepsHelper`
     * `Sylius\Bundle\CoreBundle\Templating\Helper\PriceHelper`
     * `Sylius\Bundle\CoreBundle\Templating\Helper\VariantResolverHelper`
-    * `Sylius\Bundle\CurrencyBundle/Templating/Helper/CurrencyHelper`
-    * `Sylius\Bundle\CurrencyBundle/Templating/Helper/CurrencyHelperInterface`
-    * `Sylius\Bundle\InventoryBundle/Templating/Helper/InventoryHelper`
-    * `Sylius\Bundle\LocaleBundle/Templating/Helper/LocaleHelper`
-    * `Sylius\Bundle\LocaleBundle/Templating/Helper/LocaleHelperInterface`
+    * `Sylius\Bundle\CurrencyBundle\Templating\Helper\CurrencyHelper`
+    * `Sylius\Bundle\CurrencyBundle\Templating\Helper\CurrencyHelperInterface`
+    * `Sylius\Bundle\InventoryBundle\Templating\Helper\InventoryHelper`
+    * `Sylius\Bundle\LocaleBundle\Templating\Helper\LocaleHelper`
+    * `Sylius\Bundle\LocaleBundle\Templating\Helper\LocaleHelperInterface`
     * `Sylius\Bundle\MoneyBundle\Templating\Helper\ConvertMoneyHelper`
     * `Sylius\Bundle\MoneyBundle\Templating\Helper\ConvertMoneyHelperInterface`
     * `Sylius\Bundle\MoneyBundle\Templating\Helper\FormatMoneyHelper`
     * `Sylius\Bundle\MoneyBundle\Templating\Helper\FormatMoneyHelperInterface`
-    * `Sylius\Bundle\OrderBundle/Templating/Helper/AdjustmentsHelper`
+    * `Sylius\Bundle\OrderBundle\Templating\Helper\AdjustmentsHelper`
+    * `Sylius\Bundle\UserBundle\Security\UserLogin`
+    * `Sylius\Bundle\UserBundle\Security\UserLoginInterface`
+    * `Sylius\Bundle\UserBundle\Security\UserPasswordHasher`
+    * `Sylius\Bundle\UserBundle\Security\UserPasswordHasherInterface`
+    * `Sylius\Component\User\Security\Generator\UniquePinGenerator`
+
+* The following services and aliases have been removed:
+
+    * `sylius.security.password_hasher`
+    * `sylius.security.user_login`
+    * `Sylius\Bundle\UserBundle\Security\UserLoginInterface`
+    * `Sylius\Component\User\Security\UserPasswordHasherInterface`
+
+* The service `sylius.form_registry.payum_gateway_config` has been moved to the `PaymentBundle`, and its ID changed to `sylius.form_registry.payment_gateway_config`.
+
+* The class `Sylius\Bundle\PayumBundle\Validator\GatewayFactoryExistsValidator` has been moved to the `PaymentBundle`, and its service ID changed to`sylius.validator.gateway_factory_exists`.
+
+* The class `Sylius\Bundle\PayumBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator` has been moved to the `PaymentBundle`, and its service ID changed to`sylius.validator.groups_generator.gateway_config`.
 
 ### Constructors signature changes
 
@@ -619,6 +650,30 @@ The following classes have been removed:
     - Sylius\Component\Core\Grid\Filter\EntitiesFilter
     - Sylius\Bundle\CoreBundle\Form\Type\Grid\Filter\EntitiesFilterType
 
+## Security
+
+* API firewalls have been renamed and user checkers have been configured on firewalls 
+  with `security.user_checker.chain.<firewall>` service:
+
+    ```diff
+    security:
+        firewalls:
+            admin:
+                ...
+    +           user_checker: security.user_checker.chain.admin
+    -       new_api_admin_user:
+    +       api_admin:
+                ...
+    +           user_checker: security.user_checker.chain.api_admin
+    -       new_api_shop_user:
+    +       api_shop:
+                ...
+    +           user_checker: security.user_checker.chain.api_shop
+            shop:
+                ...
+    +           user_checker: security.user_checker.chain.shop
+    ```
+
 ## Password Encoder & Salt
 The encoder and salt has been removed from the User entities. It will use the password hasher configured on Symfony security configuration.
 
@@ -708,7 +763,6 @@ If your app never changed the hasher name configuration, you don't need to confi
     * `Sylius\Bundle\UiBundle\Twig\TemplateEventExtension`
     * `Sylius\Bundle\UiBundle\Twig\TestHtmlAttributeExtension`
     * `Sylius\Bundle\UiBundle\Twig\TestFormAttributeExtension`
-    * `Sylius\Bundle\UiBundle\Twig\RouteExistsExtension`
     * `Sylius\Bundle\UiBundle\Twig\SortByExtension`
 
 * The following services have been renamed:

UPGRADE-API-1.14.md

@@ -0,0 +1,14 @@
+# UPGRADE FROM `v1.13.X` TO `v1.14.0`
+
+1. The following old parameters have been deprecated and will be removed in Sylius 2.0. Use the corresponding new parameters instead:
+
+   | Old parameter                                | New parameter                            |
+   |----------------------------------------------|------------------------------------------|
+   | `sylius.security.new_api_route`              | `sylius.security.api_route`              |
+   | `sylius.security.new_api_regex`              | `sylius.security.api_regex`              |
+   | `sylius.security.new_api_admin_route`        | `sylius.security.api_admin_route`        |
+   | `sylius.security.new_api_admin_regex`        | `sylius.security.api_admin_regex`        |
+   | `sylius.security.new_api_shop_route`         | `sylius.security.api_shop_route`         |
+   | `sylius.security.new_api_shop_regex`         | `sylius.security.api_shop_regex`         |
+   | `sylius.security.new_api_user_account_route` | `sylius.security.api_shop_account_route` |
+   | `sylius.security.new_api_user_account_regex` | `sylius.security.api_shop_account_regex` |

config/packages/security.yaml

@@ -17,6 +17,7 @@ security:
             context: admin
             pattern: "%sylius.security.admin_regex%"
             provider: sylius_admin_user_provider
+            user_checker: security.user_checker.chain.admin
             form_login:
                 provider: sylius_admin_user_provider
                 login_path: sylius_admin_login
@@ -38,26 +39,28 @@ security:
                 path: sylius_admin_logout
                 target: sylius_admin_login
 
-        new_api_admin_user:
-            pattern: "%sylius.security.new_api_admin_regex%/.*"
+        api_admin:
+            pattern: "%sylius.security.api_admin_regex%/.*"
             provider: sylius_api_admin_user_provider
+            user_checker: security.user_checker.chain.api_admin
             stateless: true
             entry_point: jwt
             json_login:
-                check_path: "%sylius.security.new_api_admin_route%/administrators/token"
+                check_path: "%sylius.security.api_admin_route%/administrators/token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
                 failure_handler: lexik_jwt_authentication.handler.authentication_failure
             jwt: true
 
-        new_api_shop_user:
-            pattern: "%sylius.security.new_api_shop_regex%/.*"
+        api_shop:
+            pattern: "%sylius.security.api_shop_regex%/.*"
             provider: sylius_api_shop_user_provider
+            user_checker: security.user_checker.chain.api_shop
             stateless: true
             entry_point: jwt
             json_login:
-                check_path: "%sylius.security.new_api_shop_route%/customers/token"
+                check_path: "%sylius.security.api_shop_route%/customers/token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
@@ -69,6 +72,7 @@ security:
             context: shop
             pattern: "%sylius.security.shop_regex%"
             provider: sylius_shop_user_provider
+            user_checker: security.user_checker.chain.shop
             form_login:
                 success_handler: sylius.authentication.success_handler
                 failure_handler: sylius.authentication.failure_handler
@@ -118,9 +122,9 @@ security:
         - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
         - { path: "%sylius.security.shop_regex%/account", role: ROLE_USER }
 
-        - { path: "%sylius.security.new_api_admin_route%/administrators/reset-password", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
-        - { path: "%sylius.security.new_api_admin_route%/administrators/token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
-        - { path: "%sylius.security.new_api_shop_route%/customers/token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_shop_regex%/.*", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_admin_route%/administrators/reset-password", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_admin_regex%/.*", role: ROLE_API_ACCESS }
+        - { path: "%sylius.security.api_admin_route%/administrators/token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_account_regex%/.*", role: ROLE_USER }
+        - { path: "%sylius.security.api_shop_route%/customers/token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_regex%/.*", role: PUBLIC_ACCESS }

config/routes/sylius_api.yaml

@@ -1,3 +1,3 @@
 sylius_api:
     resource: "@SyliusApiBundle/Resources/config/routing.yml"
-    prefix: "%sylius.security.new_api_route%"
+    prefix: "%sylius.security.api_route%"

docs/components_and_bundles/bundles/SyliusUserBundle/summary.rst

@@ -33,9 +33,6 @@ Configuration reference
                             ttl: P1D
                             length: 16
                             field_name: passwordResetToken
-                        pin:
-                            length: 4
-                            field_name: passwordResetToken
                     verification:
                         token:
                             length: 16
@@ -56,9 +53,6 @@ Configuration reference
                             ttl: P1D
                             length: 16
                             field_name: passwordResetToken
-                        pin:
-                            length: 4
-                            field_name: passwordResetToken
                     verification:
                         token:
                             length: 16
@@ -79,9 +73,6 @@ Configuration reference
                             ttl: P1D
                             length: 16
                             field_name: passwordResetToken
-                        pin:
-                            length: 4
-                            field_name: passwordResetToken
                     verification:
                         token:
                             length: 16

docs/cookbook/shop/disabling-guest-checkout.rst

@@ -37,13 +37,13 @@ We will modify the same file as in example on top, the ``security.yaml``:
     # config/packages/security.yaml
     security:
         access_control:
-           - { path: "%sylius.security.new_api_shop_regex%/orders", method: POST, GET , role: IS_AUTHENTICATED_ANONYMOUSLY }
-           - { path: "%sylius.security.new_api_shop_regex%/orders/.*/items", method: POST , role: IS_AUTHENTICATED_ANONYMOUSLY }
-           - { path: "%sylius.security.new_api_shop_regex%/.*", role: ROLE_USER }
+           - { path: "%sylius.security.api_shop_regex%/orders", method: POST, GET , role: IS_AUTHENTICATED_ANONYMOUSLY }
+           - { path: "%sylius.security.api_shop_regex%/orders/.*/items", method: POST , role: IS_AUTHENTICATED_ANONYMOUSLY }
+           - { path: "%sylius.security.api_shop_regex%/.*", role: ROLE_USER }
 
 .. warning::
 
-    The "main" path (in this example ``"%sylius.security.new_api_shop_regex%/.*"`` ) should be at the very end of the configuration
+    The "main" path (in this example ``"%sylius.security.api_shop_regex%/.*"`` ) should be at the very end of the configuration
     with the same route, otherwise this would not work.
 
 Now when an anonymous user will try to use other checkout routes they will be informed that they are not authenticated:

docs/customization/api/modifying_endpoints.rst

@@ -22,7 +22,7 @@ The next step is to modify the security configuration in ``config/packages/secur
 .. code-block:: yaml
 
     parameters:
-        sylius.security.new_api_shop_route: "%sylius.security.new_api_route%/retail"
+        sylius.security.api_shop_route: "%sylius.security.api_route%/retail"
 
 .. warning::
 

features/admin/promotion/managing_promotions/promotion_validation.feature

@@ -78,7 +78,7 @@ Feature: Promotion validation
         Then I should be notified that promotion label in "Polish (Poland)" locale is too long
 
     @api @ui @mink:chromedriver
-    Scenario: Trying to add a new promotion without specifying a order percentage discount
+    Scenario: Trying to add a new promotion without specifying an order percentage discount
         When I want to create a new promotion
         And I specify its code as "christmas_sale"
         And I name it "Christmas sale"

phpstan-baseline.neon

@@ -1855,11 +1855,6 @@ parameters:
 			count: 1
 			path: src/Sylius/Bundle/UserBundle/Provider/UserProviderInterface.php
 
-		-
-			message: "#^Method Sylius\\\\Bundle\\\\UserBundle\\\\Security\\\\UserLoginInterface\\:\\:login\\(\\) has no return type specified\\.$#"
-			count: 1
-			path: src/Sylius/Bundle/UserBundle/Security/UserLoginInterface.php
-
 		-
 			message: "#^Method Sylius\\\\Component\\\\Addressing\\\\Comparator\\\\AddressComparator\\:\\:normalizeAddress\\(\\) return type has no value type specified in iterable type array\\.$#"
 			count: 1

src/Sylius/Abstraction/StateMachine/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Behat/Context/Cli/ChangeAdminPasswordContext.php

@@ -16,10 +16,10 @@ namespace Sylius\Behat\Context\Cli;
 use Behat\Behat\Context\Context;
 use Sylius\Component\Core\Model\AdminUserInterface;
 use Sylius\Component\User\Repository\UserRepositoryInterface;
-use Sylius\Component\User\Security\UserPasswordHasherInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Webmozart\Assert\Assert;
 
 final class ChangeAdminPasswordContext implements Context
@@ -30,13 +30,14 @@ final class ChangeAdminPasswordContext implements Context
 
     private ?CommandTester $commandTester = null;
 
-    private $input = [];
+    /** @var array<string, string> */
+    private array $input = [];
 
     /** @param UserRepositoryInterface<AdminUserInterface> $adminUserRepository */
     public function __construct(
         KernelInterface $kernel,
-        private UserRepositoryInterface $adminUserRepository,
-        private UserPasswordHasherInterface $userPasswordHasher,
+        private readonly UserRepositoryInterface $adminUserRepository,
+        private readonly UserPasswordHasherInterface $userPasswordHasher,
     ) {
         $this->application = new Application($kernel);
     }
@@ -93,6 +94,9 @@ final class ChangeAdminPasswordContext implements Context
         $adminUser = $this->adminUserRepository->findOneByEmail($email);
         $adminUser->setPlainPassword($password);
 
-        Assert::same($adminUser->getPassword(), $this->userPasswordHasher->hash($adminUser));
+        Assert::same(
+            $adminUser->getPassword(),
+            $this->userPasswordHasher->hashPassword($adminUser, $adminUser->getPlainPassword()),
+        );
     }
 }

src/Sylius/Behat/Resources/config/services/api.xml

@@ -35,14 +35,14 @@
         <service id="sylius.behat.client.admin_api_platform_security_client" class="Sylius\Behat\Client\ApiPlatformSecurityClient">
             <argument type="service" id="test.client" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>admin/administrators/token</argument>
         </service>
 
         <service id="sylius.behat.client.shop_api_platform_security_client" class="Sylius\Behat\Client\ApiPlatformSecurityClient">
             <argument type="service" id="test.client" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>shop/customers/token</argument>
         </service>
 
@@ -50,7 +50,7 @@
 
         <service id="sylius.behat.request_factory" class="Sylius\Behat\Client\RequestFactory">
             <argument type="service" id="sylius.behat.content_type_guide"/>
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
     </services>
 </container>

src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml

@@ -86,7 +86,7 @@
             <argument type="service" id="sylius.behat.api_platform_client.admin" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.admin.managing_locales" class="Sylius\Behat\Context\Api\Admin\ManagingLocalesContext">
@@ -134,7 +134,7 @@
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="Sylius\Behat\Service\Converter\IriConverter" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.admin.managing_product_variants" class="Sylius\Behat\Context\Api\Admin\ManagingProductVariantsContext">
@@ -190,7 +190,7 @@
             <argument type="service" id="sylius.behat.api_platform_client.admin" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="api_platform.symfony.iri_converter" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.admin.managing_shipments" class="Sylius\Behat\Context\Api\Admin\ManagingShipmentsContext">
@@ -198,7 +198,7 @@
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="Sylius\Behat\Service\Converter\IriConverter" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.admin.managing_orders" class="Sylius\Behat\Context\Api\Admin\ManagingOrdersContext">
@@ -257,7 +257,7 @@
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="sylius.behat.request_factory" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.admin.channel_pricing_log_entry" class="Sylius\Behat\Context\Api\Admin\ChannelPricingLogEntryContext">

src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml

@@ -29,7 +29,7 @@
             <argument type="service" id="sylius.behat.api_platform_client.shop" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="sylius.behat.shared_storage" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.currency" class="Sylius\Behat\Context\Api\Shop\CurrencyContext">
@@ -46,7 +46,7 @@
             <argument type="service" id="sylius.resolver.product_variant" />
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.customer" class="Sylius\Behat\Context\Api\Shop\CustomerContext">
@@ -57,7 +57,7 @@
             <argument type="service" id="sylius.behat.context.api.shop.login" />
             <argument type="service" id="sylius.behat.context.setup.shop_api_security" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.exchange_rate" class="Sylius\Behat\Context\Api\Shop\ExchangeRateContext">
@@ -90,7 +90,7 @@
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="doctrine.orm.entity_manager" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.login" class="Sylius\Behat\Context\Api\Shop\LoginContext">
@@ -101,7 +101,7 @@
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.product" class="Sylius\Behat\Context\Api\Shop\ProductContext">
@@ -112,7 +112,7 @@
             <argument type="service" id="sylius.behat.channel_context_setter" />
             <argument type="service" id="sylius.behat.request_factory" />
             <argument type="service" id="doctrine.orm.entity_manager" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.product_attribute" class="Sylius\Behat\Context\Api\Shop\ProductAttributeContext">
@@ -141,7 +141,7 @@
             <argument type="service" id="sylius.behat.shared_storage" />
             <argument type="service" id="Sylius\Behat\Client\ResponseCheckerInterface" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.order" class="Sylius\Behat\Context\Api\Shop\OrderContext">
@@ -152,7 +152,7 @@
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="sylius.behat.api_security" />
             <argument type="service" id="sylius.behat.request_factory" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="sylius.behat.context.api.shop.order_item" class="Sylius\Behat\Context\Api\Shop\OrderItemContext">

src/Sylius/Behat/Resources/config/services/contexts/cli.xml

@@ -36,7 +36,7 @@
         <service id="sylius.behat.context.cli.change_admin_password" class="Sylius\Behat\Context\Cli\ChangeAdminPasswordContext">
             <argument type="service" id="kernel" />
             <argument type="service" id="sylius.repository.admin_user" />
-            <argument type="service" id="sylius.security.password_hasher" />
+            <argument type="service" id="security.user_password_hasher" />
         </service>
     </services>
 </container>

src/Sylius/Bundle/AddressingBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/AdminBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/AdminBundle/spec/Provider/LoggedInAdminUserProviderSpec.php

@@ -30,7 +30,7 @@ final class LoggedInAdminUserProviderSpec extends ObjectBehavior
 {
     private const SECURITY_SESSION_KEY = '_security_admin';
 
-    private const SERIALIZED_TOKEN = 'O:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":3:{i:0;N;i:1;s:5:"admin";i:2;a:5:{i:0;O:37:"Sylius\Component\Core\Model\AdminUser":6:{i:0;s:6:"sylius";i:1;s:6:"sylius";i:2;s:6:"sylius";i:3;b:0;i:4;b:1;i:5;i:404;}i:1;b:1;i:2;N;i:3;a:0:{}i:4;a:2:{i:0;s:26:"ROLE_ADMINISTRATION_ACCESS";i:1;s:15:"ROLE_API_ACCESS";}}}';
+    private const SERIALIZED_TOKEN = 'O:74:"Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken":3:{i:0;N;i:1;s:5:"admin";i:2;a:5:{i:0;O:37:"Sylius\Component\Core\Model\AdminUser":5:{i:0;s:6:"sylius";i:1;s:6:"sylius";i:2;s:6:"sylius";i:3;b:1;i:4;i:404;}i:1;b:1;i:2;N;i:3;a:0:{}i:4;a:2:{i:0;s:26:"ROLE_ADMINISTRATION_ACCESS";i:1;s:15:"ROLE_API_ACCESS";}}}';
 
     function let(
         Security $security,

src/Sylius/Bundle/ApiBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentMethod.xml

@@ -86,7 +86,7 @@
                 </normalizationContext>
                 <validationContext>
                     <values>
-                        <value name="groups">sylius_api.validator.payment_method_groups_generator</value>
+                        <value name="groups">sylius_api.validator.groups_generator.payment_method</value>
                     </values>
                 </validationContext>
             </operation>
@@ -116,7 +116,7 @@
                 </normalizationContext>
                 <validationContext>
                     <values>
-                        <value name="groups">sylius_api.validator.payment_method_groups_generator</value>
+                        <value name="groups">sylius_api.validator.groups_generator.payment_method</value>
                     </values>
                 </validationContext>
             </operation>

src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml

@@ -9,6 +9,16 @@ parameters:
         - "sylius_api_shop_order_payment_get_configuration"
         - "sylius_api_shop_order_payment_patch"
         - "sylius_api_shop_order_payment_patch_account"
+    sylius.security.api_route: "%sylius.security.new_api_route%"
+    sylius.security.api_regex: "%sylius.security.new_api_regex%"
+    sylius.security.api_admin_route: "%sylius.security.new_api_admin_route%"
+    sylius.security.api_admin_regex: "%sylius.security.new_api_admin_regex%"
+    sylius.security.api_shop_route: "%sylius.security.new_api_shop_route%"
+    sylius.security.api_shop_regex: "%sylius.security.new_api_shop_regex%"
+    sylius.security.api_shop_account_route: "%sylius.security.new_api_user_account_route%"
+    sylius.security.api_shop_account_regex: "%sylius.security.new_api_user_account_regex%"
+
+    # Below parameters are deprecated since Sylius 1.14 and will be removed in 2.0.    
     sylius.security.new_api_route: "/api/v2"
     sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
     sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"

src/Sylius/Bundle/ApiBundle/Resources/config/integrations/swagger.xml

@@ -29,7 +29,7 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\AdministratorDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
@@ -48,12 +48,12 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductReviewDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductSlugDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
@@ -62,26 +62,26 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\ShippingMethodDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>%sylius.shipping_method_rules%</argument>
             <argument>%sylius.shipping_calculators%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\CustomerDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\StatisticsDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument type="service" id="clock" />
             <argument>%sylius_core.orders_statistics.intervals_map%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\PromotionDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>%sylius.promotion_actions%</argument>
             <argument>%sylius.promotion_rules%</argument>
             <tag name="sylius.open_api.modifier" />
@@ -98,7 +98,7 @@
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\OpenApi\Documentation\OrderAdjustmentsTypeDocumentationModifier">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>%sylius.model.adjustment.class%</argument>
             <tag name="sylius.open_api.modifier" />
         </service>

src/Sylius/Bundle/ApiBundle/Resources/config/services/contexts.xml

@@ -25,7 +25,7 @@
         <service id="Sylius\Bundle\ApiBundle\Context\TokenValueBasedCartContext">
             <argument type="service" id="request_stack" />
             <argument type="service" id="sylius.repository.order" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="sylius.context.cart" priority="-333" />
         </service>
     </services>

src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml

@@ -30,7 +30,7 @@
 
         <service id="Sylius\Bundle\ApiBundle\EventSubscriber\KernelRequestEventSubscriber">
             <argument>%sylius_api.enabled%</argument>
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <tag name="kernel.event_subscriber" />
         </service>
 

src/Sylius/Bundle/ApiBundle/Resources/config/services/providers.xml

@@ -25,7 +25,7 @@
         <defaults public="true" />
 
         <service id="Sylius\Bundle\ApiBundle\Provider\PathPrefixProviderInterface" class="Sylius\Bundle\ApiBundle\Provider\PathPrefixProvider">
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
             <argument>%sylius.api_path_prefixes%</argument>
         </service>
 

src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml

@@ -40,7 +40,7 @@
         <service id="Sylius\Bundle\ApiBundle\Serializer\HydraErrorNormalizer" decorates="api_platform.hydra.normalizer.error">
             <argument type="service" id="Sylius\Bundle\ApiBundle\Serializer\HydraErrorNormalizer.inner" />
             <argument type="service" id="request_stack" />
-            <argument>%sylius.security.new_api_route%</argument>
+            <argument>%sylius.security.api_route%</argument>
         </service>
 
         <service id="Sylius\Bundle\ApiBundle\Serializer\ProductNormalizer">

src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml

@@ -54,7 +54,7 @@
             <argument type="service" id="sylius.repository.payment" />
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="sylius.section_resolver.uri_based_section_resolver" />
-            <argument type="service" id="sylius.payment_methods_resolver" />
+            <argument type="service" id="sylius.resolver.payment_methods" />
             <tag name="api_platform.state_provider" />
         </service>
 

src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml

@@ -215,12 +215,12 @@
         </service>
 
         <service
-            id="sylius_api.validator.payment_method_groups_generator"
+            id="sylius_api.validator.groups_generator.payment_method"
             class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGenerator"
-            decorates="sylius.validator.payment_method_groups_generator"
+            decorates="sylius.validator.groups_generator.payment_method"
         >
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
-            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
+            <argument type="service" id="sylius.validator.groups_generator.gateway_config" />
             <tag name="api_platform.validation_groups_generator" />
         </service>
 

src/Sylius/Bundle/ApiBundle/Tests/Application/config/routing.yaml

@@ -1,3 +1,3 @@
 sylius_api:
     resource: "@SyliusApiBundle/Resources/config/routing.yml"
-    prefix: "%sylius.security.new_api_route%"
+    prefix: "%sylius.security.api_route%"

src/Sylius/Bundle/ApiBundle/Tests/Application/config/security.yaml

@@ -9,24 +9,24 @@ security:
         Sylius\Component\User\Model\UserInterface: plaintext
 
     firewalls:
-        new_api_admin_user:
-            pattern: "%sylius.security.new_api_admin_regex%/.*"
+        api_admin:
+            pattern: "%sylius.security.api_admin_regex%/.*"
             provider: sylius_api_admin_user_provider
             stateless: true
             json_login:
-                check_path: "%sylius.security.new_api_admin_route%/authentication-token"
+                check_path: "%sylius.security.api_admin_route%/authentication-token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
                 failure_handler: lexik_jwt_authentication.handler.authentication_failure
             jwt: ~
 
-        new_api_shop_user:
-            pattern: "%sylius.security.new_api_shop_regex%/.*"
+        api_shop:
+            pattern: "%sylius.security.api_shop_regex%/.*"
             provider: sylius_api_shop_user_provider
             stateless: true
             json_login:
-                check_path: "%sylius.security.new_api_shop_route%/authentication-token"
+                check_path: "%sylius.security.api_shop_route%/authentication-token"
                 username_path: email
                 password_path: password
                 success_handler: lexik_jwt_authentication.handler.authentication_success
@@ -38,8 +38,8 @@ security:
             security: false
 
     access_control:
-        - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
-        - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
-        - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: PUBLIC_ACCESS }
-        - { path: "%sylius.security.new_api_shop_regex%/.*", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_admin_regex%/.*", role: ROLE_API_ACCESS }
+        - { path: "%sylius.security.api_admin_route%/authentication-token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_account_regex%/.*", role: ROLE_USER }
+        - { path: "%sylius.security.api_shop_route%/authentication-token", role: PUBLIC_ACCESS }
+        - { path: "%sylius.security.api_shop_regex%/.*", role: PUBLIC_ACCESS }

src/Sylius/Bundle/ApiBundle/spec/EventListener/ApiCartBlamerListenerSpec.php

@@ -69,7 +69,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                     $token->getWrappedObject(),
                     $request->getWrappedObject(),
                     null,
-                    'new_api_shop_user',
+                    'api_shop',
                 ),
             ])
         ;
@@ -112,7 +112,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }
@@ -141,7 +141,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }
@@ -169,7 +169,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }
@@ -195,7 +195,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }
@@ -221,7 +221,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }
@@ -247,7 +247,7 @@ final class ApiCartBlamerListenerSpec extends ObjectBehavior
                 $token->getWrappedObject(),
                 $request->getWrappedObject(),
                 null,
-                'new_api_shop_user',
+                'api_shop',
             ),
         );
     }

src/Sylius/Bundle/AttributeBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ChannelBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/CoreBundle/EventListener/MailerListener.php

@@ -39,11 +39,6 @@ final class MailerListener
         $this->sendEmail($event->getSubject(), UserBundleEmails::RESET_PASSWORD_TOKEN);
     }
 
-    public function sendResetPasswordPinEmail(GenericEvent $event): void
-    {
-        $this->sendEmail($event->getSubject(), UserBundleEmails::RESET_PASSWORD_PIN);
-    }
-
     public function sendVerificationTokenEmail(GenericEvent $event): void
     {
         $this->sendEmail($event->getSubject(), UserBundleEmails::EMAIL_VERIFICATION_TOKEN);

src/Sylius/Bundle/CoreBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081014.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Sylius\Bundle\CoreBundle\Doctrine\Migrations\AbstractMigration;
+
+final class Version20241012081014 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Remove locked, expires_at and credentials_expire_at columns from User model';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_admin_user DROP locked, DROP expires_at, DROP credentials_expire_at');
+        $this->addSql('ALTER TABLE sylius_shop_user DROP locked, DROP expires_at, DROP credentials_expire_at');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_admin_user ADD locked TINYINT(1) NOT NULL, ADD expires_at DATETIME DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL');
+        $this->addSql('ALTER TABLE sylius_shop_user ADD locked TINYINT(1) NOT NULL, ADD expires_at DATETIME DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL');
+    }
+}

src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081606.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Sylius\Bundle\CoreBundle\Doctrine\Migrations\AbstractPostgreSQLMigration;
+
+final class Version20241012081606 extends AbstractPostgreSQLMigration
+{
+    public function getDescription(): string
+    {
+        return 'Remove locked, expires_at and credentials_expire_at columns from User model';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_admin_user DROP locked');
+        $this->addSql('ALTER TABLE sylius_admin_user DROP expires_at');
+        $this->addSql('ALTER TABLE sylius_admin_user DROP credentials_expire_at');
+        $this->addSql('ALTER TABLE sylius_shop_user DROP locked');
+        $this->addSql('ALTER TABLE sylius_shop_user DROP expires_at');
+        $this->addSql('ALTER TABLE sylius_shop_user DROP credentials_expire_at');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE sylius_admin_user ADD locked BOOLEAN NOT NULL');
+        $this->addSql('ALTER TABLE sylius_admin_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE sylius_admin_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE sylius_shop_user ADD locked BOOLEAN NOT NULL');
+        $this->addSql('ALTER TABLE sylius_shop_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+        $this->addSql('ALTER TABLE sylius_shop_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL');
+    }
+}

src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml

@@ -19,7 +19,6 @@
         <argument type="service" id="sylius.email_sender" />
         <argument type="service" id="sylius.context.channel" />
         <argument type="service" id="sylius.context.locale" />
-        <tag name="kernel.event_listener" event="sylius.user.password_reset.request.pin" method="sendResetPasswordPinEmail" />
         <tag name="kernel.event_listener" event="sylius.user.password_reset.request.token" method="sendResetPasswordTokenEmail" />
         <tag name="kernel.event_listener" event="sylius.user.email_verification.token" method="sendVerificationTokenEmail" />
         <tag name="kernel.event_listener" event="sylius.user.post_email_verification" method="sendVerificationSuccessEmail" />

src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php

@@ -29,9 +29,9 @@ final class UserImpersonator implements UserImpersonatorInterface
     private string $firewallContextName;
 
     public function __construct(
-        private RequestStack $requestStack,
+        private readonly RequestStack $requestStack,
         string $firewallContextName,
-        private EventDispatcherInterface $eventDispatcher,
+        private readonly EventDispatcherInterface $eventDispatcher,
     ) {
         $this->sessionTokenParameter = sprintf('_security_%s', $firewallContextName);
         $this->firewallContextName = $firewallContextName;

src/Sylius/Bundle/CoreBundle/spec/EventListener/MailerListenerSpec.php

@@ -139,25 +139,6 @@ final class MailerListenerSpec extends ObjectBehavior
         $this->sendResetPasswordTokenEmail($event);
     }
 
-    function it_send_password_reset_pin_mail(
-        SenderInterface $emailSender,
-        ChannelInterface $channel,
-        GenericEvent $event,
-        UserInterface $user,
-    ): void {
-        $event->getSubject()->willReturn($user);
-
-        $user->getEmail()->willReturn('test@example.com');
-
-        $emailSender->send('reset_password_pin', ['test@example.com'], [
-            'user' => $user,
-            'channel' => $channel,
-            'localeCode' => 'en_US',
-        ])->shouldBeCalled();
-
-        $this->sendResetPasswordPinEmail($event);
-    }
-
     function it_sends_verification_success_email(
         SenderInterface $emailSender,
         GenericEvent $event,

src/Sylius/Bundle/CurrencyBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/CustomerBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/InventoryBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/LocaleBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/MoneyBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/OrderBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/PaymentBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml

@@ -37,32 +37,30 @@
             <argument>Payment methods resolver</argument>
         </service>
 
-        <service id="sylius.payment_methods_resolver" class="Sylius\Component\Payment\Resolver\CompositeMethodsResolver">
+        <service id="sylius.resolver.payment_methods" class="Sylius\Component\Payment\Resolver\CompositeMethodsResolver">
             <argument type="service" id="sylius.registry.payment_methods_resolver" />
         </service>
-        <service id="sylius.resolver.payment_methods" alias="sylius.payment_methods_resolver" />
-        <service id="sylius.resolver.payment_methods.composite" alias="sylius.payment_methods_resolver" />
-        <service id="Sylius\Component\Payment\Resolver\PaymentMethodsResolverInterface" alias="sylius.payment_methods_resolver" />
+        <service id="sylius.resolver.payment_methods.composite" alias="sylius.resolver.payment_methods" />
+        <service id="Sylius\Component\Payment\Resolver\PaymentMethodsResolverInterface" alias="sylius.resolver.payment_methods" />
 
-        <service id="sylius.payment_methods_resolver.default" class="Sylius\Component\Payment\Resolver\PaymentMethodsResolver" public="false">
+        <service id="sylius.resolver.payment_methods.default" class="Sylius\Component\Payment\Resolver\PaymentMethodsResolver" public="false">
             <argument type="service" id="sylius.repository.payment_method" />
             <tag name="sylius.payment_method_resolver" type="default" label="Default" />
         </service>
-        <service id="sylius.resolver.payment_methods.default" alias="sylius.payment_methods_resolver.default"/>
 
         <service id="sylius.form_registry.payment_gateway_config" class="Sylius\Bundle\ResourceBundle\Form\Registry\FormTypeRegistry" />
 
-        <service id="sylius.validator.gateway_config_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
+        <service id="sylius.validator.groups_generator.gateway_config" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGenerator">
             <argument>%sylius.form.type.gateway_config.validation_groups%</argument>
             <argument>%sylius.gateway_config.validation_groups%</argument>
         </service>
-        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGeneratorInterface" alias="sylius.validator.gateway_config_groups_generator" />
+        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\GatewayConfigGroupsGeneratorInterface" alias="sylius.validator.groups_generator.gateway_config" />
 
-        <service id="sylius.validator.payment_method_groups_generator" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGenerator">
+        <service id="sylius.validator.groups_generator.payment_method" class="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGenerator">
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
-            <argument type="service" id="sylius.validator.gateway_config_groups_generator" />
+            <argument type="service" id="sylius.validator.groups_generator.gateway_config" />
         </service>
-        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGeneratorInterface" alias="sylius.validator.payment_method_groups_generator" />
+        <service id="Sylius\Bundle\PaymentBundle\Validator\GroupsGenerator\PaymentMethodGroupsGeneratorInterface" alias="sylius.validator.groups_generator.payment_method" />
 
         <service id="sylius.generator.gateway_name" class="Sylius\Bundle\PaymentBundle\Generator\GatewayNameGenerator" />
         <service id="Sylius\Bundle\PaymentBundle\Generator\GatewayNameGeneratorInterface" alias="sylius.generator.gateway_name" />

src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml

@@ -22,7 +22,7 @@
         <service id="sylius.controller.payment_request_notify" class="Sylius\Bundle\PaymentBundle\Action\PaymentRequestNotifyAction">
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.checker.finalized_payment_request" />
-            <argument type="service" id="sylius.processor.payment_request.notify_payload" />
+            <argument type="service" id="sylius.processor.notify_payload" />
             <argument type="service" id="sylius.manager.payment_request" />
             <argument type="service" id="sylius.announcer.payment_request" />
             <argument type="service" id="sylius.provider.notify_response" />
@@ -32,7 +32,7 @@
             <argument type="service" id="sylius.repository.payment_method" />
             <argument type="service" id="sylius.provider.notify_payment" />
             <argument type="service" id="sylius.factory.payment_request" />
-            <argument type="service" id="sylius.processor.payment_request.notify_payload" />
+            <argument type="service" id="sylius.processor.notify_payload" />
             <argument type="service" id="sylius.repository.payment_request" />
             <argument type="service" id="sylius.announcer.payment_request" />
             <argument type="service" id="sylius.provider.notify_response" />

src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml

@@ -50,7 +50,7 @@
         <service id="sylius.form.type.payment_method" class="Sylius\Bundle\PaymentBundle\Form\Type\PaymentMethodType">
             <argument>%sylius.model.payment_method.class%</argument>
             <argument>%sylius.form.type.payment_method.validation_groups%</argument>
-            <argument type="service" id="sylius.validator.payment_method_groups_generator" />
+            <argument type="service" id="sylius.validator.groups_generator.payment_method" />
             <argument type="service" id="sylius.generator.gateway_name" />
             <tag name="form.type" />
         </service>

src/Sylius/Bundle/PaymentBundle/Resources/config/services/normalizer.xml

@@ -11,9 +11,10 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <services>
         <service id="sylius.normalizer.symfony_request" class="Sylius\Bundle\PaymentBundle\Normalizer\SymfonyRequestNormalizer" />

src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml

@@ -11,14 +11,15 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <services>
-        <service id="sylius.processor.payment_request.notify_payload" class="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessor">
+        <service id="sylius.processor.notify_payload" class="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessor">
             <argument type="service" id="sylius.normalizer.symfony_request" />
         </service>
-        <service id="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessorInterface" alias="sylius.processor.payment_request.notify_payload" />
+        <service id="Sylius\Bundle\PaymentBundle\Processor\NotifyPayloadProcessorInterface" alias="sylius.processor.notify_payload" />
     </services>
 </container>

src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml

@@ -29,7 +29,7 @@
 
         <service id="sylius.provider.http_response.gateway_factory" class="Sylius\Bundle\PaymentBundle\Provider\GatewayFactoryHttpResponseProvider">
             <argument type="service" id="sylius.provider.gateway_factory_name" />
-            <argument type="tagged_locator" tag="sylius.payment_request.http_response.provider" index-by="gateway-factory" />
+            <argument type="tagged_locator" tag="sylius.payment_request.provider.http_response" index-by="gateway-factory" />
         </service>
         <service id="sylius.provider.http_response.default" alias="sylius.provider.http_response.gateway_factory" />
 
@@ -39,14 +39,16 @@
         <service id="sylius.provider.default_payload" class="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProvider" />
         <service id="Sylius\Bundle\PaymentBundle\Provider\DefaultPayloadProviderInterface" alias="sylius.provider.default_payload" />
 
-        <service id="sylius.http_response.provider.offline" class="Sylius\Bundle\PaymentBundle\Provider\ActionsHttpResponseProvider">
-            <argument type="tagged_locator" tag="sylius.http_response.provider.offline" index-by="action" />
-            <tag name="sylius.payment_request.http_response.provider" gateway-factory="offline" />
+        <service id="sylius.provider.http_response.offline" class="Sylius\Bundle\PaymentBundle\Provider\ActionsHttpResponseProvider">
+            <argument type="tagged_locator" tag="sylius.provider.http_response.offline" index-by="action" />
+            <tag name="sylius.payment_request.provider.http_response" gateway-factory="offline" />
         </service>
 
         <service id="sylius.provider.notify_payment" class="Sylius\Bundle\PaymentBundle\Provider\CompositeNotifyPaymentProvider">
             <argument type="tagged_iterator" tag="sylius.payment_request.payment_notify_provider" />
         </service>
+        <service id="sylius.provider.notify_payment.composite" alias="sylius.provider.notify_payment" />
+        <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyPaymentProviderInterface" alias="sylius.provider.notify_payment" />
 
         <service id="sylius.provider.notify_response" class="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProvider" />
         <service id="Sylius\Bundle\PaymentBundle\Provider\NotifyResponseProviderInterface" alias="sylius.provider.notify_response" />

src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml

@@ -11,14 +11,15 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
 >
     <services>
         <defaults public="true" />
 
-        <service id="Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExistsValidator">
+        <service id="sylius.validator.gateway_factory_exists" class="Sylius\Bundle\PaymentBundle\Validator\Constraints\GatewayFactoryExistsValidator">
             <argument>%sylius.gateway_factories%</argument>
             <tag name="validator.constraint_validator" alias="sylius_gateway_factory_exists_validator" />
         </service>

src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php

@@ -15,6 +15,13 @@ namespace Sylius\Bundle\PaymentBundle\Validator\Constraints;
 
 use Symfony\Component\Validator\Constraint;
 
+trigger_deprecation(
+    'sylius/payum-bundle',
+    '1.14',
+    'The "%s" class is deprecated and will be moved to the PaymentBundle in Sylius 2.0.',
+    GatewayFactoryExists::class,
+);
+/** @deprecated since Sylius 1.14 and will be moved to the PaymentBundle in Sylius 2.0. */
 final class GatewayFactoryExists extends Constraint
 {
     public string $invalidGatewayFactory = 'sylius.gateway_config.invalid_gateway_factory';

src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php

@@ -17,6 +17,13 @@ use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
+trigger_deprecation(
+    'sylius/payum-bundle',
+    '1.14',
+    'The "%s" class is deprecated and will be moved to the PaymentBundle in Sylius 2.0.',
+    GatewayFactoryExistsValidator::class,
+);
+/** @deprecated since Sylius 1.14 and will be moved to the PaymentBundle in Sylius 2.0. */
 final class GatewayFactoryExistsValidator extends ConstraintValidator
 {
     /** @param array<string, string> $factoryNames */

src/Sylius/Bundle/PayumBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/PayumBundle/Resources/config/services.xml

@@ -27,5 +27,6 @@
         <service id="sylius.payum.http_client" class="Sylius\Bundle\PayumBundle\HttpClient\HttpClient">
             <argument type="service" id="Psr\Http\Client\ClientInterface" />
         </service>
+        <service id="sylius_payum.http_client" alias="sylius.payum.http_client" />
     </services>
 </container>

src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
@@ -12,26 +13,38 @@
             <argument type="service" id="sylius.payment_description_provider" />
             <tag name="payum.action" all="true" alias="sylius.authorize_payment" />
         </service>
+        <service id="sylius_payum.action.authorize_payment" alias="sylius.payum_action.authorize_payment" />
+
         <service id="sylius.payum_action.capture_payment" class="Sylius\Bundle\PayumBundle\Action\CapturePaymentAction">
             <argument type="service" id="sylius.payment_description_provider" />
             <tag name="payum.action" all="true" alias="sylius.capture_payment" />
         </service>
+        <service id="sylius_payum.action.capture_payment" alias="sylius.payum_action.capture_payment" />
+
         <service id="sylius.payum_action.execute_same_request_with_payment_details" class="Sylius\Bundle\PayumBundle\Action\ExecuteSameRequestWithPaymentDetailsAction">
             <tag name="payum.action" all="true" />
         </service>
+        <service id="sylius_payum.action.execute_same_request_with_payment_details" alias="sylius.payum_action.execute_same_request_with_payment_details" />
+
         <service id="sylius.payum_action.resolve_next_route" class="Sylius\Bundle\PayumBundle\Action\ResolveNextRouteAction">
             <tag name="payum.action" all="true" alias="sylius.resolve_next_route" />
         </service>
+        <service id="sylius_payum.action.resolve_next_route" alias="sylius.payum_action.resolve_next_route" />
 
         <!-- Offline -->
         <service id="sylius.payum_action.offline.convert_payment" class="Sylius\Bundle\PayumBundle\Action\Offline\ConvertPaymentAction">
             <tag name="payum.action" factory="offline" alias="sylius.offline.convert_payment" />
         </service>
+        <service id="sylius_payum.action.offline.convert_payment" alias="sylius.payum_action.offline.convert_payment" />
+
         <service id="sylius.payum_action.offline.status" class="Sylius\Bundle\PayumBundle\Action\Offline\StatusAction">
             <tag name="payum.action" factory="offline" alias="sylius.offline.status"/>
         </service>
+        <service id="sylius_payum.action.offline.status" alias="sylius.payum_action.offline.status" />
+
         <service id="sylius.payum_action.offline.resolve_next_route" class="Sylius\Bundle\PayumBundle\Action\Offline\ResolveNextRouteAction">
             <tag name="payum.action" factory="offline" alias="sylius.offline.resolve_next_route" />
         </service>
+        <service id="sylius_payum.action.offline.resolve_next_route" alias="sylius.payum_action.offline.resolve_next_route" />
     </services>
 </container>

src/Sylius/Bundle/PayumBundle/Resources/config/services/extension.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
@@ -11,5 +12,6 @@
             <argument type="service" id="sylius_abstraction.state_machine" />
             <tag name="payum.extension" all="true" prepend="true" />
         </service>
+        <service id="sylius_payum.extension.update_payment_state" alias="sylius.payum_extension.update_payment_state" />
     </services>
 </container>

src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
         <service id="sylius.factory.payum_get_status_action" class="Sylius\Bundle\PayumBundle\Factory\GetStatusFactory" />
+        <service id="sylius_payum.factory.get_status" alias="sylius.factory.payum_get_status_action" />
         <service id="Sylius\Bundle\PayumBundle\Factory\GetStatusFactoryInterface" alias="sylius.factory.payum_get_status_action" />
 
         <service id="sylius.factory.payum_resolve_next_route" class="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactory" />
+        <service id="sylius_payum.factory.resolve_next_route" alias="sylius.factory.payum_resolve_next_route" />
         <service id="Sylius\Bundle\PayumBundle\Factory\ResolveNextRouteFactoryInterface" alias="sylius.factory.payum_resolve_next_route" />
 
         <service id="sylius.factory.payum_capture" class="Sylius\Bundle\PayumBundle\Factory\CaptureFactory" />

src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml

@@ -11,7 +11,11 @@
 
 -->
 
-<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
@@ -19,5 +23,6 @@
             <argument type="service" id="payum.dynamic_gateways.cypher" on-invalid="null" />
             <tag name="form.type_extension" priority="100" />
         </service>
+        <service id="sylius_payum.form.extension.type.crypted_gateway_config" alias="sylius.form.extension.type.gateway_config.crypted" />
     </services>
 </container>

src/Sylius/Bundle/PayumBundle/Resources/config/services/provider.xml

@@ -1,15 +1,17 @@
 <?xml version="1.0" ?>
 
-<container xmlns="http://symfony.com/schema/dic/services"
-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
-
+<container
+    xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"
+>
     <services>
         <defaults public="true" />
 
         <service id="sylius.payment_description_provider" class="Sylius\Bundle\PayumBundle\Provider\PaymentDescriptionProvider">
             <argument type="service" id="translator" />
         </service>
+        <service id="sylius_payum.provider.payment_description" alias="sylius.payment_description_provider" />
         <service id="Sylius\Bundle\PayumBundle\Provider\PaymentDescriptionProviderInterface" alias="sylius.payment_description_provider" />
     </services>
 </container>

src/Sylius/Bundle/PayumBundle/composer.json

@@ -41,6 +41,7 @@
     "require-dev": {
         "matthiasnoback/symfony-dependency-injection-test": "^5.1",
         "phpspec/phpspec": "^7.2",
+        "phpunit/phpunit": "^9.5",
         "symfony/dependency-injection": "^6.4.1 || ^7.1"
     },
     "config": {

src/Sylius/Bundle/ProductBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/PromotionBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ReviewBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ShippingBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ShopBundle/EventListener/UserRegistrationListener.php

@@ -14,25 +14,25 @@ declare(strict_types=1);
 namespace Sylius\Bundle\ShopBundle\EventListener;
 
 use Doctrine\Persistence\ObjectManager;
-use Sylius\Bundle\UserBundle\Security\UserLoginInterface;
 use Sylius\Bundle\UserBundle\UserEvents;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\ShopUserInterface;
 use Sylius\Component\User\Security\Generator\GeneratorInterface;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
 use Webmozart\Assert\Assert;
 
-final class UserRegistrationListener
+final readonly class UserRegistrationListener
 {
     public function __construct(
         private ObjectManager $userManager,
         private GeneratorInterface $tokenGenerator,
         private EventDispatcherInterface $eventDispatcher,
         private ChannelContextInterface $channelContext,
-        private UserLoginInterface $userLogin,
+        private Security $security,
         private string $firewallContextName,
     ) {
     }
@@ -74,6 +74,6 @@ final class UserRegistrationListener
         $this->userManager->persist($user);
         $this->userManager->flush();
 
-        $this->userLogin->login($user, $this->firewallContextName);
+        $this->security->login($user, 'form_login', $this->firewallContextName);
     }
 }

src/Sylius/Bundle/ShopBundle/LICENSE_OF_TRADEMARK_AND_LOGO

@@ -0,0 +1,162 @@
+Encourage widespread and fair use of Sylius logo and brand identity.
+
+This Trademarks and Logos use policy (the “Policy”) is based on the Ubuntu 
+and Symfony trademark policy and published under the CC-BY-SA license. You 
+are welcome to base your own project trademark policies off it, just let 
+others use your changes and give credit to the Ubuntu and Symfony projects 
+as the original source!
+
+Version n°1. Published on April 5th 2019.
+
+The objective of the Policy is to encourage widespread use of the Sylius 
+trademarks by the Sylius community while controlling that use in order to 
+avoid confusion on the part of Sylius users and the general public, to 
+maintain the value of the image and reputation of the trademarks and to 
+protect them from inappropriate or unauthorised use.
+
+The sections below describe what is allowed, what isn’t allowed, and cases 
+in which you should ask permission.
+If you have any doubt, please contact us and a member of our legal 
+representative will be in touch with you shortly.
+If you are aware a breach or misuse of the Sylius trademarks in any 
+way, we would appreciate you bringing this to our attention. Please 
+contact us so that we can investigate this further.
+
+The Trademarks and Logos
+Sylius sp. z o.o. owns the verbal trademark containing 
+in whole or part of the word “Sylius”.
+
+Any verbal mark starting with the letters “Sylius” is sufficiently 
+similar to one or more of the trademarks that permission will be 
+needed in order to use it.
+
+All verbal trademarks of Sylius sp. z o.o., all distinctive signs used in 
+commerce by Sylius sp. z o.o. to designate his products or services related 
+to Sylius are collectively referred to as the “Trademarks”.
+
+Permitted use of the Trademarks
+Certain usages of the Trademarks are fine and no specific permission 
+from us is needed.
+
+Community advocacy. Sylius is built by its community. We share access to 
+the Trademarks with the entire community for the purposes of discussion, 
+development and advocacy. We recognise that most of the open source discussion 
+and development areas are for non-commercial purposes and will allow the 
+use of the Trademarks in this context, provided:
+
+the Trademark is used in a manner consistent with this Policy;
+there is no commercial intent behind the use;
+what you are referring to is in fact Sylius. If someone is confused into 
+thinking that what isn’t Sylius is, in fact, Sylius, you are probably doing 
+something wrong;
+there is no suggestion (through words or appearance) that your project is 
+approved, sponsored, or affiliated with Sylius, Sylius sp. z o.o. or its 
+related projects unless it actually has been approved by and is accountable 
+to Sylius sp. z o.o. and the Sylius Project.
+Building on Sylius or for Sylius. If you are producing new software which is 
+intended for use with or on Sylius, you may use the Trademark in a way which 
+indicates the intent of your product. For example, if you are developing a 
+system management tool for Sylius, acceptable project titles would be 
+“System Management for Sylius” or “Sylius Based Systems Management”. We would 
+strongly discourage, and likely would consider to be problematic, a name such 
+as SyliusMan, Sylius Management, etc. Furthermore, you may not use the 
+Trademarks in a way which implies an endorsement where that doesn’t exist, 
+or which attempts to unfairly or confusingly capitalise on the goodwill 
+or brand of the project.
+
+Commentary and parody. The Trademarks and Logos are designed to cover use of 
+a mark to imply origin or endorsement by the project. When a user downloads 
+something called Sylius, they should know it comes from the Sylius project. 
+This helps Sylius build a reputation that will not be damaged by confusion 
+around what is, and isn’t, Sylius. Using the Trademarks in your discussion, 
+commentary, criticism or parody, in ways that unequivocally do not imply 
+endorsement, is permissible. Anyone is free to write articles, create 
+websites, blog about, or talk about Sylius — as long as it’s clear to 
+everyone — including people completely unfamiliar with Sylius — that they 
+are simply referring to Sylius and in no way speaking for the Sylius 
+project and/or for Sylius sp. z o.o.
+
+We reserve the right to review all usage within the open source community, 
+and to object to any usage that appears to overstep the bounds of discussion 
+and good-faith non-commercial development. In any event, once a project has 
+left the open source project phase or otherwise become a commercial project, 
+this Policy does not authorise any use of the Trademarks in connection to 
+that project.
+
+Restricted use that requires a trademark licence
+Permission from us is necessary to use any of the Trademarks under any 
+circumstances other than those specifically permitted above.
+
+These include but are not limited to:
+
+Any commercial use including for any services related to Sylius such as 
+providing training services, conference services, or design services (should 
+you wish to provide such services, please contact us beforehand to explore 
+Sylius Solution Partner Program);
+Use on or in relation to a software product that includes or is built on top 
+of a product supplied by us, if there is any commercial intent associated 
+with that product;
+Use in a domain name or URL;
+Use for merchandising purposes, e.g. on t-shirts and the like.
+If you wish to have permission for any of the uses above or for any other use 
+which is not specifically referred to in this Policy, please contact us and 
+we’ll let you know as soon as possible if your proposed use is permissible. 
+Permission may only be granted subject to certain conditions and these may 
+include the requirement that you enter into an agreement with us to maintain 
+the quality of the product and/or service which you intend to supply at a 
+prescribed level.
+
+While there may be exceptions, it is very unlikely that we will approve 
+Trademark use in the following cases:
+
+Use of a Trademark in a company name;
+Use of a Trademark in a domain name which has a commercial intent. The 
+commercial intent can range from promotion of a company or product, to 
+collecting revenue generated by advertising;
+The calling of any software or product by the name Sylius (or another 
+related Trademark);
+Use in combination with any other marks or logos. This include use of 
+a Trademark in a manner that creates a “combined mark,” or use that 
+integrates other wording with the Trademark in a way that the public may 
+think of the use as a new mark (for example Club Sylius or SyliusBooks, or 
+in a way that by use of special fonts or presentation with nearby words or 
+images conveys an impression that the two are tied in some way);
+Use in combination with any product or service which is presented as being 
+Certified or Official or formally associated with us or our products or 
+services;
+Use in a way which implies an endorsement where that doesn’t exist, or which 
+attempts to unfairly or confusingly capitalise on the goodwill or brand of 
+the project;
+Use of a Trademark in a manner that disparages Sylius, or Sylius sp. z o.o.; 
+or its products and is not clearly third-party parody;
+Use of a Trademark on or in relation to a software product which constitutes 
+a substantially modified version of a product supplied by the Sylius project, 
+that is to say with material changes to the code, or services relating to 
+such a product; and
+Use of a Trademark in a title or metatag of a web page whose sole intention or 
+result is to influence search engine rankings or result listings (for example 
+use as keyword for advertising purposes), rather than for discussion, 
+development or advocacy of the Trademarks.
+Logo usage guidelines
+Except otherwise agreed, any use of Logos shall be expressly authorized by 
+writing by Sylius sp. z o.o.. To get any authorization to use any Logo, 
+please contact us and a member of our team will be in touch with you shortly.
+
+Our logos are presented in multiple colours and it is important that their 
+visual integrity be maintained.
+
+Therefore, when use of Logos is authorized, it is therefore preferable that 
+the logos only be used in their standard form but if you should feel the need 
+to alter them in any way you should keep the following guidelines in mind.
+
+It should also be borne in mind that the more you wish to vary our logos 
+from their standard form the smaller is the chance that we will be able to 
+approve your proposed use.
+
+If presented in multiple colours, the logo should only use the “official” 
+logo colours.
+You may use transparency and gradient/depth tools but should retain the 
+“official” colours.
+Any scaling must retain the original proportions of the logo.
+In case of non-compliance with Trademarks and Logos’ Use Policy or 
+applicable law, any use of the Trademarks and/or Logos will be prohibited.

src/Sylius/Bundle/ShopBundle/Resources/config/app/sylius/sylius_mailer.yml

@@ -18,9 +18,6 @@ sylius_mailer:
         reset_password_token:
             subject: sylius.emails.user.password_reset.subject
             template: "@SyliusShop/email/password_reset.html.twig"
-        reset_password_pin:
-            subject: sylius.emails.user.password_reset.subject
-            template: "@SyliusShop/email/password_reset.html.twig"
         verification_token:
             subject: sylius.emails.user.verification_token.subject
             template: "@SyliusShop/email/verification.html.twig"

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/create.yaml

@@ -3,6 +3,13 @@ sylius_twig_hooks:
         'sylius_shop.account.address_book.create':
             breadcrumbs:
                 template: '@SyliusShop/account/address_book/create/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.create.content':
             form:
@@ -11,21 +18,28 @@ sylius_twig_hooks:
                     form: '@=_context.form'
                     resource: '@=_context.address'
                     template: '@SyliusShop/account/address_book/common/content/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.create.content.header':
             title:
                 template: '@SyliusShop/account/address_book/create/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/address_book/create/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.create.content.form':
             fields:
                 template: '@SyliusShop/account/address_book/common/content/form/fields.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/address_book/common/content/form/buttons.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.create.content.form.buttons':
             add:
                 template: '@SyliusShop/account/address_book/create/content/form/buttons/add.html.twig'
+                priority: 100
             cancel:
                 template: '@SyliusShop/account/address_book/common/content/form/buttons/cancel.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/index.yaml

@@ -3,60 +3,85 @@ sylius_twig_hooks:
         'sylius_shop.account.address_book.index':
             breadcrumbs:
                 template: '@SyliusShop/account/address_book/index/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content':
             buttons:
                 template: '@SyliusShop/account/address_book/index/content/buttons.html.twig'
+                priority: 100
             addresses:
                 template: '@SyliusShop/account/address_book/index/content/addresses.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.header':
             title:
                 template: '@SyliusShop/account/address_book/index/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/address_book/index/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.buttons':
             add_address:
                 template: '@SyliusShop/account/address_book/index/content/buttons/add_address.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses':
             default:
                 template: '@SyliusShop/account/address_book/index/content/addresses/default.html.twig'
+                priority: 100
             list:
                 template: '@SyliusShop/account/address_book/index/content/addresses/list.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses.default':
             badge:
                 template: '@SyliusShop/account/address_book/index/content/addresses/default/badge.html.twig'
+                priority: 200
             content:
                 template: '@SyliusShop/account/address_book/common/content/address/content.html.twig'
+                priority: 100
             actions:
                 template: '@SyliusShop/account/address_book/common/content/address/actions.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses.default.actions':
             edit:
                 template: '@SyliusShop/account/address_book/common/content/address/actions/edit.html.twig'
+                priority: 100
             delete:
                 template: '@SyliusShop/account/address_book/common/content/address/actions/delete.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses.list':
             address:
                 template: '@SyliusShop/account/address_book/index/content/addresses/list/address.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses.list.address':
             content:
                 template: '@SyliusShop/account/address_book/common/content/address/content.html.twig'
+                priority: 100
             actions:
                 template: '@SyliusShop/account/address_book/common/content/address/actions.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.index.content.addresses.list.address.actions':
             edit:
                 template: '@SyliusShop/account/address_book/common/content/address/actions/edit.html.twig'
+                priority: 200
             delete:
                 template: '@SyliusShop/account/address_book/common/content/address/actions/delete.html.twig'
+                priority: 100
             set_default:
                 component: 'sylius_shop:account:address:default_form'
                 props:
                     customer: '@=_context.customer'
                     template: '@SyliusShop/account/address_book/set_as_default.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/update.yaml

@@ -3,6 +3,13 @@ sylius_twig_hooks:
         'sylius_shop.account.address_book.update':
             breadcrumbs:
                 template: '@SyliusShop/account/address_book/update/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.update.content':
             form:
@@ -13,21 +20,28 @@ sylius_twig_hooks:
                     template: '@SyliusShop/account/address_book/common/content/form.html.twig'
                 configuration:
                     method: 'PUT'
+                priority: 0
 
         'sylius_shop.account.address_book.update.content.header':
             title:
                 template: '@SyliusShop/account/address_book/update/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/address_book/update/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.update.content.form':
             fields:
                 template: '@SyliusShop/account/address_book/common/content/form/fields.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/address_book/common/content/form/buttons.html.twig'
+                priority: 0
 
         'sylius_shop.account.address_book.update.content.form.buttons':
             save:
                 template: '@SyliusShop/account/address_book/update/content/form/buttons/save.html.twig'
+                priority: 100
             cancel:
                 template: '@SyliusShop/account/address_book/common/content/form/buttons/cancel.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/change_password.yaml

@@ -3,6 +3,13 @@ sylius_twig_hooks:
         'sylius_shop.account.change_password.update':
             breadcrumbs:
                 template: '@SyliusShop/account/change_password/update/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.change_password.update.content':
             form:
@@ -10,27 +17,36 @@ sylius_twig_hooks:
                 props:
                     form: '@=_context.form'
                     template: '@SyliusShop/account/change_password/update/content/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.change_password.update.content.header':
             title:
                 template: '@SyliusShop/account/change_password/update/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/change_password/update/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.change_password.update.content.form':
             fields:
                 template: '@SyliusShop/account/change_password/update/content/form/fields.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/change_password/update/content/form/buttons.html.twig'
+                priority: 0
 
         'sylius_shop.account.change_password.update.content.form.fields':
             current_password:
                 template: '@SyliusShop/account/change_password/update/content/form/fields/current_password.html.twig'
+                priority: 200
             new_password:
                 template: '@SyliusShop/account/change_password/update/content/form/fields/new_password.html.twig'
+                priority: 100
             confirm_new_password:
                 template: '@SyliusShop/account/change_password/update/content/form/fields/confirm_new_password.html.twig'
+                priority: 0
 
         'sylius_shop.account.change_password.update.content.form.buttons':
             submit:
                 template: '@SyliusShop/account/change_password/update/content/form/buttons/submit.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/create.yaml

@@ -3,11 +3,15 @@ sylius_twig_hooks:
         'sylius_shop.account.common.create':
             breadcrumbs:
                 template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
+                priority: 200
             menu:
                 template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
             content:
                 template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.common.create.content':
             header:
                 template: '@SyliusShop/account/common/layout/content/header.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/index.yaml

@@ -3,11 +3,15 @@ sylius_twig_hooks:
         'sylius_shop.account.common.index':
             breadcrumbs:
                 template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
+                priority: 200
             menu:
                 template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
             content:
                 template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.common.index.content':
             header:
                 template: '@SyliusShop/account/common/layout/content/header.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/show.yaml

@@ -3,11 +3,15 @@ sylius_twig_hooks:
         'sylius_shop.account.common.show':
             breadcrumbs:
                 template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
+                priority: 200
             menu:
                 template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
             content:
                 template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.common.show.content':
             header:
                 template: '@SyliusShop/account/common/layout/content/header.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/update.yaml

@@ -3,11 +3,15 @@ sylius_twig_hooks:
         'sylius_shop.account.common.update':
             breadcrumbs:
                 template: '@SyliusShop/account/common/layout/breadcrumbs.html.twig'
+                priority: 200
             menu:
                 template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
             content:
                 template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.common.update.content':
             header:
                 template: '@SyliusShop/account/common/layout/content/header.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/dashboard.yaml

@@ -3,35 +3,47 @@ sylius_twig_hooks:
         'sylius_shop.account.dashboard.index.content':
             main_section:
                 template: '@SyliusShop/account/dashboard/index/content/main_section.html.twig'
+                priority: 0
 
         'sylius_shop.account.dashboard.index.content.header':
             title:
                 template: '@SyliusShop/account/dashboard/index/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/dashboard/index/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.dashboard.index.content.main_section':
             user_info:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/user_info.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/buttons.html.twig'
+                priority: 0
 
         'sylius_shop.account.dashboard.index.content.main_section.user_info':
             account_status:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/status.html.twig'
+                priority: 100
             user_details:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details.html.twig'
+                priority: 0
 
         'sylius_shop.account.dashboard.index.content.main_section.user_info.details':
             full_name:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details/full_name.html.twig'
+                priority: 100
             email:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/user_info/details/email.html.twig'
+                priority: 0
 
         'sylius_shop.account.dashboard.index.content.main_section.buttons':
             edit:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/edit.html.twig'
+                priority: 200
             change_password:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/change_password.html.twig'
+                priority: 100
             verify:
                 template: '@SyliusShop/account/dashboard/index/content/main_section/buttons/verify.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/forgotten_password.yaml

@@ -3,23 +3,31 @@ sylius_twig_hooks:
         'sylius_shop.account.forgotten_password':
             form_container:
                 template: '@SyliusShop/account/forgotten_password/form_container.html.twig'
+                priority: 100
             register_container:
                 template: '@SyliusShop/account/forgotten_password/register_container.html.twig'
+                priority: 0
 
         'sylius_shop.account.forgotten_password.form_container':
             header:
                 template: "@SyliusShop/account/forgotten_password/form_container/header.html.twig"
+                priority: 200
             description:
                 template: "@SyliusShop/account/forgotten_password/form_container/description.html.twig"
+                priority: 100
             form:
                 template: "@SyliusShop/account/forgotten_password/form_container/form.html.twig"
+                priority: 0
 
         'sylius_shop.account.forgotten_password.form_container.form':
             email:
                 template: "@SyliusShop/account/forgotten_password/form_container/form/email.html.twig"
+                priority: 100
             submit:
                 template: "@SyliusShop/account/forgotten_password/form_container/form/submit.html.twig"
+                priority: 0
 
         'sylius_shop.account.forgotten_password.register_container':
             register_here:
                 template: "@SyliusShop/account/common/register_box.html.twig"
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/login.yaml

@@ -3,33 +3,45 @@ sylius_twig_hooks:
         'sylius_shop.account.login':
             form:
                 template: '@SyliusShop/account/login/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.login.form':
             login_container:
                 template: '@SyliusShop/account/login/form/login_container.html.twig'
+                priority: 100
             register_container:
                 template: '@SyliusShop/account/login/form/register_container.html.twig'
+                priority: 0
 
         'sylius_shop.account.login.form.login_container':
             header:
                 template: "@SyliusShop/account/login/form/login_container/header.html.twig"
+                priority: 400
             errors:
                 template: "@SyliusShop/account/login/form/login_container/errors.html.twig"
+                priority: 300
             form_fields:
                 template: "@SyliusShop/account/login/form/login_container/form_fields.html.twig"
+                priority: 200
             submit:
                 template: "@SyliusShop/account/login/form/login_container/submit.html.twig"
+                priority: 100
             forgot_password:
                 template: "@SyliusShop/account/login/form/login_container/forgot_password.html.twig"
+                priority: 0
 
         'sylius_shop.account.login.form.login_container.form_fields':
             username:
                 template: "@SyliusShop/account/login/form/login_container/form_fields/username.html.twig"
+                priority: 200
             password:
                 template: "@SyliusShop/account/login/form/login_container/form_fields/password.html.twig"
+                priority: 100
             remember_me:
                 template: "@SyliusShop/account/login/form/login_container/form_fields/remember_me.html.twig"
+                priority: 0
 
         'sylius_shop.account.login.form.register_container':
             register_here:
                 template: "@SyliusShop/account/common/register_box.html.twig"
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/index.yaml

@@ -3,17 +3,28 @@ sylius_twig_hooks:
         'sylius_shop.account.order.index':
             breadcrumbs:
                 template: '@SyliusShop/account/order/index/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.order.index.content':
             main_section:
                 template: '@SyliusShop/account/order/index/content/main_section.html.twig'
+                priority: 0
 
         'sylius_shop.account.order.index.content.header':
             title:
                 template: '@SyliusShop/account/order/index/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/order/index/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.order.index.content.main_section':
             grid:
                 template: '@SyliusShop/shared/grid.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/show.yaml

@@ -3,23 +3,37 @@ sylius_twig_hooks:
         'sylius_shop.account.order.show':
             breadcrumbs:
                 template: '@SyliusShop/account/order/show/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.order.show.content':
             summary:
                 template: "@SyliusShop/account/order/show/content/summary.html.twig"
+                priority: 0
 
         'sylius_shop.account.order.show.content.header':
             title:
                 template: "@SyliusShop/account/order/show/content/header/title.html.twig"
+                priority: 200
             buttons:
                 template: "@SyliusShop/account/order/show/content/header/buttons.html.twig"
+                priority: 100
             details:
                 template: "@SyliusShop/account/order/show/content/header/details.html.twig"
+                priority: 0
 
         'sylius_shop.account.order.show.content.header.details':
             state:
                 template: "@SyliusShop/account/order/show/content/header/details/state.html.twig"
+                priority: 200
             completed_at:
                 template: "@SyliusShop/account/order/show/content/header/details/completed_at.html.twig"
+                priority: 100
             currency:
                 template: "@SyliusShop/account/order/show/content/header/details/currency.html.twig"
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/profile_update.yaml

@@ -3,6 +3,13 @@ sylius_twig_hooks:
         'sylius_shop.account.profile_update.update':
             breadcrumbs:
                 template: '@SyliusShop/account/profile_update/update/breadcrumbs.html.twig'
+                priority: 200
+            menu:
+                template: '@SyliusShop/account/common/layout/menu.html.twig'
+                priority: 100
+            content:
+                template: '@SyliusShop/account/common/layout/content.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content':
             form:
@@ -11,39 +18,53 @@ sylius_twig_hooks:
                     resource: '@=_context.resource'
                     form: '@=_context.form'
                     template: '@SyliusShop/account/profile_update/update/content/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content.header':
             title:
                 template: '@SyliusShop/account/profile_update/update/content/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/profile_update/update/content/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content.form':
             full_name:
                 template: '@SyliusShop/account/profile_update/update/content/form/full_name.html.twig'
+                priority: 500
             email:
                 template: '@SyliusShop/account/profile_update/update/content/form/email.html.twig'
+                priority: 400
             additional_information:
                 template: '@SyliusShop/account/profile_update/update/content/form/additional_information.html.twig'
+                priority: 300
             phone_number:
                 template: '@SyliusShop/account/profile_update/update/content/form/phone_number.html.twig'
+                priority: 200
             newsletter:
                 template: '@SyliusShop/account/profile_update/update/content/form/newsletter.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/profile_update/update/content/form/buttons.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content.form.full_name':
             name:
                 template: '@SyliusShop/account/profile_update/update/content/form/full_name/name.html.twig'
+                priority: 100
             surname:
                 template: '@SyliusShop/account/profile_update/update/content/form/full_name/surname.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content.form.additional_information':
             birthday:
                 template: '@SyliusShop/account/profile_update/update/content/form/additional_information/birthday.html.twig'
+                priority: 100
             gender:
                 template: '@SyliusShop/account/profile_update/update/content/form/additional_information/gender.html.twig'
+                priority: 0
 
         'sylius_shop.account.profile_update.update.content.form.buttons':
             submit:
                 template: '@SyliusShop/account/profile_update/update/content/form/buttons/submit.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register.yaml

@@ -7,45 +7,62 @@ sylius_twig_hooks:
                     resource: '@=_context.customer'
                     form: '@=_context.form'
                     template: '@SyliusShop/account/register/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.register.form':
             header:
                 template: '@SyliusShop/account/register/form/header.html.twig'
+                priority: 300
             personal_information:
                 template: '@SyliusShop/account/register/form/personal_information.html.twig'
+                priority: 200
             credentials:
                 template: '@SyliusShop/account/register/form/credentials.html.twig'
+                priority: 100
             buttons:
                 template: '@SyliusShop/account/register/form/buttons.html.twig'
+                priority: 0
                 
         'sylius_shop.account.register.form.header':
             title:
                 template: '@SyliusShop/account/register/form/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/register/form/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.register.form.personal_information':
             header:
                 template: '@SyliusShop/account/register/form/personal_information/header.html.twig'
+                priority: 500
             first_name:
                 template: '@SyliusShop/account/register/form/personal_information/first_name.html.twig'
+                priority: 400
             last_name:
                 template: '@SyliusShop/account/register/form/personal_information/last_name.html.twig'
+                priority: 300
             email:
                 template: '@SyliusShop/account/register/form/personal_information/email.html.twig'
+                priority: 200
             phone_number:
                 template: '@SyliusShop/account/register/form/personal_information/phone_number.html.twig'
+                priority: 100
             newsletter:
                 template: '@SyliusShop/account/register/form/personal_information/newsletter.html.twig'
+                priority: 0
 
         'sylius_shop.account.register.form.credentials':
             header:
                 template: '@SyliusShop/account/register/form/credentials/header.html.twig'
+                priority: 200
             password:
                 template: '@SyliusShop/account/register/form/credentials/password.html.twig'
+                priority: 100
             password_confirmation:
                 template: '@SyliusShop/account/register/form/credentials/password_confirmation.html.twig'
+                priority: 0
 
         'sylius_shop.account.register.form.buttons':
             submit:
                 template: '@SyliusShop/account/register/form/buttons/submit.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register_thank_you.yaml

@@ -3,5 +3,7 @@ sylius_twig_hooks:
         'sylius_shop.account.register_thank_you':
             title:
                 template: '@SyliusShop/account/register/thank_you/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/register/thank_you/subtitle.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/reset_password.yaml

@@ -3,27 +3,36 @@ sylius_twig_hooks:
         'sylius_shop.account.reset_password':
             form:
                 template: '@SyliusShop/account/reset_password/form.html.twig'
+                priority: 0
 
         'sylius_shop.account.reset_password.form':
             header:
                 template: '@SyliusShop/account/reset_password/form/header.html.twig'
+                priority: 100
             general:
                 template: '@SyliusShop/account/reset_password/form/general.html.twig'
+                priority: 0
 
         'sylius_shop.account.reset_password.form.header':
             title:
                 template: '@SyliusShop/account/reset_password/form/header/title.html.twig'
+                priority: 100
             subtitle:
                 template: '@SyliusShop/account/reset_password/form/header/subtitle.html.twig'
+                priority: 0
 
         'sylius_shop.account.reset_password.form.general':
             fields:
                 template: '@SyliusShop/account/reset_password/form/general/fields.html.twig'
+                priority: 100
             submit:
                 template: '@SyliusShop/account/reset_password/form/general/submit.html.twig'
+                priority: 0
 
         'sylius_shop.account.reset_password.form.general.fields':
             new_password:
                 template: '@SyliusShop/account/reset_password/form/general/fields/new_password.html.twig'
+                priority: 100
             new_password_confirmation:
                 template: '@SyliusShop/account/reset_password/form/general/fields/new_password_confirmation.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/base.yaml

@@ -3,133 +3,174 @@ sylius_twig_hooks:
         'sylius_shop.base#stylesheets':
             styles:
                 template: '@SyliusShop/shared/layout/base/styles.html.twig'
+                priority: 0
 
         'sylius_shop.base#javascripts':
             scripts:
                 template: '@SyliusShop/shared/layout/base/scripts.html.twig'
+                priority: 0
 
         'sylius_shop.base.header':
             top_bar:
                 template: '@SyliusShop/shared/layout/base/header/top_bar.html.twig'
+                priority: 300
             content:
                 template: '@SyliusShop/shared/layout/base/header/content.html.twig'
+                priority: 200
             navbar:
                 template: '@SyliusShop/shared/layout/base/header/navbar.html.twig'
+                priority: 100
             flashes:
                 template: '@SyliusShop/shared/layout/base/header/flashes.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.top_bar':
             info_message:
                 template: '@SyliusShop/shared/layout/base/header/top_bar/info_message.html.twig'
+                priority: 200
             currency_switcher:
                 component: 'sylius_shop:common:currency_switcher'
                 props:
                     template: '@SyliusShop/shared/layout/base/header/top_bar/currency_switcher.html.twig'
+                priority: 100
             locale_switcher:
                 component: 'sylius_shop:common:locale_switcher'
                 props:
                     template: '@SyliusShop/shared/layout/base/header/top_bar/locale_switcher.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.content':
             logo:
                 template: "@SyliusShop/shared/layout/base/header/content/logo.html.twig"
+                priority: 300
             security:
                 template: "@SyliusShop/shared/layout/base/header/content/security.html.twig"
+                priority: 200
             cart:
                 component: 'sylius_shop:cart:widget'
                 props:
                     template: '@SyliusShop/shared/components/header/cart.html.twig'
+                priority: 100
             taxon_hamburger:
                 template: "@SyliusShop/shared/layout/base/header/content/taxon_hamburger.html.twig"
+                priority: 0
                 
         'sylius_shop.base.header.content.security':
             logged_in_user:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user.html.twig'
+                priority: 100
             visitor:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor.html.twig'
+                priority: 0
                 
         'sylius_shop.base.header.content.security.logged_in_user':
             mobile:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/mobile.html.twig'
+                priority: 100
             desktop:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/desktop.html.twig'
+                priority: 0
                 
         'sylius_shop.base.header.content.security.logged_in_user.mobile':
             menu:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/mobile/menu.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.content.security.logged_in_user.mobile.menu':
             my_account:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/mobile/menu/my_account.html.twig'
+                priority: 100
             logout:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/mobile/menu/logout.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.content.security.logged_in_user.desktop':
             welcome_message:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/desktop/welcome_message.html.twig'
+                priority: 200
             my_account:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/desktop/my_account.html.twig'
+                priority: 100
             logout:
                 template: '@SyliusShop/shared/layout/base/header/content/security/logged_in_user/desktop/logout.html.twig'
+                priority: 0
         
         'sylius_shop.base.header.content.security.visitor':
             mobile:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor/mobile.html.twig'
+                priority: 100
             desktop:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor/desktop.html.twig'
+                priority: 0
         
         'sylius_shop.base.header.content.security.visitor.desktop':
             user_icon:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor/desktop/user_icon.html.twig'
+                priority: 200
             login:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor/desktop/login.html.twig'
+                priority: 100
             register:
                 template: '@SyliusShop/shared/layout/base/header/content/security/visitor/desktop/register.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.content.logo':
             content:
                 template: "@SyliusShop/shared/logo.html.twig"
+                priority: 0
 
         'sylius_shop.base.header.navbar':
             menu:
                 component: "sylius_shop:common:taxon_menu"
                 props:
                     template: '@SyliusShop/shared/layout/base/header/navbar/menu.html.twig'
+                priority: 0
 
         'sylius_shop.base.header.flashes':
             content:
                 template: "@SyliusShop/shared/flashes.html.twig"
+                priority: 0
 
         'sylius_shop.base.footer':
             content:
                 template: '@SyliusShop/shared/layout/base/footer/content.html.twig'
+                priority: 0
 
         'sylius_shop.base.footer.content':
             menu:
                 template: '@SyliusShop/shared/layout/base/footer/content/menu.html.twig'
+                priority: 200
             payment_methods:
                 template: '@SyliusShop/shared/layout/base/footer/content/payment_methods.html.twig'
+                priority: 100
             copy:
                 template: '@SyliusShop/shared/layout/base/footer/content/copy.html.twig'
+                priority: 0
 
         'sylius_shop.base.offcanvas':
             cart:
                 component: 'sylius_shop:cart:widget:offcanvas'
                 props:
                     template: '@SyliusShop/shared/layout/base/offcanvas/cart.html.twig'
+                priority: 0
 
         'sylius_shop.base.offcanvas.cart':
             header:
                 template: '@SyliusShop/shared/layout/base/offcanvas/cart/header.html.twig'
+                priority: 200
             body:
                 template: '@SyliusShop/shared/layout/base/offcanvas/cart/body.html.twig'
+                priority: 100
             footer:
                 template: '@SyliusShop/shared/layout/base/offcanvas/cart/footer.html.twig'
+                priority: 0
 
         'sylius_shop.base.offcanvas.cart.body':
             items:
                 template: '@SyliusShop/shared/layout/base/offcanvas/cart/body/items.html.twig'
+                priority: 0
 
         'sylius_shop.base.offcanvas.cart.body.items':
             item:
                 template: '@SyliusShop/shared/layout/base/offcanvas/cart/body/items/item.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/cart/index.yaml

@@ -6,6 +6,7 @@ sylius_twig_hooks:
                 props:
                     resource: '@=_context.cart'
                     template: '@SyliusShop/cart/index/form.html.twig'
+                priority: 100
             suggested_products:
                 component: 'sylius_shop:product:list'
                 props:
@@ -13,6 +14,7 @@ sylius_twig_hooks:
                     template: '@SyliusShop/product/common/list.html.twig'
                 configuration:
                     title: 'sylius.ui.you_may_also_like'
+                priority: 0
                     
         'sylius_shop.cart.index.header':
             flashes:
@@ -21,22 +23,29 @@ sylius_twig_hooks:
         'sylius_shop.cart.index.form':
             sections:
                 template: '@SyliusShop/cart/index/form/sections.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections':
             flashes:
                 template: "@SyliusShop/shared/flashes.html.twig"
+                priority: 200
             header:
                 template: '@SyliusShop/cart/index/form/sections/header.html.twig'
+                priority: 100
             general:
                 template: '@SyliusShop/cart/index/form/sections/general.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general#left':
             items:
                 template: '@SyliusShop/cart/index/form/sections/general/items.html.twig'
+                priority: 200
             coupon:
                 template: '@SyliusShop/cart/index/form/sections/general/coupon.html.twig'
+                priority: 100
             clear_cart:
                 template: '@SyliusShop/cart/index/form/sections/general/clear_cart.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general#right':
             summary:
@@ -44,49 +53,69 @@ sylius_twig_hooks:
                 props:
                     cart: '@=_context.cart'
                     template: '@SyliusShop/cart/index/form/sections/general/summary.html.twig'
+                priority: 100
             checkout:
                 template: '@SyliusShop/cart/index/form/sections/general/checkout.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general.items':
             head:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head.html.twig'
+                priority: 100
             body:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general.items.head':
             remove:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head/remove.html.twig'
+                priority: 400
             item:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head/item.html.twig'
+                priority: 300
             unit_price:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head/unit_price.html.twig'
+                priority: 200
             quantity:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head/quantity.html.twig'
+                priority: 100
             total:
                 template: '@SyliusShop/cart/index/form/sections/general/items/head/total.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general.items.body':
             remove:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body/remove.html.twig'
+                priority: 400
             item:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body/item.html.twig'
+                priority: 300
             unit_price:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body/unit_price.html.twig'
+                priority: 200
             quantity:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body/quantity.html.twig'
+                priority: 100
             total:
                 template: '@SyliusShop/cart/index/form/sections/general/items/body/total.html.twig'
+                priority: 0
 
         'sylius_shop.cart.index.form.sections.general.summary':
             items_total:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/items_total.html.twig'
+                priority: 500
             discount:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/discount.html.twig'
+                priority: 400
             estimated_cost:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/estimated_cost.html.twig'
+                priority: 300
             taxes_total:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/taxes_total.html.twig'
+                priority: 200
             order_total:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/order_total.html.twig'
+                priority: 100
             base_currency_order_total:
                 template: '@SyliusShop/cart/index/form/sections/general/summary/base_currency_order_total.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/address.yaml

@@ -3,81 +3,99 @@ sylius_twig_hooks:
         'sylius_shop.checkout.address':
             steps:
                 template: '@SyliusShop/checkout/shared/steps.html.twig'
+                priority: 100
             form:
                 component: 'sylius_shop:checkout:address:form'
                 props:
                     resource: '@=_context.order'
                     form: '@=_context.form'
                     template: '@SyliusShop/checkout/address/form.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.address.form':
             header:
                 template: '@SyliusShop/checkout/address/form/header.html.twig'
+                priority: 300
             user:
                 template: '@SyliusShop/checkout/address/form/user.html.twig'
+                priority: 200
             addresses:
                 template: '@SyliusShop/checkout/address/form/addresses.html.twig'
+                priority: 100
             navigation:
                 template: '@SyliusShop/checkout/address/form/navigation.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.address.form.addresses#billing_required':
             billing_address:
                 template: '@SyliusShop/checkout/address/form/addresses/address.html.twig'
                 configuration:
                     type: 'billing'
+                priority: 200
             different_shipping_address:
                 template: '@SyliusShop/checkout/address/form/addresses/different_address.html.twig'
                 configuration:
                     type: 'shipping'
                     field: 'differentShippingAddress'
+                priority: 100
             shipping_address:
                 template: '@SyliusShop/checkout/address/form/addresses/address.html.twig'
                 configuration:
                     type: 'shipping'
                     isDifferentAddress: true
+                priority: 0
 
         'sylius_shop.checkout.address.form.addresses#shipping_required':
             shipping_address:
                 template: '@SyliusShop/checkout/address/form/addresses/address.html.twig'
                 configuration:
                     type: 'shipping'
+                priority: 200
             different_billing_address:
                 template: '@SyliusShop/checkout/address/form/addresses/different_address.html.twig'
                 configuration:
                     type: 'billing'
                     field: 'differentBillingAddress'
+                priority: 100
             billing_address:
                 template: '@SyliusShop/checkout/address/form/addresses/address.html.twig'
                 configuration:
                     type: 'billing'
                     isDifferentAddress: true
+                priority: 0
 
         'sylius_shop.checkout.address.form.addresses.billing_address':
             header:
                 template: '@SyliusShop/checkout/address/form/addresses/address/header.html.twig'
                 configuration:
                     title: 'sylius.ui.billing_address'
+                priority: 200
             address_book:
                 component: 'sylius_shop:checkout:address:address_book'
                 props:
                     field: 'billingAddress'
                     template: '@SyliusShop/checkout/address/form/addresses/address/address_book.html.twig'
+                priority: 100
             form:
                 template: '@SyliusShop/checkout/address/form/addresses/address/form.html.twig'
                 configuration:
                     field: 'billingAddress'
+                priority: 0
 
         'sylius_shop.checkout.address.form.addresses.shipping_address':
             header:
                 template: '@SyliusShop/checkout/address/form/addresses/address/header.html.twig'
                 configuration:
                     title: 'sylius.ui.shipping_address'
+                priority: 200
             address_book:
                 component: 'sylius_shop:checkout:address:address_book'
                 props:
                     field: 'shippingAddress'
                     template: '@SyliusShop/checkout/address/form/addresses/address/address_book.html.twig'
+                priority: 100
             form:
                 template: '@SyliusShop/checkout/address/form/addresses/address/form.html.twig'
                 configuration:
                     field: 'shippingAddress'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/complete.yaml

@@ -3,26 +3,35 @@ sylius_twig_hooks:
         'sylius_shop.checkout.complete':
             steps:
                 template: '@SyliusShop/checkout/shared/steps.html.twig'
+                priority: 300
             header:
                 template: '@SyliusShop/checkout/complete/header.html.twig'
+                priority: 200
             flashes:
                 template: '@SyliusShop/shared/flashes.html.twig'
+                priority: 100
             form:
                 template: '@SyliusShop/checkout/complete/form.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.complete.header':
             currency:
                 template: '@SyliusShop/checkout/complete/header/currency.html.twig'
+                priority: 100
             locale:
                 template: '@SyliusShop/checkout/complete/header/locale.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.complete.form':
             summary:
                 template: '@SyliusShop/checkout/complete/form/summary.html.twig'
+                priority: 200
             extra_notes:
                 template: '@SyliusShop/checkout/complete/form/extra_notes.html.twig'
+                priority: 100
             navigation:
                 template: '@SyliusShop/checkout/complete/form/navigation.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.complete.form.summary.statuses.payments':
             state:

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_payment.yaml

@@ -3,14 +3,18 @@ sylius_twig_hooks:
         'sylius_shop.checkout.select_payment':
             steps:
                 template: '@SyliusShop/checkout/shared/steps.html.twig'
+                priority: 100
             form:
                 component: 'sylius_shop:checkout:payment:form'
                 props:
                     resource: '@=_context.order'
                     template: '@SyliusShop/checkout/select_payment/form.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.select_payment.form':
             payments:
                 template: '@SyliusShop/checkout/select_payment/form/payments.html.twig'
+                priority: 100
             navigation:
                 template: '@SyliusShop/checkout/select_payment/form/navigation.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_shipping.yaml

@@ -3,44 +3,57 @@ sylius_twig_hooks:
         'sylius_shop.checkout.select_shipping':
             steps:
                 template: '@SyliusShop/checkout/shared/steps.html.twig'
+                priority: 100
             form:
                 component: 'sylius_shop:checkout:shipping:form'
                 props:
                     order: '@=_context.order'
                     template: '@SyliusShop/checkout/select_shipping/form.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form':
             shipments:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments.html.twig'
+                priority: 100
             navigation:
                 template: '@SyliusShop/checkout/select_shipping/form/navigation.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments':
             shipment:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments.shipment':
             header:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/header.html.twig'
+                priority: 100
             choice:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/choice.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments.shipment#unavailable':
             unavailable:
                 template: '@SyliusShop/checkout/select_shipping/unavailable.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments.shipment.choice':
             details:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/choice/details.html.twig'
+                priority: 100
             fee:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/choice/fee.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments.shipment.choice#unavailable':
             unavailable:
                 template: '@SyliusShop/checkout/select_shipping/unavailable.html.twig'
+                priority: 0
 
         'sylius_shop.checkout.select_shipping.form.shipments.shipment.choice.details':
             name:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/choice/details/name.html.twig'
+                priority: 100
             description:
                 template: '@SyliusShop/checkout/select_shipping/form/shipments/shipment/choice/details/description.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/shared.yaml

@@ -3,41 +3,56 @@ sylius_twig_hooks:
         'sylius_shop.checkout.shared.header':
             logo:
                 template: '@SyliusShop/checkout/shared/header/logo.html.twig'
+                priority: 100
             account:
                 template: '@SyliusShop/checkout/shared/header/account.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.shared.sidebar':
             summary:
                 template: '@SyliusShop/checkout/shared/sidebar/summary.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.shared.sidebar.summary':
             header:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/header.html.twig'
+                priority: 200
             items:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/items.html.twig'
+                priority: 100
             total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.shared.sidebar.summary.items':
             item:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/items/item.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.shared.sidebar.summary.items.item':
             name:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/name.html.twig'
+                priority: 200
             quantity:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/quantity.html.twig'
+                priority: 100
             subtotal:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/items/item/subtotal.html.twig'
+                priority: 0
         
         'sylius_shop.checkout.shared.sidebar.summary.total':
             items_total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total/items_total.html.twig'
+                priority: 400
             promotion_total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total/promotion_total.html.twig'
+                priority: 300
             shipping_total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total/shipping_total.html.twig'
+                priority: 200
             taxes_total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total/taxes_total.html.twig'
+                priority: 100
             order_total:
                 template: '@SyliusShop/checkout/shared/sidebar/summary/total/order_total.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/contact/contact_request.yaml

@@ -3,13 +3,18 @@ sylius_twig_hooks:
         'sylius_shop.contact.contact_request':
             header:
                 template: '@SyliusShop/contact/contact_request/header.html.twig'
+                priority: 100
             form:
                 template: '@SyliusShop/contact/contact_request/form.html.twig'
+                priority: 0
                 
         'sylius_shop.contact.contact_request.form':
             email:
                 template: '@SyliusShop/contact/contact_request/form/email.html.twig'
+                priority: 200
             message:
                 template: '@SyliusShop/contact/contact_request/form/message.html.twig'
+                priority: 100
             submit:
                 template: '@SyliusShop/contact/contact_request/form/submit.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error403.yaml

@@ -3,3 +3,4 @@ sylius_twig_hooks:
         'sylius_shop.error403.error.layout':
             message:
                 template: '@SyliusShop/errors/error403/layout/message.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error404.yaml

@@ -3,3 +3,4 @@ sylius_twig_hooks:
         'sylius_shop.error404.error.layout':
             message:
                 template: '@SyliusShop/errors/error404/layout/message.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error500.yaml

@@ -3,3 +3,4 @@ sylius_twig_hooks:
         'sylius_shop.error500.error.layout':
             message:
                 template: '@SyliusShop/errors/error500/layout/message.html.twig'
+                priority: 0

src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/homepage/index.yaml

@@ -3,6 +3,7 @@ sylius_twig_hooks:
         'sylius_shop.homepage.index':
             banner:
                 template: '@SyliusShop/homepage/banner.html.twig'
+                priority: 300
             latest_deals:
                 component: 'sylius_shop:product:list'
                 props:
@@ -11,10 +12,13 @@ sylius_twig_hooks:
                 configuration:
                     title: 'sylius.homepage.latest_deals'
                     test_attribute: 'latest-deals'
+                priority: 200
             new_collection:
                 template: '@SyliusShop/homepage/new_collection.html.twig'
+                priority: 100
             latest_products:
                 component: 'sylius_shop:product:list'
                 props:
                     limit: 8
                     template: '@SyliusShop/product/common/list.html.twig'
+                priority: 0