diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index 7c9d433c6f..2f9c4c8e56 100644 --- a/UPGRADE-2.0.md +++ b/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.` 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: diff --git a/UPGRADE-API-1.14.md b/UPGRADE-API-1.14.md new file mode 100644 index 0000000000..27304d166d --- /dev/null +++ b/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` | diff --git a/config/packages/security.yaml b/config/packages/security.yaml index d010f895b9..af38e75096 100644 --- a/config/packages/security.yaml +++ b/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 } diff --git a/config/routes/sylius_api.yaml b/config/routes/sylius_api.yaml index ae01ffce8a..a7504e860d 100644 --- a/config/routes/sylius_api.yaml +++ b/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%" diff --git a/docs/components_and_bundles/bundles/SyliusUserBundle/summary.rst b/docs/components_and_bundles/bundles/SyliusUserBundle/summary.rst index b535758c32..c4f923cbc5 100644 --- a/docs/components_and_bundles/bundles/SyliusUserBundle/summary.rst +++ b/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 diff --git a/docs/cookbook/shop/disabling-guest-checkout.rst b/docs/cookbook/shop/disabling-guest-checkout.rst index 49fd0cfdc1..5ba3fb1c3f 100644 --- a/docs/cookbook/shop/disabling-guest-checkout.rst +++ b/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: diff --git a/docs/customization/api/modifying_endpoints.rst b/docs/customization/api/modifying_endpoints.rst index 12168f71c8..9206418cb9 100644 --- a/docs/customization/api/modifying_endpoints.rst +++ b/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:: diff --git a/features/admin/promotion/managing_promotions/promotion_validation.feature b/features/admin/promotion/managing_promotions/promotion_validation.feature index 5e66860c10..54f5c09486 100644 --- a/features/admin/promotion/managing_promotions/promotion_validation.feature +++ b/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" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 8c12ac816b..4dd1bfe130 100644 --- a/phpstan-baseline.neon +++ b/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 diff --git a/src/Sylius/Abstraction/StateMachine/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Abstraction/StateMachine/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Behat/Context/Cli/ChangeAdminPasswordContext.php b/src/Sylius/Behat/Context/Cli/ChangeAdminPasswordContext.php index fd5b34b9cf..a0d226571f 100644 --- a/src/Sylius/Behat/Context/Cli/ChangeAdminPasswordContext.php +++ b/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 */ + private array $input = []; /** @param UserRepositoryInterface $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()), + ); } } diff --git a/src/Sylius/Behat/Resources/config/services/api.xml b/src/Sylius/Behat/Resources/config/services/api.xml index fbc7efe009..622068c0e4 100644 --- a/src/Sylius/Behat/Resources/config/services/api.xml +++ b/src/Sylius/Behat/Resources/config/services/api.xml @@ -35,14 +35,14 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% admin/administrators/token - %sylius.security.new_api_route% + %sylius.security.api_route% shop/customers/token @@ -50,7 +50,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml index edf018b0ce..aec02f5736 100644 --- a/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml +++ b/src/Sylius/Behat/Resources/config/services/contexts/api/admin.xml @@ -86,7 +86,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -134,7 +134,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -190,7 +190,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -198,7 +198,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -257,7 +257,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml index c1edfa1d1a..88812e102e 100644 --- a/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml +++ b/src/Sylius/Behat/Resources/config/services/contexts/api/shop.xml @@ -29,7 +29,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -46,7 +46,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -57,7 +57,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -90,7 +90,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -101,7 +101,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -112,7 +112,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -141,7 +141,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -152,7 +152,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Behat/Resources/config/services/contexts/cli.xml b/src/Sylius/Behat/Resources/config/services/contexts/cli.xml index 5edded3d71..96e94d1013 100644 --- a/src/Sylius/Behat/Resources/config/services/contexts/cli.xml +++ b/src/Sylius/Behat/Resources/config/services/contexts/cli.xml @@ -36,7 +36,7 @@ - + diff --git a/src/Sylius/Bundle/AddressingBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/AddressingBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/AdminBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/AdminBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/AdminBundle/spec/Provider/LoggedInAdminUserProviderSpec.php b/src/Sylius/Bundle/AdminBundle/spec/Provider/LoggedInAdminUserProviderSpec.php index ceb709a7e8..ec5d270eb1 100644 --- a/src/Sylius/Bundle/AdminBundle/spec/Provider/LoggedInAdminUserProviderSpec.php +++ b/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, diff --git a/src/Sylius/Bundle/ApiBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ApiBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentMethod.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentMethod.xml index f825c27ed3..30cc2ab96a 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentMethod.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/api_platform/resources/admin/PaymentMethod.xml @@ -86,7 +86,7 @@ - sylius_api.validator.payment_method_groups_generator + sylius_api.validator.groups_generator.payment_method @@ -116,7 +116,7 @@ - sylius_api.validator.payment_method_groups_generator + sylius_api.validator.groups_generator.payment_method diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml b/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml index 2f3ce7e423..a074307410 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/app/config.yaml +++ b/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" diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/integrations/swagger.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/integrations/swagger.xml index cca1724ac9..e7fdffbf09 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/integrations/swagger.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/integrations/swagger.xml @@ -29,7 +29,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -48,12 +48,12 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% - %sylius.security.new_api_route% + %sylius.security.api_route% @@ -62,26 +62,26 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% %sylius.shipping_method_rules% %sylius.shipping_calculators% - %sylius.security.new_api_route% + %sylius.security.api_route% - %sylius.security.new_api_route% + %sylius.security.api_route% %sylius_core.orders_statistics.intervals_map% - %sylius.security.new_api_route% + %sylius.security.api_route% %sylius.promotion_actions% %sylius.promotion_rules% @@ -98,7 +98,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% %sylius.model.adjustment.class% diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/contexts.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/contexts.xml index cb34e40872..ddc094c1a2 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/contexts.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/contexts.xml @@ -25,7 +25,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml index 6fb3ec36a9..d710172944 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/event_subscribers.xml @@ -30,7 +30,7 @@ %sylius_api.enabled% - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/providers.xml index 8e17026e7d..dc9a098a62 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/providers.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/providers.xml @@ -25,7 +25,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% %sylius.api_path_prefixes% diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml index 6bedfe47a0..33f5c24d2f 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/serializers.xml @@ -40,7 +40,7 @@ - %sylius.security.new_api_route% + %sylius.security.api_route% diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml index 9d395b9359..e1966d221b 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/shop/state_providers.xml @@ -54,7 +54,7 @@ - + diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml index 1a86ab287d..55bd9ab96b 100644 --- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml +++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/validator.xml @@ -215,12 +215,12 @@ %sylius.form.type.payment_method.validation_groups% - + diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/routing.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/routing.yaml index ae01ffce8a..a7504e860d 100644 --- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/routing.yaml +++ b/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%" diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/security.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/security.yaml index 469d666c6f..ccdbc2914a 100644 --- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/security.yaml +++ b/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 } diff --git a/src/Sylius/Bundle/ApiBundle/spec/EventListener/ApiCartBlamerListenerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/EventListener/ApiCartBlamerListenerSpec.php index 72b5d2701b..d03234b459 100644 --- a/src/Sylius/Bundle/ApiBundle/spec/EventListener/ApiCartBlamerListenerSpec.php +++ b/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', ), ); } diff --git a/src/Sylius/Bundle/AttributeBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/AttributeBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ChannelBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ChannelBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/CoreBundle/EventListener/MailerListener.php b/src/Sylius/Bundle/CoreBundle/EventListener/MailerListener.php index 3598cae63d..a3a9567272 100644 --- a/src/Sylius/Bundle/CoreBundle/EventListener/MailerListener.php +++ b/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); diff --git a/src/Sylius/Bundle/CoreBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/CoreBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081014.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081014.php new file mode 100644 index 0000000000..9b0aee2e4a --- /dev/null +++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081014.php @@ -0,0 +1,37 @@ +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'); + } +} diff --git a/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081606.php b/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081606.php new file mode 100644 index 0000000000..559c8ca43b --- /dev/null +++ b/src/Sylius/Bundle/CoreBundle/Migrations/Version20241012081606.php @@ -0,0 +1,45 @@ +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'); + } +} diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml index 8572779c4d..f71c2a0da7 100644 --- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml +++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/mailer.xml @@ -19,7 +19,6 @@ - diff --git a/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php b/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php index 031f5ae69a..93a93c7a08 100644 --- a/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php +++ b/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; diff --git a/src/Sylius/Bundle/CoreBundle/spec/EventListener/MailerListenerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/EventListener/MailerListenerSpec.php index 6a86e485a4..39addb7aa4 100644 --- a/src/Sylius/Bundle/CoreBundle/spec/EventListener/MailerListenerSpec.php +++ b/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, diff --git a/src/Sylius/Bundle/CurrencyBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/CurrencyBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/CustomerBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/CustomerBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/InventoryBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/InventoryBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/LocaleBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/LocaleBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/MoneyBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/MoneyBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/OrderBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/OrderBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/PaymentBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/PaymentBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml index c7c07b055a..bd3744d9e4 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services.xml @@ -37,32 +37,30 @@ Payment methods resolver - + - - - + + - + - - + %sylius.form.type.gateway_config.validation_groups% %sylius.gateway_config.validation_groups% - + - + %sylius.form.type.payment_method.validation_groups% - + - + diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml index 26eac2b37d..ecf814e2b8 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/controllers.xml @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml index 576d310897..cf379ee372 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/form.xml @@ -50,7 +50,7 @@ %sylius.model.payment_method.class% %sylius.form.type.payment_method.validation_groups% - + diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/normalizer.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/normalizer.xml index 533bccfa4b..e888dc5b26 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/normalizer.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/normalizer.xml @@ -11,9 +11,10 @@ --> - diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml index dd2999e567..bc34d95b1b 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/processors.xml @@ -11,14 +11,15 @@ --> - - + - + diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml index 6843018bef..65b255e5e8 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/provider.xml @@ -29,7 +29,7 @@ - + @@ -39,14 +39,16 @@ - - - + + + + + diff --git a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml index 3c36b0a299..85ff1b2e79 100644 --- a/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml +++ b/src/Sylius/Bundle/PaymentBundle/Resources/config/services/validator.xml @@ -11,14 +11,15 @@ --> - - + %sylius.gateway_factories% diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php index b3cc868fa7..e64f692c92 100644 --- a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExists.php +++ b/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'; diff --git a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php b/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php index b4f710035e..98c7cc6bc0 100644 --- a/src/Sylius/Bundle/PaymentBundle/Validator/Constraints/GatewayFactoryExistsValidator.php +++ b/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 $factoryNames */ diff --git a/src/Sylius/Bundle/PayumBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/PayumBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml index f4710f4314..fb09353ebe 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services.xml @@ -27,5 +27,6 @@ + diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml index bd90b21175..803a7824cd 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/action.xml @@ -1,9 +1,10 @@ - - + @@ -12,26 +13,38 @@ + + + + + + + + + + + + diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/extension.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/extension.xml index 3e0ab4f616..71c4faf677 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/extension.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/extension.xml @@ -1,9 +1,10 @@ - - + @@ -11,5 +12,6 @@ + diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml index 595cb5ecdb..0cfaa01f63 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/factory.xml @@ -1,16 +1,19 @@ - - + + + diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml index 936bfbca60..69d8494fbd 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/form.xml @@ -11,7 +11,11 @@ --> - + @@ -19,5 +23,6 @@ + diff --git a/src/Sylius/Bundle/PayumBundle/Resources/config/services/provider.xml b/src/Sylius/Bundle/PayumBundle/Resources/config/services/provider.xml index 3b22ead8eb..addfda5ec4 100644 --- a/src/Sylius/Bundle/PayumBundle/Resources/config/services/provider.xml +++ b/src/Sylius/Bundle/PayumBundle/Resources/config/services/provider.xml @@ -1,15 +1,17 @@ - - + + diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index 3caf802733..1e0ea725e6 100644 --- a/src/Sylius/Bundle/PayumBundle/composer.json +++ b/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": { diff --git a/src/Sylius/Bundle/ProductBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ProductBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/PromotionBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/PromotionBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ReviewBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ReviewBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ShippingBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ShippingBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ShopBundle/EventListener/UserRegistrationListener.php b/src/Sylius/Bundle/ShopBundle/EventListener/UserRegistrationListener.php index c903ae098c..419cf0030d 100644 --- a/src/Sylius/Bundle/ShopBundle/EventListener/UserRegistrationListener.php +++ b/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); } } diff --git a/src/Sylius/Bundle/ShopBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/ShopBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/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. diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/sylius/sylius_mailer.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/sylius/sylius_mailer.yml index edb43eb4b3..d85a8b1db2 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/sylius/sylius_mailer.yml +++ b/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" diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/create.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/create.yaml index 0d4d3251d4..0195a6ec93 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/create.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/index.yaml index 7dfe6143e0..b0efe352cc 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/index.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/update.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/update.yaml index 9cd37f4311..564f34c1ed 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/address_book/update.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/change_password.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/change_password.yaml index deddc7e8b7..8e76306128 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/change_password.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/create.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/create.yaml index e56d241a7f..ef0893f3d1 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/create.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/index.yaml index c93ebf059a..e7e8131270 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/index.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/show.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/show.yaml index c6e5f56deb..8dc35a7e1c 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/show.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/update.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/update.yaml index 9d2f61f5d2..9905782144 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/common/update.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/dashboard.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/dashboard.yaml index a50e0d621c..8812bea97b 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/dashboard.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/forgotten_password.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/forgotten_password.yaml index ebf7805826..c6479cb5ab 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/forgotten_password.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/login.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/login.yaml index 85a1ce4e4b..3893b4c830 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/login.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/index.yaml index 35e37c05ba..eb063bc527 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/index.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/show.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/show.yaml index 3a5d403cde..6250211a94 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/order/show.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/profile_update.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/profile_update.yaml index 00b8cb6da6..66e4423753 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/profile_update.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register.yaml index bc5b72a459..2b8262f123 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register_thank_you.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register_thank_you.yaml index 52eed8a31c..52c98b77f9 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/register_thank_you.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/reset_password.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/reset_password.yaml index c90ff639b9..d25891393a 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/account/reset_password.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/base.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/base.yaml index 67ae4fe2c5..45f5ccc0de 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/base.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/cart/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/cart/index.yaml index 65a57f20e9..e61947452b 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/cart/index.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/address.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/address.yaml index 5bbc612a7d..e132d54490 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/address.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/complete.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/complete.yaml index d50a329ac8..17ecf66bfc 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/complete.yaml +++ b/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: diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_payment.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_payment.yaml index f3d863c5a3..b436efa838 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_payment.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_shipping.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_shipping.yaml index 7c809edacd..79bba04c43 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/select_shipping.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/shared.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/shared.yaml index b4cee5e092..42da3ae167 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/checkout/shared.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/contact/contact_request.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/contact/contact_request.yaml index 468972459a..8e88915b44 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/contact/contact_request.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error403.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error403.yaml index 1e1abcace5..76ca6f3a4b 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error403.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error404.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error404.yaml index a29f890353..168054919e 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error404.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error500.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error500.yaml index 30782e07b0..c5c86ef064 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/errors/error500.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/homepage/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/homepage/index.yaml index 23ebd7f97b..d28073a331 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/homepage/index.yaml +++ b/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 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/show.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/show.yaml index 3498edd3ad..3906321f7f 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/show.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/show.yaml @@ -3,11 +3,15 @@ sylius_twig_hooks: 'sylius_shop.order.show': header: template: "@SyliusShop/order/show/header.html.twig" + priority: 100 form: template: "@SyliusShop/order/show/form.html.twig" + priority: 0 'sylius_shop.order.show.form': payments: template: "@SyliusShop/order/show/form/payments.html.twig" + priority: 100 pay_button: template: "@SyliusShop/order/show/form/pay_button.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/thank_you.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/thank_you.yaml index b466a29f46..4a40d5d1ea 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/thank_you.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/order/thank_you.yaml @@ -3,17 +3,23 @@ sylius_twig_hooks: 'sylius_shop.order.thank_you': header: template: "@SyliusShop/order/thank_you/header.html.twig" + priority: 200 payment_instruction: template: "@SyliusShop/order/thank_you/payment_instruction.html.twig" + priority: 100 buttons: template: "@SyliusShop/order/thank_you/buttons.html.twig" + priority: 0 'sylius_shop.order.thank_you.buttons#customer': view_order: template: "@SyliusShop/order/thank_you/buttons/view_order.html.twig" + priority: 0 'sylius_shop.order.thank_you.buttons#guest': change_payment_method: template: "@SyliusShop/order/thank_you/buttons/change_payment_method.html.twig" + priority: 100 create_account: template: "@SyliusShop/order/thank_you/buttons/create_account.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/index.yaml index e5ab577767..9515ffadef 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/index.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/index.yaml @@ -5,72 +5,94 @@ sylius_twig_hooks: component: "sylius_shop:product:show:breadcrumbs" props: template: "@SyliusShop/product/index/page/breadcrumbs.html.twig" + priority: 100 body: template: "@SyliusShop/product/index/page/body.html.twig" + priority: 0 'sylius_shop.product.index.page.body': sidebar: template: "@SyliusShop/product/index/page/body/sidebar.html.twig" + priority: 100 main: template: "@SyliusShop/product/index/page/body/main.html.twig" + priority: 0 'sylius_shop.product.index.page.body.sidebar': taxonomy: component: "sylius_shop:product:show:taxonomy" props: template: "@SyliusShop/product/index/page/body/sidebar/taxonomy.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main': header: component: "sylius_shop:product:show:header" props: template: "@SyliusShop/product/index/page/body/main/header.html.twig" + priority: 300 filters: template: "@SyliusShop/product/index/page/body/main/filters.html.twig" + priority: 200 products: template: "@SyliusShop/product/index/page/body/main/products.html.twig" + priority: 100 pagination: template: "@SyliusShop/product/index/page/body/main/pagination.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.header': image: template: "@SyliusShop/product/index/page/body/main/header/image.html.twig" + priority: 300 name: template: "@SyliusShop/product/index/page/body/main/header/name.html.twig" + priority: 100 description: template: "@SyliusShop/product/index/page/body/main/header/description.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters': search: template: "@SyliusShop/product/index/page/body/main/filters/search.html.twig" controls: template: "@SyliusShop/product/index/page/body/main/filters/controls.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters.search': filter: template: "@SyliusShop/product/index/page/body/main/filters/search/filter.html.twig" + priority: 200 submit: template: "@SyliusShop/product/index/page/body/main/filters/search/submit.html.twig" + priority: 100 clear: template: "@SyliusShop/product/index/page/body/main/filters/search/clear.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters.controls': limit: template: "@SyliusShop/product/index/page/body/main/filters/controls/limit.html.twig" + priority: 100 sort: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters.controls.limit': toggle: template: "@SyliusShop/product/index/page/body/main/filters/controls/limit/toggle.html.twig" + priority: 100 menu: template: "@SyliusShop/product/index/page/body/main/filters/controls/limit/menu.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters.controls.sorting': toggle: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/toggle.html.twig" + priority: 100 menu: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu.html.twig" + priority: 0 'sylius_shop.product.index.page.body.main.filters.controls.sorting.menu': default: @@ -78,6 +100,7 @@ sylius_twig_hooks: configuration: title: 'sylius.ui.by_position' sorting: '' + priority: 600 a_to_z: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: @@ -86,6 +109,7 @@ sylius_twig_hooks: name: 'sorting' value: name: 'asc' + priority: 500 z_to_a: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: @@ -94,27 +118,32 @@ sylius_twig_hooks: name: 'sorting' value: name: 'desc' + priority: 400 newest: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: title: 'sylius.ui.newest_first' sorting: createdAt: 'desc' + priority: 300 oldest: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: title: 'sylius.ui.oldest_first' sorting: createdAt: 'asc' + priority: 200 cheapest: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: title: 'sylius.ui.cheapest_first' sorting: price: 'asc' + priority: 100 most_expensive: template: "@SyliusShop/product/index/page/body/main/filters/controls/sorting/menu/item.html.twig" configuration: title: 'sylius.ui.most_expensive_first' sorting: price: 'desc' + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/show.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/show.yaml index 48ab0bf234..33a81513f9 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/show.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product/show.yaml @@ -3,14 +3,18 @@ sylius_twig_hooks: 'sylius_shop.product.show.page': header: template: '@SyliusShop/product/show/page/header.html.twig' + priority: 200 info: template: '@SyliusShop/product/show/page/info.html.twig' + priority: 100 product_listing: template: '@SyliusShop/product/show/page/product_listing.html.twig' + priority: 0 'sylius_shop.product.show.page.header': breadcrumbs: template: '@SyliusShop/product/show/page/header/breadcrumbs.html.twig' + priority: 0 'sylius_shop.product.show.page.info': summary: @@ -18,36 +22,47 @@ sylius_twig_hooks: props: product: '@=_context.product' template: '@SyliusShop/product/show/page/info/summary.html.twig' + priority: 100 overview: template: '@SyliusShop/product/show/page/info/overview.html.twig' + priority: 0 'sylius_shop.product.show.page.info.summary': header: template: "@SyliusShop/product/show/page/info/summary/header.html.twig" + priority: 500 average_rating: template: "@SyliusShop/product/show/page/info/summary/average_rating.html.twig" + priority: 400 prices: template: "@SyliusShop/product/show/page/info/summary/prices.html.twig" + priority: 300 catalog_promotions: template: "@SyliusShop/product/show/page/info/summary/catalog_promotions.html.twig" + priority: 200 add_to_cart: component: 'sylius_shop:product:add_to_cart_form' props: product: '@=_context.product' template: '@SyliusShop/product/show/page/info/summary/add_to_cart.html.twig' + priority: 100 short_description: template: "@SyliusShop/product/show/page/info/summary/short_description.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.average_rating': rating: template: "@SyliusShop/product/show/page/info/summary/average_rating/rating.html.twig" + priority: 200 number_of_reviews: component: 'sylius_shop:product_review.count' props: product: '@=_context.product' template: '@SyliusShop/product/show/page/info/summary/average_rating/number_of_reviews.html.twig' + priority: 100 add_review: template: "@SyliusShop/product/show/page/info/summary/average_rating/add_review.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.prices': price: @@ -55,90 +70,120 @@ sylius_twig_hooks: props: variant: '@=_context.variant' template: '@SyliusShop/product/show/page/info/summary/prices/price.html.twig' + priority: 100 lowest_price_before_discount: template: "@SyliusShop/product/show/page/info/summary/prices/lowest_price_before_discount.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart': table: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants.html.twig" + priority: 200 quantity: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/quantity.html.twig" + priority: 100 submit: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/submit.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart.variants': table: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart.variants.table': head: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/head.html.twig" + priority: 100 body: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/body.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart.variants.table.head': name: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/head/name.html.twig" + priority: 200 price: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/head/price.html.twig" + priority: 100 selection: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/head/selection.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart.variants.table.body': name: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/body/name.html.twig" + priority: 200 price: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/body/price.html.twig" + priority: 100 selection: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/variants/table/body/selection.html.twig" + priority: 0 'sylius_shop.product.show.page.info.summary.add_to_cart.options': list: template: "@SyliusShop/product/show/page/info/summary/add_to_cart/options/list.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview': images: template: "@SyliusShop/product/show/page/info/overview/images.html.twig" + priority: 100 accordion: template: "@SyliusShop/product/show/page/info/overview/accordion.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.images': main_image: template: "@SyliusShop/product/show/page/info/overview/images/main_image.html.twig" + priority: 100 thumbnails: template: "@SyliusShop/product/show/page/info/overview/images/thumbnails.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.images.thumbnails': image_variants: template: "@SyliusShop/product/show/page/info/overview/images/thumbnails/image_variants.html.twig" + priority: 100 thumbnail: template: "@SyliusShop/product/show/page/info/overview/images/thumbnails/thumbnail.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.accordion': details: template: "@SyliusShop/product/show/page/info/overview/accordion/details.html.twig" + priority: 200 attributes: template: "@SyliusShop/product/show/page/info/overview/accordion/attributes.html.twig" + priority: 100 reviews: template: "@SyliusShop/product/show/page/info/overview/accordion/reviews.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.accordion.details': title: template: "@SyliusShop/product/show/page/info/overview/accordion/details/title.html.twig" + priority: 100 content: template: "@SyliusShop/product/show/page/info/overview/accordion/details/content.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.accordion.attributes': title: template: "@SyliusShop/product/show/page/info/overview/accordion/attributes/title.html.twig" + priority: 100 content: template: "@SyliusShop/product/show/page/info/overview/accordion/attributes/content.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.accordion.reviews': title: template: "@SyliusShop/product/show/page/info/overview/accordion/reviews/title.html.twig" + priority: 100 content: template: "@SyliusShop/product/show/page/info/overview/accordion/reviews/content.html.twig" + priority: 0 'sylius_shop.product.show.page.info.overview.accordion.reviews.content': list: @@ -147,11 +192,15 @@ sylius_twig_hooks: product: '@=_context.product' count: 3 template: '@SyliusShop/shared/product_review/list.html.twig' + priority: 200 add_review: template: "@SyliusShop/product/show/page/info/overview/accordion/reviews/content/add_review.html.twig" + priority: 100 view_more: template: "@SyliusShop/product/show/page/info/overview/accordion/reviews/content/view_more.html.twig" + priority: 0 'sylius_shop.product.show.page.product_listing': associations: template: "@SyliusShop/product/show/page/product_listing/associations.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/create.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/create.yaml index 9fe4f9fc10..895eba4dfb 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/create.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/create.yaml @@ -3,8 +3,10 @@ sylius_twig_hooks: 'sylius.shop.product_review.create': sidebar: template: "@SyliusShop/product_review/create/sidebar.html.twig" + priority: 100 main: template: "@SyliusShop/product_review/create/main.html.twig" + priority: 0 'sylius.shop.product_review.create.sidebar': product_card: @@ -12,25 +14,33 @@ sylius_twig_hooks: props: product: '@=_context.product' template: '@SyliusShop/product/common/card.html.twig' + priority: 0 'sylius.shop.product_review.create.main': header: template: "@SyliusShop/product_review/create/main/header.html.twig" + priority: 100 form: component: 'sylius_shop:product_review:form' props: resource: '@=_context.product_review' form: '@=_context.form' template: '@SyliusShop/product_review/create/main/form.html.twig' + priority: 0 'sylius.shop.product_review.create.main.form': rating: template: "@SyliusShop/product_review/create/main/form/rating.html.twig" + priority: 400 title: template: "@SyliusShop/product_review/create/main/form/title.html.twig" + priority: 300 comment: template: "@SyliusShop/product_review/create/main/form/comment.html.twig" + priority: 200 email: template: "@SyliusShop/product_review/create/main/form/email.html.twig" + priority: 100 submit: template: "@SyliusShop/product_review/create/main/form/submit.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/index.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/index.yaml index 9a88eeb1b7..d49878d1c7 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/index.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/product_review/index.yaml @@ -3,8 +3,10 @@ sylius_twig_hooks: 'sylius.shop.product_review.index': sidebar: template: "@SyliusShop/product_review/index/sidebar.html.twig" + priority: 100 main: template: "@SyliusShop/product_review/index/main.html.twig" + priority: 0 'sylius.shop.product_review.index.sidebar': product_card: @@ -13,53 +15,70 @@ sylius_twig_hooks: product: '@=_context.product' slug: '@=_context.slug' template: '@SyliusShop/product/common/card.html.twig' + priority: 0 'sylius.shop.product_review.index.main': header: template: "@SyliusShop/product_review/index/main/header.html.twig" + priority: 100 list: template: "@SyliusShop/product_review/index/main/list.html.twig" + priority: 0 'sylius.shop.product_review.index.main.header': details: template: "@SyliusShop/product_review/index/main/header/details.html.twig" + priority: 100 buttons: template: "@SyliusShop/product_review/index/main/header/buttons.html.twig" + priority: 0 'sylius.shop.product_review.index.main.header.details': title: template: "@SyliusShop/product_review/index/main/header/details/title.html.twig" + priority: 100 reviews_count: template: "@SyliusShop/product_review/index/main/header/details/reviews_count.html.twig" + priority: 0 'sylius.shop.product_review.index.main.header.buttons': add_review: template: "@SyliusShop/product_review/index/main/header/buttons/add_review.html.twig" + priority: 0 'sylius.shop.product_review.index.main.list': review: template: "@SyliusShop/product_review/index/main/list/review.html.twig" + priority: 0 'sylius.shop.product_review.index.main.list.review': header: template: "@SyliusShop/product_review/index/main/list/review/header.html.twig" + priority: 200 content: template: "@SyliusShop/product_review/index/main/list/review/content.html.twig" + priority: 100 footer: template: "@SyliusShop/product_review/index/main/list/review/footer.html.twig" + priority: 0 'sylius.shop.product_review.index.main.list.review.header': title: template: "@SyliusShop/product_review/index/main/list/review/header/title.html.twig" + priority: 100 rating: template: "@SyliusShop/product_review/index/main/list/review/header/rating.html.twig" + priority: 0 'sylius.shop.product_review.index.main.list.review.content': comment: template: "@SyliusShop/product_review/index/main/list/review/content/comment.html.twig" + priority: 0 'sylius.shop.product_review.index.main.list.review.footer': author: template: "@SyliusShop/product_review/index/main/list/review/footer/author.html.twig" + priority: 100 date: template: "@SyliusShop/product_review/index/main/list/review/footer/date.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/address.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/address.yaml index e26345e811..8623dbebc9 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/address.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/address.yaml @@ -3,15 +3,22 @@ sylius_twig_hooks: 'sylius_shop.shared.address': company: template: "@SyliusShop/shared/address/company.html.twig" + priority: 600 name: template: "@SyliusShop/shared/address/name.html.twig" + priority: 500 phone_number: template: "@SyliusShop/shared/address/phone_number.html.twig" + priority: 400 street: template: "@SyliusShop/shared/address/street.html.twig" + priority: 300 city_and_postcode: template: "@SyliusShop/shared/address/city_and_postcode.html.twig" + priority: 200 province: template: "@SyliusShop/shared/address/province.html.twig" + priority: 100 country: template: "@SyliusShop/shared/address/country.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/error.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/error.yaml index b973d44c54..929ed09b98 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/error.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/error.yaml @@ -3,9 +3,12 @@ sylius_twig_hooks: 'sylius_shop.shared.error': layout: template: '@SyliusShop/shared/error/layout.html.twig' + priority: 0 'sylius_shop.shared.error.layout': logo: template: '@SyliusShop/shared/error/layout/logo.html.twig' + priority: 100 message: template: '@SyliusShop/shared/error/layout/message.html.twig' + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/address.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/address.yaml index ab81d21c5f..df9dd185c8 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/address.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/address.yaml @@ -3,23 +3,33 @@ sylius_twig_hooks: 'sylius_shop.shared.form.address': name: template: '@SyliusShop/shared/form/address/name.html.twig' + priority: 700 company: template: '@SyliusShop/shared/form/address/company.html.twig' + priority: 600 street: template: '@SyliusShop/shared/form/address/street.html.twig' + priority: 500 country: template: '@SyliusShop/shared/form/address/country.html.twig' + priority: 400 province: template: '@SyliusShop/shared/form/address/province.html.twig' + priority: 300 city: template: '@SyliusShop/shared/form/address/city.html.twig' + priority: 200 postcode: template: '@SyliusShop/shared/form/address/postcode.html.twig' + priority: 100 phone_number: template: '@SyliusShop/shared/form/address/phone_number.html.twig' + priority: 0 'sylius_shop.shared.form.address.name': first_name: template: '@SyliusShop/shared/form/address/name/first_name.html.twig' + priority: 100 last_name: template: '@SyliusShop/shared/form/address/name/last_name.html.twig' + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/select_payment.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/select_payment.yaml index 8e1ee605d7..53c038a53a 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/select_payment.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/form/select_payment.yaml @@ -3,27 +3,35 @@ sylius_twig_hooks: 'sylius_shop.shared.form.select_payment': payment: template: '@SyliusShop/shared/form/select_payment/payment.html.twig' + priority: 0 'sylius_shop.shared.form.select_payment.payment': header: template: '@SyliusShop/shared/form/select_payment/payment/header.html.twig' + priority: 100 choice: template: '@SyliusShop/shared/form/select_payment/payment/choice.html.twig' + priority: 0 'sylius_shop.shared.form.select_payment.payment#unavailable': unavailable: template: '@SyliusShop/shared/form/select_payment/unavailable.html.twig' + priority: 0 'sylius_shop.shared.form.select_payment.payment.choice': details: template: '@SyliusShop/shared/form/select_payment/payment/choice/details.html.twig' + priority: 0 'sylius_shop.shared.form.select_payment.payment.choice#unavailable': unavailable: template: '@SyliusShop/shared/form/select_payment/unavailable.html.twig' + priority: 0 'sylius_shop.shared.form.select_payment.payment.choice.details': name: template: '@SyliusShop/shared/form/select_payment/payment/choice/details/name.html.twig' + priority: 100 description: template: '@SyliusShop/shared/form/select_payment/payment/choice/details/description.html.twig' + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/grid.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/grid.yaml index 92d8d09c8e..bca67aa5d7 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/grid.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/grid.yaml @@ -3,7 +3,10 @@ sylius_twig_hooks: 'sylius_shop.shared.grid': filters: template: '@SyliusShop/shared/grid/filters.html.twig' + priority: 200 data_table: template: '@SyliusShop/shared/grid/data_table.html.twig' + priority: 100 no_results: template: '@SyliusShop/shared/grid/no_results.html.twig' + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/order/summary.yaml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/order/summary.yaml index 7da3ad9db3..54296a700c 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/order/summary.yaml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/twig_hooks/shared/order/summary.yaml @@ -3,169 +3,225 @@ sylius_twig_hooks: 'sylius_shop.shared.order.show.summary': addresses: template: "@SyliusShop/shared/order/show/summary/addresses.html.twig" + priority: 300 statuses: template: "@SyliusShop/shared/order/show/summary/statuses.html.twig" + priority: 200 table: template: "@SyliusShop/shared/order/show/summary/table.html.twig" + priority: 100 table_summary: - template: "@SyliusShop/shared/order/show/summary/table_summary.html.twig" + template: "@SyliusShop/shared/order/show/summary/table_summary.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.addresses': billing: template: "@SyliusShop/shared/order/show/summary/addresses/billing.html.twig" + priority: 100 shipping: template: "@SyliusShop/shared/order/show/summary/addresses/shipping.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.addresses.billing': header: template: "@SyliusShop/shared/order/show/summary/addresses/billing/header.html.twig" + priority: 100 body: template: "@SyliusShop/shared/order/show/summary/addresses/billing/body.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.addresses.billing.body': address: template: "@SyliusShop/shared/address.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.addresses.shipping': header: template: "@SyliusShop/shared/order/show/summary/addresses/shipping/header.html.twig" + priority: 100 body: template: "@SyliusShop/shared/order/show/summary/addresses/shipping/body.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.addresses.shipping.body': address: template: "@SyliusShop/shared/address.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table': header: template: "@SyliusShop/shared/order/show/summary/table/header.html.twig" + priority: 200 body: template: "@SyliusShop/shared/order/show/summary/table/body.html.twig" + priority: 100 footer: template: "@SyliusShop/shared/order/show/summary/table/footer.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table.header': item: template: "@SyliusShop/shared/order/show/summary/table/header/item.html.twig" configuration: label: 'item' + priority: 300 unit_price: template: "@SyliusShop/shared/order/show/summary/table/header/item.html.twig" configuration: test_id: 'price' label: 'unit_price' class: 'text-end' + priority: 200 quantity: template: "@SyliusShop/shared/order/show/summary/table/header/item.html.twig" configuration: label: 'qty' class: 'text-end' + priority: 100 subtotal: template: "@SyliusShop/shared/order/show/summary/table/header/item.html.twig" configuration: label: 'subtotal' class: 'text-end' + priority: 0 'sylius_shop.shared.order.show.summary.table.body': item: template: "@SyliusShop/shared/order/show/summary/table/body/item.html.twig" + priority: 300 unit_price: template: "@SyliusShop/shared/order/show/summary/table/body/unit_price.html.twig" + priority: 200 quantity: template: "@SyliusShop/shared/order/show/summary/table/body/quantity.html.twig" + priority: 100 subtotal: template: "@SyliusShop/shared/order/show/summary/table/body/subtotal.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary': subtotal: template: "@SyliusShop/shared/order/show/summary/table_summary/subtotal.html.twig" + priority: 500 taxes: template: "@SyliusShop/shared/order/show/summary/table_summary/taxes.html.twig" + priority: 400 discount: template: "@SyliusShop/shared/order/show/summary/table_summary/discount.html.twig" + priority: 300 shipping: template: "@SyliusShop/shared/order/show/summary/table_summary/shipping.html.twig" + priority: 200 total: template: "@SyliusShop/shared/order/show/summary/table_summary/total.html.twig" + priority: 100 total_in_base_currency: template: "@SyliusShop/shared/order/show/summary/table_summary/total_in_base_currency.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.subtotal': label: template: "@SyliusShop/shared/order/show/summary/table_summary/subtotal/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/subtotal/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.taxes': label: template: "@SyliusShop/shared/order/show/summary/table_summary/taxes/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/taxes/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.discount': label: template: "@SyliusShop/shared/order/show/summary/table_summary/discount/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/discount/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.shipping': label: template: "@SyliusShop/shared/order/show/summary/table_summary/shipping/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/shipping/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.total': label: template: "@SyliusShop/shared/order/show/summary/table_summary/total/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/total/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.table_summary.total_in_base_currency': label: template: "@SyliusShop/shared/order/show/summary/table_summary/total_in_base_currency/label.html.twig" + priority: 100 value: template: "@SyliusShop/shared/order/show/summary/table_summary/total_in_base_currency/value.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses': payments: template: "@SyliusShop/shared/order/show/summary/statuses/payments.html.twig" + priority: 100 shipments: template: "@SyliusShop/shared/order/show/summary/statuses/shipments.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.payments': header: template: "@SyliusShop/shared/order/show/summary/statuses/payments/header.html.twig" + priority: 100 list: template: "@SyliusShop/shared/order/show/summary/statuses/payments/list.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.payments.header': title: template: "@SyliusShop/shared/order/show/summary/statuses/payments/header/title.html.twig" + priority: 100 state: template: "@SyliusShop/shared/order/show/summary/statuses/payments/header/state.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.payments.list': method: template: "@SyliusShop/shared/order/show/summary/statuses/payments/list/method.html.twig" + priority: 200 price: template: "@SyliusShop/shared/order/show/summary/statuses/payments/list/price.html.twig" + priority: 100 state_label: template: "@SyliusShop/shared/order/show/summary/statuses/payments/list/state_label.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.shipments': header: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/header.html.twig" + priority: 100 list: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/list.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.shipments.header': title: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/header/title.html.twig" + priority: 100 state: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/header/state.html.twig" + priority: 0 'sylius_shop.shared.order.show.summary.statuses.shipments.list': method: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/list/method.html.twig" + priority: 100 state_label: template: "@SyliusShop/shared/order/show/summary/statuses/shipments/list/state_label.html.twig" + priority: 0 diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml index 7c907760ae..cfc43a9034 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/listeners.xml @@ -58,7 +58,7 @@ - + %sylius_shop.firewall_context_name% diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/order_pay/offline/providers.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/order_pay/offline/providers.xml index fd2cb296d1..22a173d4ac 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/order_pay/offline/providers.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/order_pay/offline/providers.xml @@ -19,7 +19,7 @@ - + diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/twig.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/twig.xml index 6bf5c5a029..0009a273fa 100644 --- a/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/twig.xml +++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services/twig/twig.xml @@ -28,7 +28,7 @@ - + diff --git a/src/Sylius/Bundle/ShopBundle/spec/EventListener/UserRegistrationListenerSpec.php b/src/Sylius/Bundle/ShopBundle/spec/EventListener/UserRegistrationListenerSpec.php index f23786dcd5..1931c31ce4 100644 --- a/src/Sylius/Bundle/ShopBundle/spec/EventListener/UserRegistrationListenerSpec.php +++ b/src/Sylius/Bundle/ShopBundle/spec/EventListener/UserRegistrationListenerSpec.php @@ -16,13 +16,13 @@ namespace spec\Sylius\Bundle\ShopBundle\EventListener; use Doctrine\Persistence\ObjectManager; use PhpSpec\ObjectBehavior; use Prophecy\Argument; -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; @@ -33,14 +33,14 @@ final class UserRegistrationListenerSpec extends ObjectBehavior GeneratorInterface $tokenGenerator, EventDispatcherInterface $eventDispatcher, ChannelContextInterface $channelContext, - UserLoginInterface $userLogin, + Security $security, ): void { $this->beConstructedWith( $userManager, $tokenGenerator, $eventDispatcher, $channelContext, - $userLogin, + $security, 'shop', ); } @@ -80,7 +80,7 @@ final class UserRegistrationListenerSpec extends ObjectBehavior GeneratorInterface $tokenGenerator, EventDispatcherInterface $eventDispatcher, ChannelContextInterface $channelContext, - UserLoginInterface $userLogin, + Security $security, GenericEvent $event, CustomerInterface $customer, ShopUserInterface $user, @@ -97,7 +97,7 @@ final class UserRegistrationListenerSpec extends ObjectBehavior $userManager->persist($user)->shouldBeCalled(); $userManager->flush()->shouldBeCalled(); - $userLogin->login($user, 'shop')->shouldBeCalled(); + $security->login($user, 'form_login', 'shop')->shouldBeCalled(); $tokenGenerator->generate()->shouldNotBeCalled(); $user->setEmailVerificationToken(Argument::any())->shouldNotBeCalled(); @@ -115,7 +115,7 @@ final class UserRegistrationListenerSpec extends ObjectBehavior GeneratorInterface $tokenGenerator, EventDispatcherInterface $eventDispatcher, ChannelContextInterface $channelContext, - UserLoginInterface $userLogin, + Security $security, GenericEvent $event, CustomerInterface $customer, ShopUserInterface $user, @@ -132,7 +132,7 @@ final class UserRegistrationListenerSpec extends ObjectBehavior $userManager->persist($user)->shouldBeCalled(); $userManager->flush()->shouldBeCalled(); - $userLogin->login($user, 'shop')->shouldBeCalled(); + $security->login($user, 'form_login', 'shop')->shouldBeCalled(); $tokenGenerator->generate()->shouldNotBeCalled(); $user->setEmailVerificationToken(Argument::any())->shouldNotBeCalled(); diff --git a/src/Sylius/Bundle/TaxationBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/TaxationBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Bundle/TaxationBundle/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. diff --git a/src/Sylius/Bundle/TaxonomyBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/TaxonomyBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Bundle/TaxonomyBundle/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. diff --git a/src/Sylius/Bundle/UiBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/UiBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Bundle/UiBundle/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. diff --git a/src/Sylius/Bundle/UserBundle/Controller/UserController.php b/src/Sylius/Bundle/UserBundle/Controller/UserController.php index 55269bdb82..4622875062 100644 --- a/src/Sylius/Bundle/UserBundle/Controller/UserController.php +++ b/src/Sylius/Bundle/UserBundle/Controller/UserController.php @@ -72,14 +72,6 @@ class UserController extends ResourceController return $this->prepareResetPasswordRequest($request, $generator, UserEvents::REQUEST_RESET_PASSWORD_TOKEN); } - public function requestPasswordResetPinAction(Request $request): Response - { - /** @var GeneratorInterface $generator */ - $generator = $this->container->get(sprintf('sylius.%s.pin_generator.password_reset', $this->metadata->getName())); - - return $this->prepareResetPasswordRequest($request, $generator, UserEvents::REQUEST_RESET_PASSWORD_PIN); - } - public function resetPasswordAction(Request $request, string $token): Response { $configuration = $this->requestConfigurationFactory->create($this->metadata, $request); diff --git a/src/Sylius/Bundle/UserBundle/DependencyInjection/Compiler/DecorateUserCheckerPass.php b/src/Sylius/Bundle/UserBundle/DependencyInjection/Compiler/DecorateUserCheckerPass.php deleted file mode 100644 index 84028dea3a..0000000000 --- a/src/Sylius/Bundle/UserBundle/DependencyInjection/Compiler/DecorateUserCheckerPass.php +++ /dev/null @@ -1,36 +0,0 @@ -has('security.user_checker')) { - return; - } - - $definition = new Definition(UserChecker::class); - $definition->setDecoratedService('security.user_checker'); - $definition->addArgument(new Reference(UserChecker::class . '.inner')); - - $container->setDefinition(UserChecker::class, $definition); - } -} diff --git a/src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php index 67ab14517b..62e481befc 100644 --- a/src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php +++ b/src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php @@ -99,27 +99,6 @@ final class Configuration implements ConfigurationInterface ->end() ->end() ->end() - ->arrayNode('pin') - ->addDefaultsIfNotSet() - ->children() - ->integerNode('length') - ->defaultValue(4) - ->min(1)->max(9) - ->end() - ->scalarNode('field_name') - ->defaultValue('passwordResetToken') - ->validate() - ->ifTrue( - /** @param mixed $passwordResetToken */ - function ($passwordResetToken) { - return !is_string($passwordResetToken); - }, - ) - ->thenInvalid('Invalid resetting pin field "%s"') - ->end() - ->end() - ->end() - ->end() ->end() ->end() ->arrayNode('verification') diff --git a/src/Sylius/Bundle/UserBundle/DependencyInjection/SyliusUserExtension.php b/src/Sylius/Bundle/UserBundle/DependencyInjection/SyliusUserExtension.php index 4301a2b00b..e6b2c99252 100644 --- a/src/Sylius/Bundle/UserBundle/DependencyInjection/SyliusUserExtension.php +++ b/src/Sylius/Bundle/UserBundle/DependencyInjection/SyliusUserExtension.php @@ -23,7 +23,6 @@ use Sylius\Bundle\UserBundle\Provider\UsernameOrEmailProvider; use Sylius\Bundle\UserBundle\Provider\UsernameProvider; use Sylius\Bundle\UserBundle\Reloader\UserReloader; use Sylius\Component\User\Security\Checker\TokenUniquenessChecker; -use Sylius\Component\User\Security\Generator\UniquePinGenerator; use Sylius\Component\User\Security\Generator\UniqueTokenGenerator; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ChildDefinition; @@ -101,29 +100,20 @@ final class SyliusUserExtension extends AbstractResourceExtension ), )->setPublic(true); - $container->setDefinition( - sprintf('sylius.%s_user.pin_generator.password_reset', $userType), - $this->createTokenGeneratorDefinition( - UniquePinGenerator::class, - [ - new Reference('sylius.random_generator'), - new Reference(sprintf('sylius.%s_user.pin_uniqueness_checker.password_reset', $userType)), - $config['resetting']['pin']['length'], - ], - ), - )->setPublic(true); - - $container->setDefinition( - sprintf('sylius.%s_user.token_generator.email_verification', $userType), - $this->createTokenGeneratorDefinition( - UniqueTokenGenerator::class, - [ - new Reference('sylius.random_generator'), - new Reference(sprintf('sylius.%s_user.token_uniqueness_checker.email_verification', $userType)), - $config['verification']['token']['length'], - ], - ), - )->setPublic(true); + $container + ->setDefinition( + sprintf('sylius.%s_user.token_generator.email_verification', $userType), + $this->createTokenGeneratorDefinition( + UniqueTokenGenerator::class, + [ + new Reference('sylius.random_generator'), + new Reference(sprintf('sylius.%s_user.token_uniqueness_checker.email_verification', $userType)), + $config['verification']['token']['length'], + ], + ), + ) + ->setPublic(true) + ; } private function createTokenGeneratorDefinition(string $generatorClass, array $arguments): Definition @@ -146,14 +136,6 @@ final class SyliusUserExtension extends AbstractResourceExtension $resetPasswordTokenUniquenessCheckerDefinition, ); - $resetPasswordPinUniquenessCheckerDefinition = new Definition(TokenUniquenessChecker::class); - $resetPasswordPinUniquenessCheckerDefinition->addArgument(new Reference($repositoryServiceId)); - $resetPasswordPinUniquenessCheckerDefinition->addArgument($config['resetting']['pin']['field_name']); - $container->setDefinition( - sprintf('sylius.%s_user.pin_uniqueness_checker.password_reset', $userType), - $resetPasswordPinUniquenessCheckerDefinition, - ); - $emailVerificationTokenUniquenessCheckerDefinition = new Definition(TokenUniquenessChecker::class); $emailVerificationTokenUniquenessCheckerDefinition->addArgument(new Reference($repositoryServiceId)); $emailVerificationTokenUniquenessCheckerDefinition->addArgument($config['verification']['token']['field_name']); @@ -236,7 +218,7 @@ final class SyliusUserExtension extends AbstractResourceExtension $container->setDefinition($providerEmailOrNameBasedServiceId, $emailOrNameBasedProviderDefinition); } - private function createResettingTokenParameters(string $userType, array $config, ContainerBuilder $container) + private function createResettingTokenParameters(string $userType, array $config, ContainerBuilder $container): void { $container->setParameter(sprintf('sylius.%s_user.token.password_reset.ttl', $userType), $config['resetting']['token']['ttl']); } diff --git a/src/Sylius/Bundle/UserBundle/EventListener/MailerListener.php b/src/Sylius/Bundle/UserBundle/EventListener/MailerListener.php index b7278f8057..172dbe04ae 100644 --- a/src/Sylius/Bundle/UserBundle/EventListener/MailerListener.php +++ b/src/Sylius/Bundle/UserBundle/EventListener/MailerListener.php @@ -30,11 +30,6 @@ class MailerListener $this->sendEmail($event->getSubject(), Emails::RESET_PASSWORD_TOKEN); } - public function sendResetPasswordPinEmail(GenericEvent $event): void - { - $this->sendEmail($event->getSubject(), Emails::RESET_PASSWORD_PIN); - } - public function sendVerificationTokenEmail(GenericEvent $event): void { $this->sendEmail($event->getSubject(), Emails::EMAIL_VERIFICATION_TOKEN); diff --git a/src/Sylius/Bundle/UserBundle/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Bundle/UserBundle/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Bundle/UserBundle/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. diff --git a/src/Sylius/Bundle/UserBundle/Mailer/Emails.php b/src/Sylius/Bundle/UserBundle/Mailer/Emails.php index 6ce2cb998c..2b08db0227 100644 --- a/src/Sylius/Bundle/UserBundle/Mailer/Emails.php +++ b/src/Sylius/Bundle/UserBundle/Mailer/Emails.php @@ -17,7 +17,5 @@ final class Emails { public const RESET_PASSWORD_TOKEN = 'reset_password_token'; - public const RESET_PASSWORD_PIN = 'reset_password_pin'; - public const EMAIL_VERIFICATION_TOKEN = 'verification_token'; } diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/doctrine/model/User.orm.xml b/src/Sylius/Bundle/UserBundle/Resources/config/doctrine/model/User.orm.xml index 6b6b46e5c2..ee167597b0 100644 --- a/src/Sylius/Bundle/UserBundle/Resources/config/doctrine/model/User.orm.xml +++ b/src/Sylius/Bundle/UserBundle/Resources/config/doctrine/model/User.orm.xml @@ -28,9 +28,6 @@ - - - diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/services.xml b/src/Sylius/Bundle/UserBundle/Resources/config/services.xml index 056ea8f441..6bee41a5f4 100644 --- a/src/Sylius/Bundle/UserBundle/Resources/config/services.xml +++ b/src/Sylius/Bundle/UserBundle/Resources/config/services.xml @@ -58,24 +58,12 @@ - - - - - - + - - - - - - - @@ -87,7 +75,6 @@ - @@ -114,5 +101,12 @@ %sylius.form.type.user_change_password.validation_groups% + + + + + + + diff --git a/src/Sylius/Bundle/UserBundle/Security/UserLogin.php b/src/Sylius/Bundle/UserBundle/Security/UserLogin.php deleted file mode 100644 index 512a30b9a3..0000000000 --- a/src/Sylius/Bundle/UserBundle/Security/UserLogin.php +++ /dev/null @@ -1,63 +0,0 @@ -userChecker->checkPreAuth($user); - $this->userChecker->checkPostAuth($user); - - $token = $this->createToken($user, $firewallName); - if (null === $token->getUser() || [] === $token->getUser()->getRoles()) { - throw new AuthenticationException('Unauthenticated token'); - } - - $this->tokenStorage->setToken($token); - $this->eventDispatcher->dispatch(new UserEvent($user), UserEvents::SECURITY_IMPLICIT_LOGIN); - } - - protected function createToken(UserInterface $user, string $firewallName): UsernamePasswordToken - { - Assert::isInstanceOf($user, SymfonyUserInterface::class); - - return new UsernamePasswordToken( - $user, - $firewallName, - array_map(static fn (object|string $role): string => $role, $user->getRoles()), - ); - } -} diff --git a/src/Sylius/Bundle/UserBundle/Security/UserLoginInterface.php b/src/Sylius/Bundle/UserBundle/Security/UserLoginInterface.php deleted file mode 100644 index d8ae130296..0000000000 --- a/src/Sylius/Bundle/UserBundle/Security/UserLoginInterface.php +++ /dev/null @@ -1,21 +0,0 @@ -passwordHasherFactory->getPasswordHasher($user::class); - - return $passwordHasher->hash($user->getPlainPassword()); - } -} diff --git a/src/Sylius/Bundle/UserBundle/SyliusUserBundle.php b/src/Sylius/Bundle/UserBundle/SyliusUserBundle.php index 8c222f88f2..a86f5215dc 100644 --- a/src/Sylius/Bundle/UserBundle/SyliusUserBundle.php +++ b/src/Sylius/Bundle/UserBundle/SyliusUserBundle.php @@ -15,8 +15,6 @@ namespace Sylius\Bundle\UserBundle; use Sylius\Bundle\ResourceBundle\AbstractResourceBundle; use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; -use Sylius\Bundle\UserBundle\DependencyInjection\Compiler\DecorateUserCheckerPass; -use Symfony\Component\DependencyInjection\ContainerBuilder; final class SyliusUserBundle extends AbstractResourceBundle { @@ -28,13 +26,6 @@ final class SyliusUserBundle extends AbstractResourceBundle ]; } - public function build(ContainerBuilder $container): void - { - parent::build($container); - - $container->addCompilerPass(new DecorateUserCheckerPass()); - } - protected function getModelNamespace(): string { return 'Sylius\Component\User\Model'; diff --git a/src/Sylius/Bundle/UserBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Sylius/Bundle/UserBundle/Tests/DependencyInjection/ConfigurationTest.php index 6c783368cb..9262da1395 100644 --- a/src/Sylius/Bundle/UserBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Sylius/Bundle/UserBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -36,10 +36,6 @@ final class ConfigurationTest extends TestCase 'length' => 64, 'field_name' => 'passwordResetToken', ], - 'pin' => [ - 'length' => 4, - 'field_name' => 'passwordResetToken', - ], ], ], ], diff --git a/src/Sylius/Bundle/UserBundle/UserEvents.php b/src/Sylius/Bundle/UserBundle/UserEvents.php index 34e6c54ca3..ef9e6603d1 100644 --- a/src/Sylius/Bundle/UserBundle/UserEvents.php +++ b/src/Sylius/Bundle/UserBundle/UserEvents.php @@ -17,8 +17,6 @@ interface UserEvents { public const REQUEST_RESET_PASSWORD_TOKEN = 'sylius.user.password_reset.request.token'; - public const REQUEST_RESET_PASSWORD_PIN = 'sylius.user.password_reset.request.pin'; - public const REQUEST_VERIFICATION_TOKEN = 'sylius.user.email_verification.token'; public const PRE_EMAIL_VERIFICATION = 'sylius.user.pre_email_verification'; diff --git a/src/Sylius/Bundle/UserBundle/spec/Security/UserLoginSpec.php b/src/Sylius/Bundle/UserBundle/spec/Security/UserLoginSpec.php deleted file mode 100644 index 2aa125e651..0000000000 --- a/src/Sylius/Bundle/UserBundle/spec/Security/UserLoginSpec.php +++ /dev/null @@ -1,104 +0,0 @@ -beConstructedWith($tokenStorage, $userChecker, $eventDispatcher); - } - - function it_implements_user_login_interface(): void - { - $this->shouldImplement(UserLoginInterface::class); - } - - function it_throws_exception_and_does_not_log_user_in_when_user_is_disabled( - TokenStorageInterface $tokenStorage, - UserCheckerInterface $userChecker, - EventDispatcherInterface $eventDispatcher, - UserInterface $user, - ): void { - $user->getRoles()->willReturn(['ROLE_TEST']); - $userChecker->checkPreAuth($user)->willThrow(DisabledException::class); - - $tokenStorage->setToken(Argument::type(UsernamePasswordToken::class))->shouldNotBeCalled(); - $eventDispatcher->dispatch(Argument::type(UserEvent::class), UserEvents::SECURITY_IMPLICIT_LOGIN)->shouldNotBeCalled(); - - $this->shouldThrow(DisabledException::class)->during('login', [$user]); - } - - function it_throws_exception_and_does_not_log_user_in_when_user_account_status_is_invalid( - TokenStorageInterface $tokenStorage, - UserCheckerInterface $userChecker, - EventDispatcherInterface $eventDispatcher, - UserInterface $user, - ): void { - $user->getRoles()->willReturn(['ROLE_TEST']); - $userChecker->checkPreAuth($user)->shouldBeCalled(); - $userChecker->checkPostAuth($user)->willThrow(CredentialsExpiredException::class); - - $tokenStorage->setToken(Argument::type(UsernamePasswordToken::class))->shouldNotBeCalled(); - $eventDispatcher->dispatch(Argument::type(UserEvent::class), UserEvents::SECURITY_IMPLICIT_LOGIN)->shouldNotBeCalled(); - - $this->shouldThrow(CredentialsExpiredException::class)->during('login', [$user]); - } - - function it_throws_exception_and_does_not_log_user_in_when_user_has_no_roles( - TokenStorageInterface $tokenStorage, - UserCheckerInterface $userChecker, - EventDispatcherInterface $eventDispatcher, - UserInterface $user, - ): void { - $user->getRoles()->willReturn([]); - $userChecker->checkPreAuth($user)->shouldBeCalled(); - $userChecker->checkPostAuth($user)->shouldBeCalled(); - - $tokenStorage->setToken(Argument::type(UsernamePasswordToken::class))->shouldNotBeCalled(); - $eventDispatcher->dispatch(Argument::type(UserEvent::class), UserEvents::SECURITY_IMPLICIT_LOGIN)->shouldNotBeCalled(); - - $this->shouldThrow(AuthenticationException::class)->during('login', [$user]); - } - - function it_logs_user_in( - TokenStorageInterface $tokenStorage, - UserCheckerInterface $userChecker, - EventDispatcherInterface $eventDispatcher, - UserInterface $user, - ): void { - $user->getRoles()->willReturn(['ROLE_TEST']); - - $userChecker->checkPreAuth($user)->shouldBeCalled(); - $userChecker->checkPostAuth($user)->shouldBeCalled(); - $tokenStorage->setToken(Argument::type(UsernamePasswordToken::class))->shouldBeCalled(); - $eventDispatcher->dispatch(Argument::type(UserEvent::class), UserEvents::SECURITY_IMPLICIT_LOGIN)->shouldBeCalled(); - - $this->login($user); - } -} diff --git a/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordHasherSpec.php b/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordHasherSpec.php deleted file mode 100644 index 9a5c3bdbf7..0000000000 --- a/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordHasherSpec.php +++ /dev/null @@ -1,45 +0,0 @@ -beConstructedWith($passwordHasherFactory); - } - - function it_implements_user_password_hasher_interface(): void - { - $this->shouldImplement(UserPasswordHasherInterface::class); - } - - function it_hashes_password( - PasswordHasherFactoryInterface $passwordHasherFactory, - PasswordHasherInterface $passwordHasher, - CredentialsHolderInterface $user, - ): void { - $user->getPlainPassword()->willReturn('topSecretPlainPassword'); - $passwordHasherFactory->getPasswordHasher($user->getWrappedObject()::class)->willReturn($passwordHasher); - $passwordHasher->hash('topSecretPlainPassword')->willReturn('topSecretHashedPassword'); - - $this->hash($user)->shouldReturn('topSecretHashedPassword'); - } -} diff --git a/src/Sylius/Component/Addressing/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Addressing/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Addressing/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. diff --git a/src/Sylius/Component/Attribute/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Attribute/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Attribute/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. diff --git a/src/Sylius/Component/Channel/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Channel/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Channel/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. diff --git a/src/Sylius/Component/Core/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Core/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Core/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. diff --git a/src/Sylius/Component/Currency/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Currency/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Currency/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. diff --git a/src/Sylius/Component/Customer/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Customer/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Customer/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. diff --git a/src/Sylius/Component/Inventory/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Inventory/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Inventory/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. diff --git a/src/Sylius/Component/Locale/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Locale/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Locale/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. diff --git a/src/Sylius/Component/Order/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Order/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Order/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. diff --git a/src/Sylius/Component/Payment/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Payment/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Payment/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. diff --git a/src/Sylius/Component/Product/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Product/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Product/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. diff --git a/src/Sylius/Component/Promotion/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Promotion/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Promotion/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. diff --git a/src/Sylius/Component/Review/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Review/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Review/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. diff --git a/src/Sylius/Component/Shipping/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Shipping/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Shipping/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. diff --git a/src/Sylius/Component/Taxation/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Taxation/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Taxation/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. diff --git a/src/Sylius/Component/Taxonomy/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/Taxonomy/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/Taxonomy/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. diff --git a/src/Sylius/Component/User/LICENSE_OF_TRADEMARK_AND_LOGO b/src/Sylius/Component/User/LICENSE_OF_TRADEMARK_AND_LOGO new file mode 100644 index 0000000000..e8a331f66f --- /dev/null +++ b/src/Sylius/Component/User/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. diff --git a/src/Sylius/Component/User/Model/AdvancedUserInterface.php b/src/Sylius/Component/User/Model/AdvancedUserInterface.php deleted file mode 100644 index e08a6cb9aa..0000000000 --- a/src/Sylius/Component/User/Model/AdvancedUserInterface.php +++ /dev/null @@ -1,76 +0,0 @@ -password = $encodedPassword; } - public function getExpiresAt(): ?\DateTimeInterface - { - return $this->expiresAt; - } - - public function setExpiresAt(?\DateTimeInterface $date): void - { - $this->expiresAt = $date; - } - - public function getCredentialsExpireAt(): ?\DateTimeInterface - { - return $this->credentialsExpireAt; - } - - public function setCredentialsExpireAt(?\DateTimeInterface $date): void - { - $this->credentialsExpireAt = $date; - } - public function getLastLogin(): ?\DateTimeInterface { return $this->lastLogin; @@ -233,26 +204,6 @@ class User implements UserInterface, \Stringable $this->passwordResetToken = $passwordResetToken; } - public function isCredentialsNonExpired(): bool - { - return !$this->hasExpired($this->credentialsExpireAt); - } - - public function isAccountNonExpired(): bool - { - return !$this->hasExpired($this->expiresAt); - } - - public function setLocked(bool $locked): void - { - $this->locked = $locked; - } - - public function isAccountNonLocked(): bool - { - return !$this->locked; - } - public function hasRole(string $role): bool { return in_array(strtoupper($role), $this->getRoles(), true); @@ -363,7 +314,6 @@ class User implements UserInterface, \Stringable $this->password, $this->usernameCanonical, $this->username, - $this->locked, $this->enabled, $this->id, ]; @@ -382,14 +332,8 @@ class User implements UserInterface, \Stringable $this->password, $this->usernameCanonical, $this->username, - $this->locked, $this->enabled, $this->id, ] = $data; } - - protected function hasExpired(?\DateTimeInterface $date): bool - { - return null !== $date && new \DateTime() >= $date; - } } diff --git a/src/Sylius/Component/User/Model/UserInterface.php b/src/Sylius/Component/User/Model/UserInterface.php index 32268b57e0..0c1fb0396e 100644 --- a/src/Sylius/Component/User/Model/UserInterface.php +++ b/src/Sylius/Component/User/Model/UserInterface.php @@ -17,13 +17,14 @@ use Doctrine\Common\Collections\Collection; use Sylius\Resource\Model\ResourceInterface; use Sylius\Resource\Model\TimestampableInterface; use Sylius\Resource\Model\ToggleableInterface; +use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface; interface UserInterface extends - AdvancedUserInterface, CredentialsHolderInterface, ResourceInterface, TimestampableInterface, - ToggleableInterface + ToggleableInterface, + SymfonyUserInterface { public const DEFAULT_ROLE = 'ROLE_USER'; @@ -49,8 +50,6 @@ interface UserInterface extends public function setUsernameCanonical(?string $usernameCanonical): void; - public function setLocked(bool $locked): void; - public function getEmailVerificationToken(): ?string; public function setEmailVerificationToken(?string $verificationToken): void; @@ -71,14 +70,6 @@ interface UserInterface extends public function setVerifiedAt(?\DateTimeInterface $verifiedAt): void; - public function getExpiresAt(): ?\DateTimeInterface; - - public function setExpiresAt(?\DateTimeInterface $date): void; - - public function getCredentialsExpireAt(): ?\DateTimeInterface; - - public function setCredentialsExpireAt(?\DateTimeInterface $date): void; - public function getLastLogin(): ?\DateTimeInterface; public function setLastLogin(?\DateTimeInterface $time): void; diff --git a/src/Sylius/Component/User/Security/Checker/EnabledUserChecker.php b/src/Sylius/Component/User/Security/Checker/EnabledUserChecker.php new file mode 100644 index 0000000000..29db0df32b --- /dev/null +++ b/src/Sylius/Component/User/Security/Checker/EnabledUserChecker.php @@ -0,0 +1,40 @@ +isEnabled()) { + $exception = new DisabledException('User account is disabled.'); + $exception->setUser($user); + + throw $exception; + } + } + + public function checkPostAuth(SymfonyUserInterface $user): void + { + } +} diff --git a/src/Sylius/Component/User/Security/Checker/UserChecker.php b/src/Sylius/Component/User/Security/Checker/UserChecker.php deleted file mode 100644 index 55be55ed49..0000000000 --- a/src/Sylius/Component/User/Security/Checker/UserChecker.php +++ /dev/null @@ -1,72 +0,0 @@ -isAccountNonLocked()) { - $exception = new LockedException('User account is locked.'); - $exception->setUser($user); - - throw $exception; - } - - if (!$user->isEnabled()) { - $exception = new DisabledException('User account is disabled.'); - $exception->setUser($user); - - throw $exception; - } - - if (!$user->isAccountNonExpired()) { - $exception = new AccountExpiredException('User account has expired.'); - $exception->setUser($user); - - throw $exception; - } - } - - public function checkPostAuth(UserInterface $user): void - { - if (!$user instanceof AdvancedUserInterface) { - return; - } - - if (!$user->isCredentialsNonExpired()) { - $exception = new CredentialsExpiredException('User credentials have expired.'); - $exception->setUser($user); - - throw $exception; - } - } -} diff --git a/src/Sylius/Component/User/Security/Generator/UniquePinGenerator.php b/src/Sylius/Component/User/Security/Generator/UniquePinGenerator.php deleted file mode 100644 index e8216b3081..0000000000 --- a/src/Sylius/Component/User/Security/Generator/UniquePinGenerator.php +++ /dev/null @@ -1,44 +0,0 @@ -pinLength = $pinLength; - } - - public function generate(): string - { - do { - $pin = $this->generator->generateNumeric($this->pinLength); - } while (!$this->uniquenessChecker->isUnique($pin)); - - return $pin; - } -} diff --git a/src/Sylius/Component/User/Security/PasswordUpdater.php b/src/Sylius/Component/User/Security/PasswordUpdater.php index 2470a85ad4..948dadcacf 100644 --- a/src/Sylius/Component/User/Security/PasswordUpdater.php +++ b/src/Sylius/Component/User/Security/PasswordUpdater.php @@ -14,8 +14,9 @@ declare(strict_types=1); namespace Sylius\Component\User\Security; use Sylius\Component\User\Model\CredentialsHolderInterface; +use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; -final class PasswordUpdater implements PasswordUpdaterInterface +final readonly class PasswordUpdater implements PasswordUpdaterInterface { public function __construct(private UserPasswordHasherInterface $userPasswordHasher) { @@ -27,7 +28,7 @@ final class PasswordUpdater implements PasswordUpdaterInterface return; } - $user->setPassword($this->userPasswordHasher->hash($user)); + $user->setPassword($this->userPasswordHasher->hashPassword($user, $user->getPlainPassword())); $user->eraseCredentials(); } } diff --git a/src/Sylius/Component/User/Security/UserPasswordHasherInterface.php b/src/Sylius/Component/User/Security/UserPasswordHasherInterface.php deleted file mode 100644 index 958b0e6421..0000000000 --- a/src/Sylius/Component/User/Security/UserPasswordHasherInterface.php +++ /dev/null @@ -1,21 +0,0 @@ -beConstructedWith($generator, $checker, 6); - } - - function it_implements_generator_interface(): void - { - $this->shouldImplement(GeneratorInterface::class); - } - - function it_throws_invalid_argument_exception_on_instantiation_with_an_out_of_range_length( - RandomnessGeneratorInterface $generator, - UniquenessCheckerInterface $checker, - ): void { - $this->beConstructedWith($generator, $checker, -1); - $this->shouldThrow(\InvalidArgumentException::class)->duringInstantiation(); - $this->beConstructedWith($generator, $checker, 0); - $this->shouldThrow(\InvalidArgumentException::class)->duringInstantiation(); - } - - function it_generates_pins_with_length_stated_on_instantiation( - RandomnessGeneratorInterface $generator, - UniquenessCheckerInterface $checker, - ): void { - $pin = '001100'; - - $generator->generateNumeric(6)->willReturn($pin); - $checker->isUnique($pin)->willReturn(true); - - $this->generate()->shouldHaveLength(6); - } - - function it_generates_string_pins(RandomnessGeneratorInterface $generator, UniquenessCheckerInterface $checker): void - { - $pin = '636363'; - - $generator->generateNumeric(6)->willReturn($pin); - $checker->isUnique($pin)->willReturn(true); - - $this->generate()->shouldBeString(); - } - - function it_generates_numeric_pins(RandomnessGeneratorInterface $generator, UniquenessCheckerInterface $checker): void - { - $pin = '424242'; - - $generator->generateNumeric(6)->willReturn($pin); - $checker->isUnique($pin)->willReturn(true); - - $this->generate()->shouldBeNumeric(); - } - - public function getMatchers(): array - { - return [ - 'haveLength' => function ($subject, $key) { - return $key === strlen($subject); - }, - ]; - } -} diff --git a/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php b/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php index eb728fef77..98f8ad3bf6 100644 --- a/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php +++ b/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php @@ -17,13 +17,17 @@ use PhpSpec\ObjectBehavior; use Prophecy\Argument; use Sylius\Component\User\Model\UserInterface; use Sylius\Component\User\Security\PasswordUpdaterInterface; -use Sylius\Component\User\Security\UserPasswordHasherInterface; +use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface; final class PasswordUpdaterSpec extends ObjectBehavior { - function it_implements_password_updater_interface(UserPasswordHasherInterface $userPasswordHasher): void + function let(UserPasswordHasherInterface $userPasswordHasher): void { $this->beConstructedWith($userPasswordHasher); + } + + function it_implements_password_updater_interface(): void + { $this->shouldImplement(PasswordUpdaterInterface::class); } @@ -31,10 +35,8 @@ final class PasswordUpdaterSpec extends ObjectBehavior UserPasswordHasherInterface $userPasswordHasher, UserInterface $user, ): void { - $this->beConstructedWith($userPasswordHasher); $user->getPlainPassword()->willReturn('topSecretPlainPassword'); - - $userPasswordHasher->hash($user)->willReturn('topSecretHashedPassword'); + $userPasswordHasher->hashPassword($user, 'topSecretPlainPassword')->willReturn('topSecretHashedPassword'); $user->eraseCredentials()->shouldBeCalled(); $user->setPassword('topSecretHashedPassword')->shouldBeCalled(); @@ -42,33 +44,23 @@ final class PasswordUpdaterSpec extends ObjectBehavior $this->updatePassword($user); } - function it_does_nothing_if_plain_password_is_empty( - UserPasswordHasherInterface $userPasswordHasher, - UserInterface $user, - ): void { - $this->beConstructedWith($userPasswordHasher); + function it_does_nothing_if_plain_password_is_empty(UserInterface $user): void + { $user->getPlainPassword()->willReturn(''); - $userPasswordHasher->hash($user)->shouldNotBeCalled(); + $this->updatePassword($user); $user->setPassword(Argument::any())->shouldNotBeCalled(); $user->eraseCredentials()->shouldNotBeCalled(); - - $this->updatePassword($user); } - function it_does_nothing_if_plain_password_is_null( - UserPasswordHasherInterface $userPasswordHasher, - UserInterface $user, - ): void { - $this->beConstructedWith($userPasswordHasher); + function it_does_nothing_if_plain_password_is_null(UserInterface $user): void + { $user->getPlainPassword()->willReturn(null); - $userPasswordHasher->hash($user)->shouldNotBeCalled(); + $this->updatePassword($user); $user->setPassword(Argument::any())->shouldNotBeCalled(); $user->eraseCredentials()->shouldNotBeCalled(); - - $this->updatePassword($user); } } diff --git a/src/Sylius/Component/User/tests/Security/Checker/EnabledUserCheckerTest.php b/src/Sylius/Component/User/tests/Security/Checker/EnabledUserCheckerTest.php new file mode 100644 index 0000000000..0293e376a6 --- /dev/null +++ b/src/Sylius/Component/User/tests/Security/Checker/EnabledUserCheckerTest.php @@ -0,0 +1,56 @@ +userChecker = new EnabledUserChecker(); + } + + /** @test */ + public function it_throws_a_disabled_exception_if_account_is_disabled(): void + { + $this->expectException(DisabledException::class); + + $user = $this->createMock(UserInterface::class); + $user->method('isEnabled')->willReturn(false); + + $this->userChecker->checkPreAuth($user); + $this->userChecker->checkPostAuth($user); + } + + /** @test */ + public function it_does_nothing_if_user_is_enabled(): void + { + /** @var UserInterface|ObjectProphecy $user */ + $user = $this->prophesize(UserInterface::class); + + $user->isEnabled()->shouldBeCalled()->willReturn(true); + + $this->userChecker->checkPreAuth($user->reveal()); + } +} diff --git a/src/Sylius/Component/User/tests/Security/Checker/UserCheckerTest.php b/src/Sylius/Component/User/tests/Security/Checker/UserCheckerTest.php deleted file mode 100644 index 7465c06382..0000000000 --- a/src/Sylius/Component/User/tests/Security/Checker/UserCheckerTest.php +++ /dev/null @@ -1,92 +0,0 @@ -userChecker = new UserChecker(); - } - - /** @test */ - public function it_throws_locked_exception_if_account_is_locked(): void - { - $this->expectException(LockedException::class); - - $user = $this->createMock(AdvancedUserInterface::class); - $user->method('isAccountNonLocked')->willReturn(false); - $user->method('isEnabled')->willReturn(true); - $user->method('isAccountNonExpired')->willReturn(true); - $user->method('isCredentialsNonExpired')->willReturn(true); - - $this->userChecker->checkPreAuth($user); - $this->userChecker->checkPostAuth($user); - } - - /** @test */ - public function it_throws_disabled_exception_if_account_is_disabled(): void - { - $this->expectException(DisabledException::class); - - $user = $this->createMock(AdvancedUserInterface::class); - $user->method('isAccountNonLocked')->willReturn(true); - $user->method('isEnabled')->willReturn(false); - $user->method('isAccountNonExpired')->willReturn(true); - $user->method('isCredentialsNonExpired')->willReturn(true); - - $this->userChecker->checkPreAuth($user); - $this->userChecker->checkPostAuth($user); - } - - /** @test */ - public function it_throws_account_expired_exception_if_account_is_expired(): void - { - $this->expectException(AccountExpiredException::class); - - $user = $this->createMock(AdvancedUserInterface::class); - $user->method('isAccountNonLocked')->willReturn(true); - $user->method('isEnabled')->willReturn(true); - $user->method('isAccountNonExpired')->willReturn(false); - $user->method('isCredentialsNonExpired')->willReturn(true); - - $this->userChecker->checkPreAuth($user); - $this->userChecker->checkPostAuth($user); - } - - /** @test */ - public function it_throws_credentials_expired_exception_if_credentials_are_expired(): void - { - $this->expectException(CredentialsExpiredException::class); - - $user = $this->createMock(AdvancedUserInterface::class); - $user->method('isAccountNonLocked')->willReturn(true); - $user->method('isEnabled')->willReturn(true); - $user->method('isAccountNonExpired')->willReturn(true); - $user->method('isCredentialsNonExpired')->willReturn(false); - - $this->userChecker->checkPreAuth($user); - $this->userChecker->checkPostAuth($user); - } -}