 }}){kind=logo}
- {% else %}
-  }}){kind=logo}
- {% endif %}
-
- {% autoescape false %}{{ 'sylius.ui.gateway.pay_pal_express_checkout_deprecation_notice'|trans }}{% endautoescape %}
-
-
-```
-
-while in the Twig template in 3.x branch it's:
-
-```html
-
{% endif %}
- {% if resource.gatewayConfig.factoryName == 'paypal_express_checkout' %}
-
- {% endif %}
{{ form_row(form.gatewayConfig.factoryName) }}
{% if form.gatewayConfig.config is defined %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig
index 5c911006a3..4a44de1f2b 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/Show/_mainImage.html.twig
@@ -3,11 +3,7 @@
{% elseif product.images.first %}
{% set path = product.images.first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %}
{% else %}
- {% if use_webpack %}
- {% set path = asset('build/admin/images/200x200.png', 'admin') %}
- {% else %}
- {% set path = asset('assets/admin/img/200x200.png') %}
- {% endif %}
+ {% set path = asset('build/admin/images/200x200.png', 'admin') %}
{% endif %}
-```
-
-The "stackable" class affects responsive display and "fluid" affects whether the pagination menu is full-width.
-
-### "polishsymfonycommunity/symfony-mocker-container" moved to dev-requirements
-
-This obvious dev dependency was part of Sylius requirements. In 1.11 we've moved it to proper place. However,
-it may lead to app break, as this container could be used in your Kernel, if you used Sylius-Standard as your template.
-In such a case, please update your `src/Kernel.php` class as follows:
-
-```diff
- protected function getContainerBaseClass(): string
- {
-- if ($this->isTestEnvironment()) {
-+ if ($this->isTestEnvironment() && class_exists(MockerContainer::class)) {
- return MockerContainer::class;
- }
-
- return parent::getContainerBaseClass();
- }
-```
-
-If you were using MockerContainer in your app, you should also execute the following command:
-
-```bash
-composer req --dev polishsymfonycommunity/symfony-mocker-container
-```
-
-### API Platform required folders
-
-If you don't already have, add an empty directory `api_platform` in your `config` directory and customize there any API resources.
-
-### Minimum price & Promotions
-
-We added MinimumPrice to channelPricings entity, this price should be taken into account when customizing any promotions in Sylius.
-All calculating and distributing services provided by default depends on MinimumPrice.
-
-### Calendar & Shipping
-
-Service `sylius.calendar` has been deprecated. Use `Sylius\Calendar\Provider\DateTimeProviderInterface` instead.
-
-Add a new bundle to your list of used bundles in `config/bundles.php` if they are not already there:
-
- ```diff
- + Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
- ```
-
-### Order prices recalculator
-
-Passing a `Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface` to `Sylius\Component\Core\OrderProcessing\OrderPricesRecalculator`
-constructor is deprecated since Sylius 1.11 and will be prohibited in 2.0. Use `Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface` instead.
-
-### Messenger transport
-
-If you don't already have configured the messenger transport, configure it according to your needs by setting an environment variable `MESSENGER_TRANSPORT_DSN`.
-
-### Behat
-
-- Service `sylius.behat.context.hook.calendar` has been removed, use in your suites `Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext` instead.
-- Service `sylius.behat.context.setup.calendar` has been removed, use in your suites `Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext` instead.
-
-### Potential BC-breaks
-
-#### State machine callbacks
-
-In Sylius we are using WinzouStateMachine where as example `sylius_order` state machine has declared 14 callbacks on one state.
-If this will be customized and number of callbacks comes up to 16 and higher - the priority of callbacks will become randomized.
-
-Sylius state machine callbacks from now on will have priorities declared. Ending at -100 with step of 100.
-Please note that those priorities are being executed in ascending order. You can find all the new priorities at
-`Sylius/Bundle/CoreBundle/Resources/config/app/state_machine`.
-
-Be aware that if those priorities were customized, this would lead to problems.
-You should check and adjust priorities on your application.
-
-#### Promoted properties from PHP 8.0
-
-We've introduced promoted properties all over the code where it was possible. Please, pay attention especially to these classes:
-- `Sylius\Bundle\AdminBundle\Controller\CustomerStatisticsController`
-- `Sylius\Bundle\AdminBundle\Controller\Dashboard\StatisticsController`
-- `Sylius\Bundle\AdminBundle\Controller\DashboardController`
-- `Sylius\Bundle\ShopBundle\Controller\ContactController`
-- `Sylius\Bundle\ShopBundle\Controller\CurrencySwitchController`
-- `Sylius\Bundle\ShopBundle\Controller\HomepageController`
-- `Sylius\Bundle\ShopBundle\Controller\LocaleSwitchController`
-- `Sylius\Bundle\ShopBundle\Controller\SecurityWidgetController`
-- `Sylius\Bundle\UiBundle\Controller\SecurityController`
-
-In all of them constructor argument `$templatingEngine`, previously typed as `object` was changed to `Environment`.
-It should not cause any problems (only such services would work in these controllers), but is theoretically making the type
-requirement stricter.
-
-#### Form type extensions
-
-All form type extensions supplied by Sylius now specify a priority of 100, instead of relying on the default value of 0.
-This means that your form type extensions, including autowired ones, may now consistently override the effect of these
-stock form type extensions without you having to explicitly specify their priorities. However, if you relied on the old
-default values, you might have to review priorities of your own form type extensions, as well as any that you have overridden.
-Please note that **unlike state machine callbacks**, form extension priorities are being executed in descending order.
-
-#### Channel pricing view
-
-All form fields are now hardcoded into the `AdminBundle/Resources/views/ProductVariant/Tab/_channelPricings.html.twig` view.
-If you have custom properties which were previously rendered automatically you now have to override this view in `templates/bundles/SyliusAdminBundle/ProductVariant/Tab/_channelPricings.html.twig`.
-
-### API v2
-
-For changes according to the API v2, please visit [API v2 upgrade file](UPGRADE-API-1.11.md).
diff --git a/UPGRADE-1.12.md b/UPGRADE-1.12.md
deleted file mode 100644
index a6c52c1501..0000000000
--- a/UPGRADE-1.12.md
+++ /dev/null
@@ -1,299 +0,0 @@
-# UPGRADE FROM `v1.12.11` TO `v1.12.12`
-
-1. The `Sylius\Component\User\Model\UserInterface` extends the `Symfony\Component\PasswordHasher\Hasher\PasswordHasherAwareInterface`
- interface to fix the compatibility with Symfony 6.
-2. The constructor of `Sylius\Component\Product\Resolver\DefaultProductVariantResolver` has been modified, a new argument has been added :
-
- ```php
- public function __construct(
- private ?ProductVariantRepositoryInterface $productVariantRepository = null,
- )
- ```
-
-# UPGRADE FROM `v1.12.10` TO `v1.12.11`
-
-1. Due to a bug that was causing the removal of promotion configurations for promotions [REF](https://github.com/Sylius/Sylius/issues/15201),
- The constructor of `Sylius\Bundle\CoreBundle\EventListener\ProductDeletionListener` has been modified as follows:
-
- ```diff
- public function __construct(
- private RequestStack $requestStack,
- + private ProductInPromotionRuleCheckerInterface $productInPromotionRuleChecker,
- - ProductAwareRuleUpdaterInterface ...$ruleUpdaters,
- )
- ```
-
- The method name has also changed from `removeProductFromPromotionRules` to `protectFromRemovingProductInUseByPromotionRule`.
-
- Please refrain from using ProductAwareRuleUpdaterInterface, as it will be removed in the next major release.
-
- * Due to the same bug, the constructor of `Sylius\Bundle\CoreBundle\EventListener\TaxonDeletionListener` has also changed:
-
- ```diff
- public function __construct(
- private SessionInterface|RequestStack $requestStackOrSession,
- private ChannelRepositoryInterface $channelRepository,
- + private TaxonInPromotionRuleCheckerInterface $taxonInPromotionRuleChecker,
- TaxonAwareRuleUpdaterInterface ...$ruleUpdaters,
- )
- ```
-
-1. The `Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration\SelectAttributeChoicesCollectionType` only
- constructor argument has been made optional and is `null` by default, subsequently the first argument of
- `sylius.form.type.attribute_type.select.choices_collection` has been removed.
-
-1. The default checkout resolving route pattern has been changed from `/checkout/.+` to
- `%sylius.security.shop_regex%/checkout/.+` to reduce the probability of conflicts with other routes.
-
-1. The `src/Sylius/Bundle/AdminBundle/Resources/views/Taxon/_treeWithButtons.html.twig` template has been updated to
- implement new changing taxon's position logic. If you have overridden this template, you need to update it.
- If you want to check what has changed, you might use [this PR](https://github.com/Sylius/Sylius/pull/15272) as a reference.
-
-# UPGRADE FROM `v1.12.9` TO `v1.12.10`
-
-1. The `Sylius\Component\Core\OrderProcessing\OrderPaymentProcessor` constructor has been changed:
- ```diff
- public function __construct(
- private OrderPaymentProviderInterface $orderPaymentProvider,
- private string $targetState = PaymentInterface::STATE_CART,
- + private ?OrderPaymentsRemoverInterface $orderPaymentsRemover = null,
- + private array $unprocessableOrderStates = [],
- )
- ```
-
-# UPGRADE FROM `v1.12.5` TO `v1.12.8`
-
-1. The priority of the `sylius.context.locale` tag on the `Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext` service has been changed from `256` to `32`.
- It means that this service has no longer the highest priority, and passing `Accept-Language` header on the UI won't override the locale set in the URL. If your app
- depends on this behavior, you need to change the priority of the `sylius.context.locale` tag on the `Sylius\Bundle\LocaleBundle\Context\RequestHeaderBasedLocaleContext` directly in your app.
-
-# UPGRADE FROM `v1.12.4` TO `v1.12.5`
-
-1. For routes `sylius_admin_order_shipment_ship` and `sylius_admin_order_resend_confirmation_email` the missing "/orders"
- prefix has been added. If you have been using these routes' paths directly, you need to update them.
-
-# UPGRADE FROM `v1.12.2` TO `v1.12.4`
-
-1. The default configuration of Symfony Messenger has changed,
- it is now separated for each transport and can be set via environmental variables:
-
- ```diff
- - MESSENGER_TRANSPORT_DSN=doctrine://default
- + SYLIUS_MESSENGER_TRANSPORT_MAIN_DSN=doctrine://default
- + SYLIUS_MESSENGER_TRANSPORT_MAIN_FAILED_DSN=doctrine://default?queue_name=main_failed
- + SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_DSN=doctrine://default?queue_name=catalog_promotion_removal
- + SYLIUS_MESSENGER_TRANSPORT_CATALOG_PROMOTION_REMOVAL_FAILED_DSN=doctrine://default?queue_name=catalog_promotion_removal_failed
- ```
-
-# UPGRADE FROM `v1.12.0` TO `v1.12.2`
-
-1. All entities and their relationships have a default order by identifier if no order is specified. You can disable
- this behavior by setting the `sylius_core.order_by_identifier` parameter to `false`:
-```yaml
-sylius_core:
- order_by_identifier: false
-```
-
-# UPGRADE FROM `v1.11.X` TO `v1.12.0`
-
-## Main update
-
-1. Service `sylius.twig.extension.taxes` has been deprecated. Use methods `getTaxExcludedTotal` and `getTaxIncludedTotal`
- from `Sylius\Component\Core\Model\Order` instead.
-
-2. Both `getCreatedByGuest` and `setCreatedByGuest` methods were deprecated on `\Sylius\Component\Core\Model\Order`.
-Please use `isCreatedByGuest` instead of the first one. The latter is a part of the `setCustomerWithAuthorization` logic
-and should be used only this way.
-
-3. Due to refactoring constructor has been changed in service `src/Sylius/Bundle/ShopBundle/EventListener/OrderIntegrityChecker.php`:
- ```diff
- public function __construct(
- private RouterInterface $router,
- - private OrderProcessorInterface $orderProcessor,
- private ObjectManager $manager
- + private OrderPromotionsIntegrityCheckerInterface $orderPromotionsIntegrityChecker
- )
- ```
-
-4. To allow administrator reset their password, add in `config/packages/security.yaml` file the following entry
- ```yaml
- - { path: "%sylius.security.admin_regex%/forgotten-password", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
- above
- ```yaml
- - { path: "%sylius.security.admin_regex%", role: ROLE_ADMINISTRATION_ACCESS }
- ```
-
-5. It is worth noticing that, that the [following services](https://github.com/Sylius/Sylius/blob/1.12/src/Sylius/Bundle/CoreBundle/Resources/config/test_services.xml)
-are now included in every env starting with `test` keyword. If you wish to not have them, either you need to rename your env to not start
-with test or remove these services with complier pass.
-
-6. The following listeners have been removed as they are not used anymore:
- - `Sylius\Bundle\CoreBundle\CatalogPromotion\Listener\CatalogPromotionFailedListener`
- - `Sylius\Bundle\CoreBundle\CatalogPromotion\Listener\CatalogPromotionUpdateFailedMessageListener`
-
-7. The `Sylius\Component\Promotion\Event\CatalogPromotionFailed` has been removed as it is not used anymore.
-
-8. Due to updating to Symfony 6 security file was changed to use the updated security system so you need to adjust your `config/packages/security.yaml` file:
-
- ```diff
- security:
- - always_authenticate_before_granting: true
- + enable_authenticator_manager: true
- ```
-
- and you need to adjust all of your firewalls like that:
-
- ```diff
- admin:
- # ...
- form_login:
- # ...
- - csrf_token_generator: security.csrf.token_manager
- + enable_csrf: true
- # ...
- new_api_admin_user:
- # ...
- - anonymous: true
- + entry_point: jwt
- # ...
- - guard:
- - authenticators:
- - # ...
- + jwt: true
- shop:
- logout:
- path: sylius_shop_logout
- - target: sylius_shop_login
- + target: sylius_shop_homepage
- invalidate_session: false
- - success_handler: sylius.handler.shop_user_logout
- ```
-
- and also you need to adjust all of your access_control like that:
-
- ```diff
- - - { path: "%sylius.security.admin_regex%/forgotten-password", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.admin_regex%/forgotten-password", role: PUBLIC_ACCESS }
- ```
-
-9. Passing a `Gaufrette\Filesystem` to `Sylius\Component\Core\Uploader\ImageUploader` constructor is deprecated since
-Sylius 1.12 and will be prohibited in 2.0. Use `Sylius\Component\Core\Filesystem\Adapter\FlysystemFilesystemAdapter` instead.
-
-10. Gaufrette is no longer used by Sylius in favour of Flysystem. If you want to use Gaufrette in your project, you need
- to set:
-
- ```yaml
- sylius_core:
- filesystem:
- adapter: gaufrette
- ```
-
- in your `config/packages/_sylius.yaml` file.
-
-11. Not passing `Sylius\Component\Taxation\Checker\TaxRateDateEligibilityCheckerInterface` to `Sylius\Component\Taxation\Resolver\TaxRateResolver` is deprecated since Sylius 1.12 and will be prohibited in 2.0
-
-### Frontend toolset changes
-
-#### Dependencies update
-
-In `1.12` we have updated our frontend dependencies to the latest versions. This means that you might need to update your dependencies as well.
-The full list of all dependencies can be found in the [package.json](./package.json) file.
-
-Because every project is different, we cannot provide a list of all changes that might be needed. However, we have prepared a short list of fixes for the most common issues.
-
-We updated gulp-sass plugin as well as the sass implementation we use to be compatible with most installation
-([node-sass](https://sass-lang.com/blog/libsass-is-deprecated) is deprecated and incompatible with many systems).
-Therefore, you need to update your code to follow this change.
-
-**NOTE!** `yarn build` is not used to build gulp anymore, and its default behavior is to build assets using Webpack. If you want to build assets using Gulp run `yarn gulp` instead.
-
-1. Follow [this guide](https://github.com/dlmanning/gulp-sass/tree/master#migrating-to-version-5) to upgrade your
- code when using gulp-sass this is an example:
- ```diff
- - import sass from 'gulp-sass';
- + import gulpSass from 'gulp-sass';
- + import realSass from 'sass';
- + const sass = gulpSass(realSass);
- ```
-
-2. Library chart.js lib has been upgraded from 2.9.3 to 3.7.1. Adjust your package.json as follows:
-
- ```diff
- - "chart.js": "^2.9.3",
- + "chart.js": "^3.7.1",
- ```
- ```diff
- - "rollup": "^0.60.2",
- + "rollup": "^0.66.2",
- ```
- ```diff
- - "rollup-plugin-uglify": "^4.0.0",
- + "rollup-plugin-uglify": "^6.0.2",
- ```
- Please visit [3.x Migration Guide](https://www.chartjs.org/docs/latest/getting-started/v3-migration.html) for more information.
-
-Example changes we made in our codebase to adjust it to the new version of dependencies might be found [here](https://github.com/Sylius/Sylius/pull/14319/files).
-Remember, when you face any issues while updating your dependencies you might ask for help in our [Slack](https://sylius-devs.slack.com/) channel.
-
-#### Webpack becomes our default build tool
-
-`1.12` comes with a long-awaited change - Webpack becomes our default build tool.
-
-If you want to stay with Gulp, you can do it by following the steps below:
-
-1. Go to `config/packages/_sylius.yaml` file and add the following line:
- ```yaml
- sylius_ui:
- use_webpack: false
- ```
-
-If you decide to use Webpack, you need to follow the steps below:
-
-1. Make sure you have latest js dependencies installed (you can compare your `package.json` file with the one from `1.12`).
-2. Make sure you have `webpack.config.js` file, if not, you can copy it from [Sylius/Sylius-Standard](https://github.com/Sylius/Sylius-Standard) repository.
-3. Run the following command
- ```bash
- yarn encore dev
- ```
-
-**Remember!** Every project is different, so you might need to adjust your code to work with Webpack.
-
-#### For plugin developers - `use_webpack` Twig's global
-
-We have introduced a new `use_webpack` global for Twig templates. It allows you to check if Webpack is declared as a build tool
-to dynamically serve assets from the correct directory.
-
-**Example:**
-```html
-
-```
-
-## Testing suite
-
-#### Behat changes
-
-As the default mailer integration has been changed from Swiftmailer to Symfony Mailer, the following changes have to be applied.
-
-1. Remove the `config/packages/test/swiftmailer.yaml` file
-2. Add a `config/packages/test/mailer.yaml` file with:
- ```yml
- framework:
- mailer:
- dsn: 'null://null'
- cache:
- pools:
- test.mailer_pool:
- adapter: cache.adapter.filesystem
- ```
-3. Change all occurrences of `sylius.behat.context.hook.email_spool` to `sylius.behat.context.hook.mailer`.
-
-Due to the changes in Symfony's session handling you might need to add the `sylius.behat.context.hook.session` context to your suites.
diff --git a/UPGRADE-1.13.md b/UPGRADE-1.13.md
deleted file mode 100644
index 76cdb3f36b..0000000000
--- a/UPGRADE-1.13.md
+++ /dev/null
@@ -1,232 +0,0 @@
-# UPGRADE FROM `v1.12.X` TO `v1.13.0`
-
-1. There has been a naw parameter added to specify the validation groups for given gateway factory.
- If you have any custom validation groups for your factory, you need to add them to your `config/packages/_sylius.yaml` file.
- Also, if you have your own gateway factory and want to add your validation groups you can add another key to the `gateway_config_validation_groups` parameter.
- It is handled by `GatewayConfigGroupsGenerator` and it resolves the groups based on the passed factory name.
-```yaml
-sylius_payum:
- gateway_config_validation_groups:
- paypal_express_checkout:
- - 'sylius'
- - 'paypal_express_checkout'
- stripe_checkout:
- - 'sylius'
- - 'stripe_checkout'
- your_gateway:
- - 'sylius'
- - 'your_custom_validation_group'
-```
-
-1. Class `Sylius\Component\Core\Promotion\Updater\Rule\TotalOfItemsFromTaxonRuleUpdater` has been deprecated, as it is no more used.
-
-1. Class `Sylius\Component\Core\Promotion\Updater\Rule\ContainsProductRuleUpdater` has been deprecated, as it is no more used.
-
-1. Class `Sylius\Bundle\ProductBundle\Form\Type\ProductOptionChoiceType` has been deprecated.
- Use `Sylius\Bundle\ProductBundle\Form\Type\ProductOptionAutocompleteType` instead.
-
-1. Using `parentId` query parameter to generate slug in `Sylius\Bundle\TaxonomyBundle\Controller\TaxonSlugController` has been deprecated.
- Use the `parentCode` query parameter instead.
-
-1. Starting with Sylius 1.13, the `SyliusPriceHistoryPlugin` is included.
- If you are currently using the plugin in your project, we recommend following the upgrade guide located [here](UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13.md).
-
-1. The `Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveInactiveCatalogPromotion` command and its handler
- `Sylius\Bundle\CoreBundle\CatalogPromotion\CommandHandler\RemoveInactiveCatalogPromotionHandler` have been deprecated.
- Use `Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveCatalogPromotion` command instead.
-
-1. Passing `Symfony\Component\Messenger\MessageBusInterface` to `Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\CatalogPromotionRemovalProcessor`
- as a second and third argument is deprecated.
-
-1. Not passing `Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionRemovalAnnouncerInterface` to `Sylius\Bundle\CoreBundle\CatalogPromotion\Processor\CatalogPromotionRemovalProcessor`
- as a second argument is deprecated.
-
-1. Not passing `Doctrine\Persistence\ObjectManager` to `Sylius\Component\Core\Updater\UnpaidOrdersStateUpdater`
- as a fifth argument is deprecated.
-
-1. To ease customization we've introduces attributes for some services in `1.13`:
- - `Sylius\Bundle\OrderBundle\Attribute\AsCartContext` for cart contexts
- - `Sylius\Bundle\OrderBundle\Attribute\AsOrderProcessor` for order processors
- - `Sylius\Bundle\ProductBundle\Attribute\AsProductVariantResolver` for product variant resolvers
-
- By default, Sylius still configures them using interfaces, but this way you cannot define a priority.
- If you want to define a priority, you need to set the following configuration in your `_sylius.yaml` file:
- ```yaml
- sylius_core:
- autoconfigure_with_attributes: true
- ```
- and use one of the new attributes accordingly to the type of your class, e.g.:
- ```php
- ['test' => true, 'test_cached' => true],` to your `bundles.php`
-* Create `config/services_test.yaml` file with the following code and add these your own Behat services as well:
- ```yaml
- imports:
- - { resource: "../vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml" }
- ```
-* If you use our Travis CI configuration, create also `config/services_test_cached.yaml` and import the `config/services_test.yaml` file:
- ```yaml
- imports:
- - { resource: "services_test.yaml" }
- ```
-* Remove all `__symfony__` prefixes in your Behat services
-* Remove all `/rector.php` file:
-
- ```diff
-
- + use Sylius\SyliusRector\Set\SyliusPriceHistory;
-
- return static function (RectorConfig $rectorConfig): void {
- // ...
- - $rectorConfig->sets([SyliusPriceHistory::PRICE_HISTORY_PLUGIN])
- + $rectorConfig->sets([SyliusPriceHistory::UPGRADE_SYLIUS_1_12_WITH_PRICE_HISTORY_PLUGIN_TO_SYLIUS_1_13]);
- };
-
- ```
-
-1. Run:
-
- ```bash
-
- vendor/bin/rector
-
- ```
-
-1. Make sure to remove the following config from your `config/packages/sylius_price_history_plugin.yaml` file:
-
- ```diff
-
- - - { resource: "@SyliusPriceHistoryPlugin/config/config.yaml" }
-
- ```
-
- And also the route from your `config/routes/sylius_price_history_plugin.yaml`:
-
- ```diff
-
- - sylius_price_history_admin:
- - resource: '@SyliusPriceHistoryPlugin/config/admin_routing.yaml'
- - prefix: '/%sylius_admin.path_name%'
-
- ```
-
-1. Update your resources configuration for `ChannelPricingLogEntry` and `ChannelPriceHistoryConfig` if you have changed them in your project:
-
- ```diff
-
- - sylius_price_history:
- - batch_size: 100
- + sylius_core:
- + price_history:
- + batch_size: 100
- resources:
- channel_price_history_config:
- classes:
- model: App\Entity\ChannelPriceHistoryConfig
- ...
- channel_pricing_log_entry:
- classes:
- model: App\Entity\ChannelPricingLogEntry
- ...
-
- ```
-
-1. The class `Sylius\PriceHistoryPlugin\Infrastructure\EventSubscriber\ChannelPricingLogEntryEventSubscriber` has been replaced by `Sylius\Bundle\CoreBundle\PriceHistory\EventListener\ChannelPricingLogEntryEventListener`.
-
-1. The `Sylius\PriceHistoryPlugin\Application\Calculator\ProductVariantLowestPriceCalculator` class along with its interface has been removed.
- If you have used it in your project, you should also remove it from your code.
-
- Use `Sylius\Component\Core\Calculator\ProductVariantPriceCalculator` instead, as it has been extended with the `calculateLowestPrice` method.
-
-1. Go through the rest of the [Sylius 1.13 upgrade file](UPGRADE-1.13.md).
diff --git a/app/Resources/TwigBundle/views/Exception/error403.html.twig b/app/Resources/TwigBundle/views/Exception/error403.html.twig
deleted file mode 100644
index bbda92dfb5..0000000000
--- a/app/Resources/TwigBundle/views/Exception/error403.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-{% include '@SyliusShop/error403.html.twig' %}
diff --git a/app/TestAppKernel.php b/app/TestAppKernel.php
deleted file mode 100644
index 305b9ba5f2..0000000000
--- a/app/TestAppKernel.php
+++ /dev/null
@@ -1,24 +0,0 @@
-addSql('CREATE TABLE sylius_adjustment (id INT AUTO_INCREMENT NOT NULL, order_id INT DEFAULT NULL, order_item_id INT DEFAULT NULL, order_item_unit_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, `label` VARCHAR(255) DEFAULT NULL, amount INT NOT NULL, is_neutral TINYINT(1) NOT NULL, is_locked TINYINT(1) NOT NULL, origin_code VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_ACA6E0F28D9F6D38 (order_id), INDEX IDX_ACA6E0F2E415FB15 (order_item_id), INDEX IDX_ACA6E0F2F720C233 (order_item_unit_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_order_sequence (id INT AUTO_INCREMENT NOT NULL, idx INT NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_currency (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(3) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_96EDD3D077153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_exchange_rate (id INT AUTO_INCREMENT NOT NULL, source_currency INT NOT NULL, target_currency INT NOT NULL, ratio NUMERIC(10, 5) NOT NULL, INDEX IDX_5F52B852A76BEED (source_currency), INDEX IDX_5F52B85B3FD5856 (target_currency), UNIQUE INDEX UNIQ_5F52B852A76BEEDB3FD5856 (source_currency, target_currency), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_locale (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(12) NOT NULL, enabled TINYINT(1) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_7BA1286477153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_association (id INT AUTO_INCREMENT NOT NULL, association_type_id INT NOT NULL, product_id INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_48E9CDABB1E1C39 (association_type_id), INDEX IDX_48E9CDAB4584665A (product_id), UNIQUE INDEX product_association_idx (product_id, association_type_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_association_product (association_id INT NOT NULL, product_id INT NOT NULL, INDEX IDX_A427B983EFB9C8A5 (association_id), INDEX IDX_A427B9834584665A (product_id), PRIMARY KEY(association_id, product_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_association_type (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_CCB8914C77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_attribute (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, type VARCHAR(255) NOT NULL, storage_type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, position INT NOT NULL, UNIQUE INDEX UNIQ_BFAF484A77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_attribute_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_93850EBA2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_attribute_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_attribute_value (id INT AUTO_INCREMENT NOT NULL, product_id INT NOT NULL, attribute_id INT NOT NULL, text_value LONGTEXT DEFAULT NULL, boolean_value TINYINT(1) DEFAULT NULL, integer_value INT DEFAULT NULL, float_value DOUBLE PRECISION DEFAULT NULL, datetime_value DATETIME DEFAULT NULL, date_value DATE DEFAULT NULL, INDEX IDX_8A053E544584665A (product_id), INDEX IDX_8A053E54B6E62EFA (attribute_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_option (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_E4C0EBEF77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_option_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_CBA491AD2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_option_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_option_value (id INT AUTO_INCREMENT NOT NULL, option_id INT NOT NULL, code VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_F7FF7D4B77153098 (code), INDEX IDX_F7FF7D4BA7C41D6F (option_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_option_value_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, value VARCHAR(255) NOT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_8D4382DC2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_option_value_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_tax_category (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_221EB0BE77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shipping_category (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_B1D6465277153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shipping_method_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, description VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_2B37DB3D2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_shipping_method_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_credit_card (id INT AUTO_INCREMENT NOT NULL, token VARCHAR(255) DEFAULT NULL, type VARCHAR(255) DEFAULT NULL, cardholder_name VARCHAR(255) DEFAULT NULL, number VARCHAR(255) DEFAULT NULL, security_code VARCHAR(255) DEFAULT NULL, expiry_month INT DEFAULT NULL, expiry_year INT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_payment_method_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, instructions LONGTEXT DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_966BE3A12C2AC5D3 (translatable_id), UNIQUE INDEX sylius_payment_method_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion_action (id INT AUTO_INCREMENT NOT NULL, promotion_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', INDEX IDX_933D0915139DF194 (promotion_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion_rule (id INT AUTO_INCREMENT NOT NULL, promotion_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', INDEX IDX_2C188EA8139DF194 (promotion_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_country (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(2) NOT NULL, enabled TINYINT(1) NOT NULL, UNIQUE INDEX UNIQ_E74256BF77153098 (code), INDEX IDX_E74256BF77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_province (id INT AUTO_INCREMENT NOT NULL, country_id INT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, abbreviation VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_B5618FE477153098 (code), INDEX IDX_B5618FE4F92F3E70 (country_id), UNIQUE INDEX UNIQ_B5618FE4F92F3E705E237E06 (country_id, name), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_zone (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, type VARCHAR(8) NOT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_7BE2258E77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_zone_member (id INT AUTO_INCREMENT NOT NULL, belongs_to INT DEFAULT NULL, code VARCHAR(255) NOT NULL, INDEX IDX_E8B5ABF34B0E929B (belongs_to), UNIQUE INDEX UNIQ_E8B5ABF34B0E929B77153098 (belongs_to, code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_taxon_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, slug VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_1487DFCF2C2AC5D3 (translatable_id), UNIQUE INDEX slug_uidx (locale, slug), UNIQUE INDEX sylius_taxon_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_user_oauth (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, provider VARCHAR(255) NOT NULL, identifier VARCHAR(255) NOT NULL, access_token VARCHAR(255) DEFAULT NULL, refresh_token VARCHAR(255) DEFAULT NULL, INDEX IDX_C3471B78A76ED395 (user_id), UNIQUE INDEX user_provider (user_id, provider), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_customer_group (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_7FCF9B0577153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_address (id INT AUTO_INCREMENT NOT NULL, customer_id INT DEFAULT NULL, first_name VARCHAR(255) NOT NULL, last_name VARCHAR(255) NOT NULL, phone_number VARCHAR(255) DEFAULT NULL, street VARCHAR(255) NOT NULL, company VARCHAR(255) DEFAULT NULL, city VARCHAR(255) NOT NULL, postcode VARCHAR(255) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, country_code VARCHAR(255) NOT NULL, province_code VARCHAR(255) DEFAULT NULL, province_name VARCHAR(255) DEFAULT NULL, INDEX IDX_B97FF0589395C3F3 (customer_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_admin_user (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(255) DEFAULT NULL, username_canonical VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, email_verification_token VARCHAR(255) DEFAULT NULL, verified_at DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, credentials_expire_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', email VARCHAR(255) DEFAULT NULL, email_canonical VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, first_name VARCHAR(255) DEFAULT NULL, last_name VARCHAR(255) DEFAULT NULL, locale_code VARCHAR(12) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_channel (id INT AUTO_INCREMENT NOT NULL, default_locale_id INT NOT NULL, base_currency_id INT NOT NULL, default_tax_zone_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, color VARCHAR(255) DEFAULT NULL, description LONGTEXT DEFAULT NULL, enabled TINYINT(1) NOT NULL, hostname VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, theme_name VARCHAR(255) DEFAULT NULL, tax_calculation_strategy VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_16C8119E77153098 (code), INDEX IDX_16C8119E743BF776 (default_locale_id), INDEX IDX_16C8119E3101778E (base_currency_id), INDEX IDX_16C8119EA978C17 (default_tax_zone_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_channel_currencies (channel_id INT NOT NULL, currency_id INT NOT NULL, INDEX IDX_AE491F9372F5A1AA (channel_id), INDEX IDX_AE491F9338248176 (currency_id), PRIMARY KEY(channel_id, currency_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_channel_locales (channel_id INT NOT NULL, locale_id INT NOT NULL, INDEX IDX_786B7A8472F5A1AA (channel_id), INDEX IDX_786B7A84E559DFD1 (locale_id), PRIMARY KEY(channel_id, locale_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_channel_pricing (id INT AUTO_INCREMENT NOT NULL, product_variant_id INT NOT NULL, channel_id INT NOT NULL, price INT NOT NULL, INDEX IDX_7801820CA80EF684 (product_variant_id), INDEX IDX_7801820C72F5A1AA (channel_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_customer (id INT AUTO_INCREMENT NOT NULL, customer_group_id INT DEFAULT NULL, default_address_id INT DEFAULT NULL, email VARCHAR(255) NOT NULL, email_canonical VARCHAR(255) NOT NULL, first_name VARCHAR(255) DEFAULT NULL, last_name VARCHAR(255) DEFAULT NULL, birthday DATETIME DEFAULT NULL, gender VARCHAR(1) DEFAULT \'u\' NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, phone_number VARCHAR(255) DEFAULT NULL, subscribed_to_newsletter TINYINT(1) NOT NULL, UNIQUE INDEX UNIQ_7E82D5E6E7927C74 (email), UNIQUE INDEX UNIQ_7E82D5E6A0D96FBF (email_canonical), INDEX IDX_7E82D5E6D2919A68 (customer_group_id), UNIQUE INDEX UNIQ_7E82D5E6BD94FB16 (default_address_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_order (id INT AUTO_INCREMENT NOT NULL, shipping_address_id INT DEFAULT NULL, billing_address_id INT DEFAULT NULL, channel_id INT DEFAULT NULL, promotion_coupon_id INT DEFAULT NULL, customer_id INT DEFAULT NULL, number VARCHAR(255) DEFAULT NULL, notes VARCHAR(1000) DEFAULT NULL, state VARCHAR(255) NOT NULL, checkout_completed_at DATETIME DEFAULT NULL, items_total INT NOT NULL, adjustments_total INT NOT NULL, total INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, currency_code VARCHAR(3) NOT NULL, locale_code VARCHAR(255) NOT NULL, checkout_state VARCHAR(255) NOT NULL, payment_state VARCHAR(255) NOT NULL, shipping_state VARCHAR(255) NOT NULL, token_value VARCHAR(255) DEFAULT NULL, customer_ip VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_6196A1F996901F54 (number), UNIQUE INDEX UNIQ_6196A1F94D4CFF2B (shipping_address_id), UNIQUE INDEX UNIQ_6196A1F979D0C0E4 (billing_address_id), INDEX IDX_6196A1F972F5A1AA (channel_id), INDEX IDX_6196A1F917B24436 (promotion_coupon_id), INDEX IDX_6196A1F99395C3F3 (customer_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion_order (order_id INT NOT NULL, promotion_id INT NOT NULL, INDEX IDX_BF9CF6FB8D9F6D38 (order_id), INDEX IDX_BF9CF6FB139DF194 (promotion_id), PRIMARY KEY(order_id, promotion_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_order_item (id INT AUTO_INCREMENT NOT NULL, order_id INT NOT NULL, variant_id INT NOT NULL, quantity INT NOT NULL, unit_price INT NOT NULL, units_total INT NOT NULL, adjustments_total INT NOT NULL, total INT NOT NULL, is_immutable TINYINT(1) NOT NULL, INDEX IDX_77B587ED8D9F6D38 (order_id), INDEX IDX_77B587ED3B69A9AF (variant_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_order_item_unit (id INT AUTO_INCREMENT NOT NULL, order_item_id INT NOT NULL, shipment_id INT DEFAULT NULL, adjustments_total INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_82BF226EE415FB15 (order_item_id), INDEX IDX_82BF226E7BE036FC (shipment_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_payment (id INT AUTO_INCREMENT NOT NULL, method_id INT DEFAULT NULL, credit_card_id INT DEFAULT NULL, order_id INT NOT NULL, currency_code VARCHAR(3) NOT NULL, amount INT NOT NULL, state VARCHAR(255) NOT NULL, details LONGTEXT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_D9191BD419883967 (method_id), INDEX IDX_D9191BD47048FD0F (credit_card_id), INDEX IDX_D9191BD48D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_payment_method (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, gateway VARCHAR(255) NOT NULL, environment VARCHAR(255) DEFAULT NULL, is_enabled TINYINT(1) NOT NULL, position INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_A75B0B0D77153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_payment_method_channels (payment_method_id INT NOT NULL, channel_id INT NOT NULL, INDEX IDX_543AC0CC5AA1164F (payment_method_id), INDEX IDX_543AC0CC72F5A1AA (channel_id), PRIMARY KEY(payment_method_id, channel_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product (id INT AUTO_INCREMENT NOT NULL, main_taxon_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, available_on DATETIME DEFAULT NULL, available_until DATETIME DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, enabled TINYINT(1) NOT NULL, variant_selection_method VARCHAR(255) NOT NULL, average_rating DOUBLE PRECISION DEFAULT \'0\' NOT NULL, UNIQUE INDEX UNIQ_677B9B7477153098 (code), INDEX IDX_677B9B74731E505 (main_taxon_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_channels (product_id INT NOT NULL, channel_id INT NOT NULL, INDEX IDX_F9EF269B4584665A (product_id), INDEX IDX_F9EF269B72F5A1AA (channel_id), PRIMARY KEY(product_id, channel_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_options (product_id INT NOT NULL, option_id INT NOT NULL, INDEX IDX_2B5FF0094584665A (product_id), INDEX IDX_2B5FF009A7C41D6F (option_id), PRIMARY KEY(product_id, option_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_image (id INT AUTO_INCREMENT NOT NULL, owner_id INT NOT NULL, code VARCHAR(255) NOT NULL, path VARCHAR(255) NOT NULL, INDEX IDX_88C64B2D7E3C61F9 (owner_id), UNIQUE INDEX product_image_code_idx (owner_id, code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_review (id INT AUTO_INCREMENT NOT NULL, product_id INT NOT NULL, author_id INT DEFAULT NULL, title VARCHAR(255) NOT NULL, rating INT NOT NULL, comment LONGTEXT DEFAULT NULL, status VARCHAR(255) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_C7056A994584665A (product_id), INDEX IDX_C7056A99F675F31B (author_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_taxon (id INT AUTO_INCREMENT NOT NULL, product_id INT NOT NULL, taxon_id INT NOT NULL, position INT NOT NULL, INDEX IDX_169C6CD94584665A (product_id), INDEX IDX_169C6CD9DE13F470 (taxon_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) NOT NULL, slug VARCHAR(255) NOT NULL, description LONGTEXT DEFAULT NULL, meta_keywords VARCHAR(255) DEFAULT NULL, meta_description VARCHAR(255) DEFAULT NULL, short_description LONGTEXT DEFAULT NULL, locale VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_105A908989D9B62 (slug), INDEX IDX_105A9082C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_variant (id INT AUTO_INCREMENT NOT NULL, product_id INT NOT NULL, tax_category_id INT DEFAULT NULL, shipping_category_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, available_on DATETIME DEFAULT NULL, available_until DATETIME DEFAULT NULL, on_hold INT NOT NULL, on_hand INT NOT NULL, tracked TINYINT(1) NOT NULL, width DOUBLE PRECISION DEFAULT NULL, height DOUBLE PRECISION DEFAULT NULL, depth DOUBLE PRECISION DEFAULT NULL, weight DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_A29B52377153098 (code), INDEX IDX_A29B5234584665A (product_id), INDEX IDX_A29B5239DF894ED (tax_category_id), INDEX IDX_A29B5239E2D1A41 (shipping_category_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_product_variant_option_value (variant_id INT NOT NULL, option_value_id INT NOT NULL, INDEX IDX_76CDAFA13B69A9AF (variant_id), INDEX IDX_76CDAFA1D957CA06 (option_value_id), PRIMARY KEY(variant_id, option_value_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion (id INT AUTO_INCREMENT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, description VARCHAR(255) DEFAULT NULL, priority INT NOT NULL, exclusive TINYINT(1) NOT NULL, usage_limit INT DEFAULT NULL, used INT NOT NULL, coupon_based TINYINT(1) NOT NULL, starts_at DATETIME DEFAULT NULL, ends_at DATETIME DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_F157396377153098 (code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion_channels (promotion_id INT NOT NULL, channel_id INT NOT NULL, INDEX IDX_1A044F64139DF194 (promotion_id), INDEX IDX_1A044F6472F5A1AA (channel_id), PRIMARY KEY(promotion_id, channel_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_promotion_coupon (id INT AUTO_INCREMENT NOT NULL, promotion_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, usage_limit INT DEFAULT NULL, used INT NOT NULL, expires_at DATETIME DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, per_customer_usage_limit INT DEFAULT NULL, UNIQUE INDEX UNIQ_B04EBA8577153098 (code), INDEX IDX_B04EBA85139DF194 (promotion_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shipment (id INT AUTO_INCREMENT NOT NULL, method_id INT NOT NULL, order_id INT NOT NULL, state VARCHAR(255) NOT NULL, tracking VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, INDEX IDX_FD707B3319883967 (method_id), INDEX IDX_FD707B338D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shipping_method (id INT AUTO_INCREMENT NOT NULL, category_id INT DEFAULT NULL, zone_id INT NOT NULL, tax_category_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', category_requirement INT NOT NULL, calculator VARCHAR(255) NOT NULL, is_enabled TINYINT(1) NOT NULL, position INT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_5FB0EE1177153098 (code), INDEX IDX_5FB0EE1112469DE2 (category_id), INDEX IDX_5FB0EE119F2C3FAB (zone_id), INDEX IDX_5FB0EE119DF894ED (tax_category_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shipping_method_channels (shipping_method_id INT NOT NULL, channel_id INT NOT NULL, INDEX IDX_2D9833355F7D6850 (shipping_method_id), INDEX IDX_2D98333572F5A1AA (channel_id), PRIMARY KEY(shipping_method_id, channel_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_shop_user (id INT AUTO_INCREMENT NOT NULL, customer_id INT NOT NULL, username VARCHAR(255) DEFAULT NULL, username_canonical VARCHAR(255) DEFAULT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, password_reset_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, email_verification_token VARCHAR(255) DEFAULT NULL, verified_at DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, credentials_expire_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', email VARCHAR(255) DEFAULT NULL, email_canonical VARCHAR(255) DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_7C2B74809395C3F3 (customer_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_taxon (id INT AUTO_INCREMENT NOT NULL, tree_root INT DEFAULT NULL, parent_id INT DEFAULT NULL, code VARCHAR(255) NOT NULL, tree_left INT NOT NULL, tree_right INT NOT NULL, tree_level INT NOT NULL, position INT NOT NULL, UNIQUE INDEX UNIQ_CFD811CA77153098 (code), INDEX IDX_CFD811CAA977936C (tree_root), INDEX IDX_CFD811CA727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_taxon_image (id INT AUTO_INCREMENT NOT NULL, owner_id INT NOT NULL, code VARCHAR(255) NOT NULL, path VARCHAR(255) NOT NULL, INDEX IDX_DBE52B287E3C61F9 (owner_id), UNIQUE INDEX taxon_image_code_idx (owner_id, code), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_tax_rate (id INT AUTO_INCREMENT NOT NULL, category_id INT NOT NULL, zone_id INT NOT NULL, code VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, amount NUMERIC(10, 5) NOT NULL, included_in_price TINYINT(1) NOT NULL, calculator VARCHAR(255) NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, UNIQUE INDEX UNIQ_3CD86B2E77153098 (code), INDEX IDX_3CD86B2E12469DE2 (category_id), INDEX IDX_3CD86B2E9F2C3FAB (zone_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_gateway_config (id INT AUTO_INCREMENT NOT NULL, config LONGTEXT NOT NULL, gateway_name VARCHAR(255) NOT NULL, factory_name VARCHAR(255) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_payment_security_token (hash VARCHAR(255) NOT NULL, details LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:object)\', after_url LONGTEXT DEFAULT NULL, target_url LONGTEXT NOT NULL, gateway_name VARCHAR(255) NOT NULL, PRIMARY KEY(hash)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_api_access_token (id INT AUTO_INCREMENT NOT NULL, client_id INT DEFAULT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_7D83AA7F5F37A13B (token), INDEX IDX_7D83AA7F19EB6921 (client_id), INDEX IDX_7D83AA7FA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_api_auth_code (id INT AUTO_INCREMENT NOT NULL, client_id INT DEFAULT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri LONGTEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_C84041795F37A13B (token), INDEX IDX_C840417919EB6921 (client_id), INDEX IDX_C8404179A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_api_client (id INT AUTO_INCREMENT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', secret VARCHAR(255) NOT NULL, allowed_grant_types LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('CREATE TABLE sylius_api_refresh_token (id INT AUTO_INCREMENT NOT NULL, client_id INT DEFAULT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_445785255F37A13B (token), INDEX IDX_4457852519EB6921 (client_id), INDEX IDX_44578525A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_adjustment ADD CONSTRAINT FK_ACA6E0F28D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_adjustment ADD CONSTRAINT FK_ACA6E0F2E415FB15 FOREIGN KEY (order_item_id) REFERENCES sylius_order_item (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_adjustment ADD CONSTRAINT FK_ACA6E0F2F720C233 FOREIGN KEY (order_item_unit_id) REFERENCES sylius_order_item_unit (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_exchange_rate ADD CONSTRAINT FK_5F52B852A76BEED FOREIGN KEY (source_currency) REFERENCES sylius_currency (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_exchange_rate ADD CONSTRAINT FK_5F52B85B3FD5856 FOREIGN KEY (target_currency) REFERENCES sylius_currency (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_association ADD CONSTRAINT FK_48E9CDABB1E1C39 FOREIGN KEY (association_type_id) REFERENCES sylius_product_association_type (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_association ADD CONSTRAINT FK_48E9CDAB4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_association_product ADD CONSTRAINT FK_A427B983EFB9C8A5 FOREIGN KEY (association_id) REFERENCES sylius_product_association (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_association_product ADD CONSTRAINT FK_A427B9834584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_attribute_translation ADD CONSTRAINT FK_93850EBA2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_attribute (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_attribute_value ADD CONSTRAINT FK_8A053E544584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_attribute_value ADD CONSTRAINT FK_8A053E54B6E62EFA FOREIGN KEY (attribute_id) REFERENCES sylius_product_attribute (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_option_translation ADD CONSTRAINT FK_CBA491AD2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_option (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_option_value ADD CONSTRAINT FK_F7FF7D4BA7C41D6F FOREIGN KEY (option_id) REFERENCES sylius_product_option (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_option_value_translation ADD CONSTRAINT FK_8D4382DC2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_option_value (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_shipping_method_translation ADD CONSTRAINT FK_2B37DB3D2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_shipping_method (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_payment_method_translation ADD CONSTRAINT FK_966BE3A12C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_payment_method (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_promotion_action ADD CONSTRAINT FK_933D0915139DF194 FOREIGN KEY (promotion_id) REFERENCES sylius_promotion (id)');
- $this->addSql('ALTER TABLE sylius_promotion_rule ADD CONSTRAINT FK_2C188EA8139DF194 FOREIGN KEY (promotion_id) REFERENCES sylius_promotion (id)');
- $this->addSql('ALTER TABLE sylius_province ADD CONSTRAINT FK_B5618FE4F92F3E70 FOREIGN KEY (country_id) REFERENCES sylius_country (id)');
- $this->addSql('ALTER TABLE sylius_zone_member ADD CONSTRAINT FK_E8B5ABF34B0E929B FOREIGN KEY (belongs_to) REFERENCES sylius_zone (id)');
- $this->addSql('ALTER TABLE sylius_taxon_translation ADD CONSTRAINT FK_1487DFCF2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_user_oauth ADD CONSTRAINT FK_C3471B78A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id)');
- $this->addSql('ALTER TABLE sylius_address ADD CONSTRAINT FK_B97FF0589395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel ADD CONSTRAINT FK_16C8119E743BF776 FOREIGN KEY (default_locale_id) REFERENCES sylius_locale (id)');
- $this->addSql('ALTER TABLE sylius_channel ADD CONSTRAINT FK_16C8119E3101778E FOREIGN KEY (base_currency_id) REFERENCES sylius_currency (id)');
- $this->addSql('ALTER TABLE sylius_channel ADD CONSTRAINT FK_16C8119EA978C17 FOREIGN KEY (default_tax_zone_id) REFERENCES sylius_zone (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_channel_currencies ADD CONSTRAINT FK_AE491F9372F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_currencies ADD CONSTRAINT FK_AE491F9338248176 FOREIGN KEY (currency_id) REFERENCES sylius_currency (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_locales ADD CONSTRAINT FK_786B7A8472F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_locales ADD CONSTRAINT FK_786B7A84E559DFD1 FOREIGN KEY (locale_id) REFERENCES sylius_locale (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_pricing ADD CONSTRAINT FK_7801820CA80EF684 FOREIGN KEY (product_variant_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_pricing ADD CONSTRAINT FK_7801820C72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_customer ADD CONSTRAINT FK_7E82D5E6D2919A68 FOREIGN KEY (customer_group_id) REFERENCES sylius_customer_group (id)');
- $this->addSql('ALTER TABLE sylius_customer ADD CONSTRAINT FK_7E82D5E6BD94FB16 FOREIGN KEY (default_address_id) REFERENCES sylius_address (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F94D4CFF2B FOREIGN KEY (shipping_address_id) REFERENCES sylius_address (id)');
- $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F979D0C0E4 FOREIGN KEY (billing_address_id) REFERENCES sylius_address (id)');
- $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F972F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id)');
- $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F917B24436 FOREIGN KEY (promotion_coupon_id) REFERENCES sylius_promotion_coupon (id)');
- $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F99395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id)');
- $this->addSql('ALTER TABLE sylius_promotion_order ADD CONSTRAINT FK_BF9CF6FB8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_promotion_order ADD CONSTRAINT FK_BF9CF6FB139DF194 FOREIGN KEY (promotion_id) REFERENCES sylius_promotion (id)');
- $this->addSql('ALTER TABLE sylius_order_item ADD CONSTRAINT FK_77B587ED8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_order_item ADD CONSTRAINT FK_77B587ED3B69A9AF FOREIGN KEY (variant_id) REFERENCES sylius_product_variant (id)');
- $this->addSql('ALTER TABLE sylius_order_item_unit ADD CONSTRAINT FK_82BF226EE415FB15 FOREIGN KEY (order_item_id) REFERENCES sylius_order_item (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_order_item_unit ADD CONSTRAINT FK_82BF226E7BE036FC FOREIGN KEY (shipment_id) REFERENCES sylius_shipment (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD419883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD47048FD0F FOREIGN KEY (credit_card_id) REFERENCES sylius_credit_card (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD48D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_payment_method_channels ADD CONSTRAINT FK_543AC0CC5AA1164F FOREIGN KEY (payment_method_id) REFERENCES sylius_payment_method (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_payment_method_channels ADD CONSTRAINT FK_543AC0CC72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product ADD CONSTRAINT FK_677B9B74731E505 FOREIGN KEY (main_taxon_id) REFERENCES sylius_taxon (id)');
- $this->addSql('ALTER TABLE sylius_product_channels ADD CONSTRAINT FK_F9EF269B4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_channels ADD CONSTRAINT FK_F9EF269B72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_options ADD CONSTRAINT FK_2B5FF0094584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_options ADD CONSTRAINT FK_2B5FF009A7C41D6F FOREIGN KEY (option_id) REFERENCES sylius_product_option (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_image ADD CONSTRAINT FK_88C64B2D7E3C61F9 FOREIGN KEY (owner_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_review ADD CONSTRAINT FK_C7056A994584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_review ADD CONSTRAINT FK_C7056A99F675F31B FOREIGN KEY (author_id) REFERENCES sylius_customer (id)');
- $this->addSql('ALTER TABLE sylius_product_taxon ADD CONSTRAINT FK_169C6CD94584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_taxon ADD CONSTRAINT FK_169C6CD9DE13F470 FOREIGN KEY (taxon_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_translation ADD CONSTRAINT FK_105A9082C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_variant ADD CONSTRAINT FK_A29B5234584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_variant ADD CONSTRAINT FK_A29B5239DF894ED FOREIGN KEY (tax_category_id) REFERENCES sylius_tax_category (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_product_variant ADD CONSTRAINT FK_A29B5239E2D1A41 FOREIGN KEY (shipping_category_id) REFERENCES sylius_shipping_category (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_product_variant_option_value ADD CONSTRAINT FK_76CDAFA13B69A9AF FOREIGN KEY (variant_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_variant_option_value ADD CONSTRAINT FK_76CDAFA1D957CA06 FOREIGN KEY (option_value_id) REFERENCES sylius_product_option_value (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_promotion_channels ADD CONSTRAINT FK_1A044F64139DF194 FOREIGN KEY (promotion_id) REFERENCES sylius_promotion (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_promotion_channels ADD CONSTRAINT FK_1A044F6472F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_promotion_coupon ADD CONSTRAINT FK_B04EBA85139DF194 FOREIGN KEY (promotion_id) REFERENCES sylius_promotion (id)');
- $this->addSql('ALTER TABLE sylius_shipment ADD CONSTRAINT FK_FD707B3319883967 FOREIGN KEY (method_id) REFERENCES sylius_shipping_method (id)');
- $this->addSql('ALTER TABLE sylius_shipment ADD CONSTRAINT FK_FD707B338D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_shipping_method ADD CONSTRAINT FK_5FB0EE1112469DE2 FOREIGN KEY (category_id) REFERENCES sylius_shipping_category (id)');
- $this->addSql('ALTER TABLE sylius_shipping_method ADD CONSTRAINT FK_5FB0EE119F2C3FAB FOREIGN KEY (zone_id) REFERENCES sylius_zone (id)');
- $this->addSql('ALTER TABLE sylius_shipping_method ADD CONSTRAINT FK_5FB0EE119DF894ED FOREIGN KEY (tax_category_id) REFERENCES sylius_tax_category (id) ON DELETE SET NULL');
- $this->addSql('ALTER TABLE sylius_shipping_method_channels ADD CONSTRAINT FK_2D9833355F7D6850 FOREIGN KEY (shipping_method_id) REFERENCES sylius_shipping_method (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_shipping_method_channels ADD CONSTRAINT FK_2D98333572F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_shop_user ADD CONSTRAINT FK_7C2B74809395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id)');
- $this->addSql('ALTER TABLE sylius_taxon ADD CONSTRAINT FK_CFD811CAA977936C FOREIGN KEY (tree_root) REFERENCES sylius_taxon (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_taxon ADD CONSTRAINT FK_CFD811CA727ACA70 FOREIGN KEY (parent_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_taxon_image ADD CONSTRAINT FK_DBE52B287E3C61F9 FOREIGN KEY (owner_id) REFERENCES sylius_taxon (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_tax_rate ADD CONSTRAINT FK_3CD86B2E12469DE2 FOREIGN KEY (category_id) REFERENCES sylius_tax_category (id)');
- $this->addSql('ALTER TABLE sylius_tax_rate ADD CONSTRAINT FK_3CD86B2E9F2C3FAB FOREIGN KEY (zone_id) REFERENCES sylius_zone (id)');
- $this->addSql('ALTER TABLE sylius_api_access_token ADD CONSTRAINT FK_7D83AA7F19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_api_client (id)');
- $this->addSql('ALTER TABLE sylius_api_access_token ADD CONSTRAINT FK_7D83AA7FA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_api_auth_code ADD CONSTRAINT FK_C840417919EB6921 FOREIGN KEY (client_id) REFERENCES sylius_api_client (id)');
- $this->addSql('ALTER TABLE sylius_api_auth_code ADD CONSTRAINT FK_C8404179A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_api_refresh_token ADD CONSTRAINT FK_4457852519EB6921 FOREIGN KEY (client_id) REFERENCES sylius_api_client (id)');
- $this->addSql('ALTER TABLE sylius_api_refresh_token ADD CONSTRAINT FK_44578525A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_exchange_rate DROP FOREIGN KEY FK_5F52B852A76BEED');
- $this->addSql('ALTER TABLE sylius_exchange_rate DROP FOREIGN KEY FK_5F52B85B3FD5856');
- $this->addSql('ALTER TABLE sylius_channel DROP FOREIGN KEY FK_16C8119E3101778E');
- $this->addSql('ALTER TABLE sylius_channel_currencies DROP FOREIGN KEY FK_AE491F9338248176');
- $this->addSql('ALTER TABLE sylius_channel DROP FOREIGN KEY FK_16C8119E743BF776');
- $this->addSql('ALTER TABLE sylius_channel_locales DROP FOREIGN KEY FK_786B7A84E559DFD1');
- $this->addSql('ALTER TABLE sylius_product_association_product DROP FOREIGN KEY FK_A427B983EFB9C8A5');
- $this->addSql('ALTER TABLE sylius_product_association DROP FOREIGN KEY FK_48E9CDABB1E1C39');
- $this->addSql('ALTER TABLE sylius_product_attribute_translation DROP FOREIGN KEY FK_93850EBA2C2AC5D3');
- $this->addSql('ALTER TABLE sylius_product_attribute_value DROP FOREIGN KEY FK_8A053E54B6E62EFA');
- $this->addSql('ALTER TABLE sylius_product_option_translation DROP FOREIGN KEY FK_CBA491AD2C2AC5D3');
- $this->addSql('ALTER TABLE sylius_product_option_value DROP FOREIGN KEY FK_F7FF7D4BA7C41D6F');
- $this->addSql('ALTER TABLE sylius_product_options DROP FOREIGN KEY FK_2B5FF009A7C41D6F');
- $this->addSql('ALTER TABLE sylius_product_option_value_translation DROP FOREIGN KEY FK_8D4382DC2C2AC5D3');
- $this->addSql('ALTER TABLE sylius_product_variant_option_value DROP FOREIGN KEY FK_76CDAFA1D957CA06');
- $this->addSql('ALTER TABLE sylius_product_variant DROP FOREIGN KEY FK_A29B5239DF894ED');
- $this->addSql('ALTER TABLE sylius_shipping_method DROP FOREIGN KEY FK_5FB0EE119DF894ED');
- $this->addSql('ALTER TABLE sylius_tax_rate DROP FOREIGN KEY FK_3CD86B2E12469DE2');
- $this->addSql('ALTER TABLE sylius_product_variant DROP FOREIGN KEY FK_A29B5239E2D1A41');
- $this->addSql('ALTER TABLE sylius_shipping_method DROP FOREIGN KEY FK_5FB0EE1112469DE2');
- $this->addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD47048FD0F');
- $this->addSql('ALTER TABLE sylius_province DROP FOREIGN KEY FK_B5618FE4F92F3E70');
- $this->addSql('ALTER TABLE sylius_zone_member DROP FOREIGN KEY FK_E8B5ABF34B0E929B');
- $this->addSql('ALTER TABLE sylius_channel DROP FOREIGN KEY FK_16C8119EA978C17');
- $this->addSql('ALTER TABLE sylius_shipping_method DROP FOREIGN KEY FK_5FB0EE119F2C3FAB');
- $this->addSql('ALTER TABLE sylius_tax_rate DROP FOREIGN KEY FK_3CD86B2E9F2C3FAB');
- $this->addSql('ALTER TABLE sylius_customer DROP FOREIGN KEY FK_7E82D5E6D2919A68');
- $this->addSql('ALTER TABLE sylius_customer DROP FOREIGN KEY FK_7E82D5E6BD94FB16');
- $this->addSql('ALTER TABLE sylius_order DROP FOREIGN KEY FK_6196A1F94D4CFF2B');
- $this->addSql('ALTER TABLE sylius_order DROP FOREIGN KEY FK_6196A1F979D0C0E4');
- $this->addSql('ALTER TABLE sylius_api_access_token DROP FOREIGN KEY FK_7D83AA7FA76ED395');
- $this->addSql('ALTER TABLE sylius_api_auth_code DROP FOREIGN KEY FK_C8404179A76ED395');
- $this->addSql('ALTER TABLE sylius_api_refresh_token DROP FOREIGN KEY FK_44578525A76ED395');
- $this->addSql('ALTER TABLE sylius_channel_currencies DROP FOREIGN KEY FK_AE491F9372F5A1AA');
- $this->addSql('ALTER TABLE sylius_channel_locales DROP FOREIGN KEY FK_786B7A8472F5A1AA');
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP FOREIGN KEY FK_7801820C72F5A1AA');
- $this->addSql('ALTER TABLE sylius_order DROP FOREIGN KEY FK_6196A1F972F5A1AA');
- $this->addSql('ALTER TABLE sylius_payment_method_channels DROP FOREIGN KEY FK_543AC0CC72F5A1AA');
- $this->addSql('ALTER TABLE sylius_product_channels DROP FOREIGN KEY FK_F9EF269B72F5A1AA');
- $this->addSql('ALTER TABLE sylius_promotion_channels DROP FOREIGN KEY FK_1A044F6472F5A1AA');
- $this->addSql('ALTER TABLE sylius_shipping_method_channels DROP FOREIGN KEY FK_2D98333572F5A1AA');
- $this->addSql('ALTER TABLE sylius_address DROP FOREIGN KEY FK_B97FF0589395C3F3');
- $this->addSql('ALTER TABLE sylius_order DROP FOREIGN KEY FK_6196A1F99395C3F3');
- $this->addSql('ALTER TABLE sylius_product_review DROP FOREIGN KEY FK_C7056A99F675F31B');
- $this->addSql('ALTER TABLE sylius_shop_user DROP FOREIGN KEY FK_7C2B74809395C3F3');
- $this->addSql('ALTER TABLE sylius_adjustment DROP FOREIGN KEY FK_ACA6E0F28D9F6D38');
- $this->addSql('ALTER TABLE sylius_promotion_order DROP FOREIGN KEY FK_BF9CF6FB8D9F6D38');
- $this->addSql('ALTER TABLE sylius_order_item DROP FOREIGN KEY FK_77B587ED8D9F6D38');
- $this->addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD48D9F6D38');
- $this->addSql('ALTER TABLE sylius_shipment DROP FOREIGN KEY FK_FD707B338D9F6D38');
- $this->addSql('ALTER TABLE sylius_adjustment DROP FOREIGN KEY FK_ACA6E0F2E415FB15');
- $this->addSql('ALTER TABLE sylius_order_item_unit DROP FOREIGN KEY FK_82BF226EE415FB15');
- $this->addSql('ALTER TABLE sylius_adjustment DROP FOREIGN KEY FK_ACA6E0F2F720C233');
- $this->addSql('ALTER TABLE sylius_payment_method_translation DROP FOREIGN KEY FK_966BE3A12C2AC5D3');
- $this->addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD419883967');
- $this->addSql('ALTER TABLE sylius_payment_method_channels DROP FOREIGN KEY FK_543AC0CC5AA1164F');
- $this->addSql('ALTER TABLE sylius_product_association DROP FOREIGN KEY FK_48E9CDAB4584665A');
- $this->addSql('ALTER TABLE sylius_product_association_product DROP FOREIGN KEY FK_A427B9834584665A');
- $this->addSql('ALTER TABLE sylius_product_attribute_value DROP FOREIGN KEY FK_8A053E544584665A');
- $this->addSql('ALTER TABLE sylius_product_channels DROP FOREIGN KEY FK_F9EF269B4584665A');
- $this->addSql('ALTER TABLE sylius_product_options DROP FOREIGN KEY FK_2B5FF0094584665A');
- $this->addSql('ALTER TABLE sylius_product_image DROP FOREIGN KEY FK_88C64B2D7E3C61F9');
- $this->addSql('ALTER TABLE sylius_product_review DROP FOREIGN KEY FK_C7056A994584665A');
- $this->addSql('ALTER TABLE sylius_product_taxon DROP FOREIGN KEY FK_169C6CD94584665A');
- $this->addSql('ALTER TABLE sylius_product_translation DROP FOREIGN KEY FK_105A9082C2AC5D3');
- $this->addSql('ALTER TABLE sylius_product_variant DROP FOREIGN KEY FK_A29B5234584665A');
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP FOREIGN KEY FK_7801820CA80EF684');
- $this->addSql('ALTER TABLE sylius_order_item DROP FOREIGN KEY FK_77B587ED3B69A9AF');
- $this->addSql('ALTER TABLE sylius_product_variant_option_value DROP FOREIGN KEY FK_76CDAFA13B69A9AF');
- $this->addSql('ALTER TABLE sylius_promotion_action DROP FOREIGN KEY FK_933D0915139DF194');
- $this->addSql('ALTER TABLE sylius_promotion_rule DROP FOREIGN KEY FK_2C188EA8139DF194');
- $this->addSql('ALTER TABLE sylius_promotion_order DROP FOREIGN KEY FK_BF9CF6FB139DF194');
- $this->addSql('ALTER TABLE sylius_promotion_channels DROP FOREIGN KEY FK_1A044F64139DF194');
- $this->addSql('ALTER TABLE sylius_promotion_coupon DROP FOREIGN KEY FK_B04EBA85139DF194');
- $this->addSql('ALTER TABLE sylius_order DROP FOREIGN KEY FK_6196A1F917B24436');
- $this->addSql('ALTER TABLE sylius_order_item_unit DROP FOREIGN KEY FK_82BF226E7BE036FC');
- $this->addSql('ALTER TABLE sylius_shipping_method_translation DROP FOREIGN KEY FK_2B37DB3D2C2AC5D3');
- $this->addSql('ALTER TABLE sylius_shipment DROP FOREIGN KEY FK_FD707B3319883967');
- $this->addSql('ALTER TABLE sylius_shipping_method_channels DROP FOREIGN KEY FK_2D9833355F7D6850');
- $this->addSql('ALTER TABLE sylius_user_oauth DROP FOREIGN KEY FK_C3471B78A76ED395');
- $this->addSql('ALTER TABLE sylius_taxon_translation DROP FOREIGN KEY FK_1487DFCF2C2AC5D3');
- $this->addSql('ALTER TABLE sylius_product DROP FOREIGN KEY FK_677B9B74731E505');
- $this->addSql('ALTER TABLE sylius_product_taxon DROP FOREIGN KEY FK_169C6CD9DE13F470');
- $this->addSql('ALTER TABLE sylius_taxon DROP FOREIGN KEY FK_CFD811CAA977936C');
- $this->addSql('ALTER TABLE sylius_taxon DROP FOREIGN KEY FK_CFD811CA727ACA70');
- $this->addSql('ALTER TABLE sylius_taxon_image DROP FOREIGN KEY FK_DBE52B287E3C61F9');
- $this->addSql('ALTER TABLE sylius_api_access_token DROP FOREIGN KEY FK_7D83AA7F19EB6921');
- $this->addSql('ALTER TABLE sylius_api_auth_code DROP FOREIGN KEY FK_C840417919EB6921');
- $this->addSql('ALTER TABLE sylius_api_refresh_token DROP FOREIGN KEY FK_4457852519EB6921');
- $this->addSql('DROP TABLE sylius_adjustment');
- $this->addSql('DROP TABLE sylius_order_sequence');
- $this->addSql('DROP TABLE sylius_currency');
- $this->addSql('DROP TABLE sylius_exchange_rate');
- $this->addSql('DROP TABLE sylius_locale');
- $this->addSql('DROP TABLE sylius_product_association');
- $this->addSql('DROP TABLE sylius_product_association_product');
- $this->addSql('DROP TABLE sylius_product_association_type');
- $this->addSql('DROP TABLE sylius_product_attribute');
- $this->addSql('DROP TABLE sylius_product_attribute_translation');
- $this->addSql('DROP TABLE sylius_product_attribute_value');
- $this->addSql('DROP TABLE sylius_product_option');
- $this->addSql('DROP TABLE sylius_product_option_translation');
- $this->addSql('DROP TABLE sylius_product_option_value');
- $this->addSql('DROP TABLE sylius_product_option_value_translation');
- $this->addSql('DROP TABLE sylius_tax_category');
- $this->addSql('DROP TABLE sylius_shipping_category');
- $this->addSql('DROP TABLE sylius_shipping_method_translation');
- $this->addSql('DROP TABLE sylius_credit_card');
- $this->addSql('DROP TABLE sylius_payment_method_translation');
- $this->addSql('DROP TABLE sylius_promotion_action');
- $this->addSql('DROP TABLE sylius_promotion_rule');
- $this->addSql('DROP TABLE sylius_country');
- $this->addSql('DROP TABLE sylius_province');
- $this->addSql('DROP TABLE sylius_zone');
- $this->addSql('DROP TABLE sylius_zone_member');
- $this->addSql('DROP TABLE sylius_taxon_translation');
- $this->addSql('DROP TABLE sylius_user_oauth');
- $this->addSql('DROP TABLE sylius_customer_group');
- $this->addSql('DROP TABLE sylius_address');
- $this->addSql('DROP TABLE sylius_admin_user');
- $this->addSql('DROP TABLE sylius_channel');
- $this->addSql('DROP TABLE sylius_channel_currencies');
- $this->addSql('DROP TABLE sylius_channel_locales');
- $this->addSql('DROP TABLE sylius_channel_pricing');
- $this->addSql('DROP TABLE sylius_customer');
- $this->addSql('DROP TABLE sylius_order');
- $this->addSql('DROP TABLE sylius_promotion_order');
- $this->addSql('DROP TABLE sylius_order_item');
- $this->addSql('DROP TABLE sylius_order_item_unit');
- $this->addSql('DROP TABLE sylius_payment');
- $this->addSql('DROP TABLE sylius_payment_method');
- $this->addSql('DROP TABLE sylius_payment_method_channels');
- $this->addSql('DROP TABLE sylius_product');
- $this->addSql('DROP TABLE sylius_product_channels');
- $this->addSql('DROP TABLE sylius_product_options');
- $this->addSql('DROP TABLE sylius_product_image');
- $this->addSql('DROP TABLE sylius_product_review');
- $this->addSql('DROP TABLE sylius_product_taxon');
- $this->addSql('DROP TABLE sylius_product_translation');
- $this->addSql('DROP TABLE sylius_product_variant');
- $this->addSql('DROP TABLE sylius_product_variant_option_value');
- $this->addSql('DROP TABLE sylius_promotion');
- $this->addSql('DROP TABLE sylius_promotion_channels');
- $this->addSql('DROP TABLE sylius_promotion_coupon');
- $this->addSql('DROP TABLE sylius_shipment');
- $this->addSql('DROP TABLE sylius_shipping_method');
- $this->addSql('DROP TABLE sylius_shipping_method_channels');
- $this->addSql('DROP TABLE sylius_shop_user');
- $this->addSql('DROP TABLE sylius_taxon');
- $this->addSql('DROP TABLE sylius_taxon_image');
- $this->addSql('DROP TABLE sylius_tax_rate');
- $this->addSql('DROP TABLE sylius_gateway_config');
- $this->addSql('DROP TABLE sylius_payment_security_token');
- $this->addSql('DROP TABLE sylius_api_access_token');
- $this->addSql('DROP TABLE sylius_api_auth_code');
- $this->addSql('DROP TABLE sylius_api_client');
- $this->addSql('DROP TABLE sylius_api_refresh_token');
- }
-}
diff --git a/app/migrations/Version20161209095131.php b/app/migrations/Version20161209095131.php
deleted file mode 100644
index e37ceda8b2..0000000000
--- a/app/migrations/Version20161209095131.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql("UPDATE sylius_zone SET scope = 'all' WHERE scope IS NULL");
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql("UPDATE sylius_zone SET scope = NULL WHERE scope = 'all'");
- }
-}
diff --git a/app/migrations/Version20161214153137.php b/app/migrations/Version20161214153137.php
deleted file mode 100644
index d278353249..0000000000
--- a/app/migrations/Version20161214153137.php
+++ /dev/null
@@ -1,49 +0,0 @@
-container = $container;
- }
-
- public function up(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
-
- $this->addSql('CREATE TABLE sylius_product_variant_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_8DC18EDC2C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_variant_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_product_variant_translation ADD CONSTRAINT FK_8DC18EDC2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE');
- $this->addSql('INSERT INTO sylius_product_variant_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_variant WHERE sylius_product_variant.name IS NOT null');
- $this->addSql('ALTER TABLE sylius_product_variant DROP name');
- }
-
- public function down(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
-
- $this->addSql('ALTER TABLE sylius_product_variant ADD name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci');
- $this->addSql('UPDATE sylius_product_variant SET name = (SELECT name FROM sylius_product_variant_translation WHERE sylius_product_variant_translation.translatable_id = sylius_product_variant.id AND sylius_product_variant_translation.locale = "' . $defaultLocale . '")');
- $this->addSql('DROP TABLE sylius_product_variant_translation');
- }
-}
diff --git a/app/migrations/Version20161215103325.php b/app/migrations/Version20161215103325.php
deleted file mode 100644
index 3061bb3613..0000000000
--- a/app/migrations/Version20161215103325.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_channel ADD contact_email VARCHAR(255) DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel DROP contact_email');
- }
-}
diff --git a/app/migrations/Version20161219160441.php b/app/migrations/Version20161219160441.php
deleted file mode 100644
index 1e4c3044b5..0000000000
--- a/app/migrations/Version20161219160441.php
+++ /dev/null
@@ -1,49 +0,0 @@
-container = $container;
- }
-
- public function up(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
-
- $this->addSql('CREATE TABLE sylius_product_association_type_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_4F618E52C2AC5D3 (translatable_id), UNIQUE INDEX sylius_product_association_type_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_product_association_type_translation ADD CONSTRAINT FK_4F618E52C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES sylius_product_association_type (id) ON DELETE CASCADE');
- $this->addSql('INSERT INTO sylius_product_association_type_translation (translatable_id, name, locale) SELECT id, name, "' . $defaultLocale . '" from sylius_product_association_type WHERE sylius_product_association_type.name IS NOT null');
- $this->addSql('ALTER TABLE sylius_product_association_type DROP name');
- }
-
- public function down(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
-
- $this->addSql('ALTER TABLE sylius_product_association_type ADD name VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci');
- $this->addSql('UPDATE sylius_product_association_type SET name = (SELECT name FROM sylius_product_association_type_translation WHERE sylius_product_association_type_translation.translatable_id = sylius_product_association_type.id AND sylius_product_association_type_translation.locale = "' . $defaultLocale . '")');
- $this->addSql('DROP TABLE sylius_product_association_type_translation');
- }
-}
diff --git a/app/migrations/Version20161220092422.php b/app/migrations/Version20161220092422.php
deleted file mode 100644
index a2c1f00f52..0000000000
--- a/app/migrations/Version20161220092422.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('CREATE TABLE sylius_address_log_entries (id INT AUTO_INCREMENT NOT NULL, action VARCHAR(255) NOT NULL, loggedAt DATETIME NOT NULL, objectId VARCHAR(64) DEFAULT NULL, objectClass VARCHAR(255) NOT NULL, version INT NOT NULL, data LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', username VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP TABLE sylius_address_log_entries');
- }
-}
diff --git a/app/migrations/Version20161221133514.php b/app/migrations/Version20161221133514.php
deleted file mode 100644
index c4b3108c92..0000000000
--- a/app/migrations/Version20161221133514.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_product_option ADD position INT NOT NULL');
- $this->addSql('SET @row_number = -1');
- $this->addSql('UPDATE sylius_product_option SET position = @row_number := @row_number + 1');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_option DROP position');
- }
-}
diff --git a/app/migrations/Version20161223091334.php b/app/migrations/Version20161223091334.php
deleted file mode 100644
index e613871605..0000000000
--- a/app/migrations/Version20161223091334.php
+++ /dev/null
@@ -1,44 +0,0 @@
-addSql('ALTER TABLE sylius_product_variant ADD position INT NOT NULL');
- $this->addSql('SET @row_number = -1');
- $this->addSql('CREATE TEMPORARY TABLE IF NOT EXISTS variants_count
- SELECT sylius_product.id AS product_id, COUNT(sylius_product_variant.id) AS `row_number` FROM sylius_product
- INNER JOIN sylius_product_variant ON sylius_product.id = sylius_product_variant.product_id
- GROUP BY sylius_product.id'
- );
- $this->addSql('UPDATE sylius_product_variant
- JOIN variants_count ON variants_count.product_id = sylius_product_variant.product_id
- SET position = CASE
- WHEN variants_count.row_number = 1 THEN (@row_number := -1) + 1
- WHEN @row_number + 1 < variants_count.row_number then @row_number := @row_number + 1
- ELSE @row_number := 0
- END'
- );
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_variant DROP position');
- }
-}
diff --git a/app/migrations/Version20161223164558.php b/app/migrations/Version20161223164558.php
deleted file mode 100644
index 0b4cdd2f60..0000000000
--- a/app/migrations/Version20161223164558.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_shipping_method ADD archived_at DATETIME DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_shipping_method DROP archived_at');
- }
-}
diff --git a/app/migrations/Version20170103120334.php b/app/migrations/Version20170103120334.php
deleted file mode 100644
index 4ea4ae7b1f..0000000000
--- a/app/migrations/Version20170103120334.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_product_attribute_value ADD json_value LONGTEXT DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_attribute_value DROP json_value');
- }
-}
diff --git a/app/migrations/Version20170109143010.php b/app/migrations/Version20170109143010.php
deleted file mode 100644
index de819de747..0000000000
--- a/app/migrations/Version20170109143010.php
+++ /dev/null
@@ -1,43 +0,0 @@
-container = $container;
- }
-
- public function up(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
-
- $this->addSql('ALTER TABLE sylius_product_attribute_value ADD locale_code VARCHAR(255) NOT NULL');
- $this->addSql('UPDATE sylius_product_attribute_value SET locale_code = "' . $defaultLocale . '"');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_attribute_value DROP locale_code');
- }
-}
diff --git a/app/migrations/Version20170110120125.php b/app/migrations/Version20170110120125.php
deleted file mode 100644
index 299f8f9653..0000000000
--- a/app/migrations/Version20170110120125.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD419883967');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD419883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD419883967');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD419883967 FOREIGN KEY (method_id) REFERENCES sylius_payment_method (id) ON DELETE SET NULL');
- }
-}
diff --git a/app/migrations/Version20170116215417.php b/app/migrations/Version20170116215417.php
deleted file mode 100644
index e73c07717d..0000000000
--- a/app/migrations/Version20170116215417.php
+++ /dev/null
@@ -1,34 +0,0 @@
-addSql('ALTER TABLE sylius_payment_method ADD gateway_config_id INT DEFAULT NULL, DROP gateway');
- $this->addSql('ALTER TABLE sylius_payment_method ADD CONSTRAINT FK_A75B0B0DF23D6140 FOREIGN KEY (gateway_config_id) REFERENCES sylius_gateway_config (id) ON DELETE SET NULL');
- $this->addSql('CREATE INDEX IDX_A75B0B0DF23D6140 ON sylius_payment_method (gateway_config_id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_payment_method DROP FOREIGN KEY FK_A75B0B0DF23D6140');
- $this->addSql('DROP INDEX IDX_A75B0B0DF23D6140 ON sylius_payment_method');
- $this->addSql('ALTER TABLE sylius_payment_method ADD gateway VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci, DROP gateway_config_id');
- }
-}
diff --git a/app/migrations/Version20170117075436.php b/app/migrations/Version20170117075436.php
deleted file mode 100644
index dea29c24c6..0000000000
--- a/app/migrations/Version20170117075436.php
+++ /dev/null
@@ -1,31 +0,0 @@
-addSql('ALTER TABLE sylius_product_variant ADD shipping_required TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_product_variant SET shipping_required = 1');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_variant DROP shipping_required');
- }
-}
diff --git a/app/migrations/Version20170120164250.php b/app/migrations/Version20170120164250.php
deleted file mode 100644
index 0902e12beb..0000000000
--- a/app/migrations/Version20170120164250.php
+++ /dev/null
@@ -1,36 +0,0 @@
-addSql('ALTER TABLE sylius_payment DROP FOREIGN KEY FK_D9191BD47048FD0F');
- $this->addSql('DROP TABLE sylius_credit_card');
- $this->addSql('DROP INDEX IDX_D9191BD47048FD0F ON sylius_payment');
- $this->addSql('ALTER TABLE sylius_payment DROP credit_card_id');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('CREATE TABLE sylius_credit_card (id INT AUTO_INCREMENT NOT NULL, token VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, type VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, cardholder_name VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, number VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, security_code VARCHAR(255) DEFAULT NULL COLLATE utf8_unicode_ci, expiry_month INT DEFAULT NULL, expiry_year INT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_payment ADD credit_card_id INT DEFAULT NULL');
- $this->addSql('ALTER TABLE sylius_payment ADD CONSTRAINT FK_D9191BD47048FD0F FOREIGN KEY (credit_card_id) REFERENCES sylius_credit_card (id) ON DELETE SET NULL');
- $this->addSql('CREATE INDEX IDX_D9191BD47048FD0F ON sylius_payment (credit_card_id)');
- }
-}
diff --git a/app/migrations/Version20170124221955.php b/app/migrations/Version20170124221955.php
deleted file mode 100644
index d3a9649697..0000000000
--- a/app/migrations/Version20170124221955.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_locale DROP enabled');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_locale ADD enabled TINYINT(1) NOT NULL');
- }
-}
diff --git a/app/migrations/Version20170201094058.php b/app/migrations/Version20170201094058.php
deleted file mode 100644
index 9a6fe84605..0000000000
--- a/app/migrations/Version20170201094058.php
+++ /dev/null
@@ -1,36 +0,0 @@
-addSql('DROP INDEX product_image_code_idx ON sylius_product_image');
- $this->addSql('DROP INDEX taxon_image_code_idx ON sylius_taxon_image');
- $this->addSql('ALTER TABLE sylius_product_image CHANGE code `type` VARCHAR(255)');
- $this->addSql('ALTER TABLE sylius_taxon_image CHANGE code `type` VARCHAR(255)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_image CHANGE `type` code VARCHAR(255) NOT NULL');
- $this->addSql('ALTER TABLE sylius_taxon_image CHANGE `type` code VARCHAR(255) NOT NULL');
- $this->addSql('CREATE UNIQUE INDEX product_image_code_idx ON sylius_product_image (owner_id, code)');
- $this->addSql('CREATE UNIQUE INDEX taxon_image_code_idx ON sylius_taxon_image (owner_id, code)');
- }
-}
diff --git a/app/migrations/Version20170206122839.php b/app/migrations/Version20170206122839.php
deleted file mode 100644
index 56b4385726..0000000000
--- a/app/migrations/Version20170206122839.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_order_sequence ADD version INT DEFAULT 1 NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_order_sequence DROP version');
- }
-}
diff --git a/app/migrations/Version20170206141520.php b/app/migrations/Version20170206141520.php
deleted file mode 100644
index 3984a716a9..0000000000
--- a/app/migrations/Version20170206141520.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_product_variant ADD version INT DEFAULT 1 NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_variant DROP version');
- }
-}
diff --git a/app/migrations/Version20170208102345.php b/app/migrations/Version20170208102345.php
deleted file mode 100644
index 5baaadcdab..0000000000
--- a/app/migrations/Version20170208102345.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_product DROP available_on, DROP available_until');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product ADD available_on DATETIME DEFAULT NULL, ADD available_until DATETIME DEFAULT NULL');
- }
-}
diff --git a/app/migrations/Version20170208103250.php b/app/migrations/Version20170208103250.php
deleted file mode 100644
index deac78d1bc..0000000000
--- a/app/migrations/Version20170208103250.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('CREATE UNIQUE INDEX product_variant_channel_idx ON sylius_channel_pricing (product_variant_id, channel_id)');
- $this->addSql('CREATE UNIQUE INDEX product_taxon_idx ON sylius_product_taxon (product_id, taxon_id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP INDEX product_variant_channel_idx ON sylius_channel_pricing');
- $this->addSql('DROP INDEX product_taxon_idx ON sylius_product_taxon');
- }
-}
diff --git a/app/migrations/Version20170214095710.php b/app/migrations/Version20170214095710.php
deleted file mode 100644
index f05acc58fe..0000000000
--- a/app/migrations/Version20170214095710.php
+++ /dev/null
@@ -1,34 +0,0 @@
-addSql('ALTER TABLE sylius_product_review DROP FOREIGN KEY FK_C7056A99F675F31B');
- $this->addSql('ALTER TABLE sylius_product_review CHANGE author_id author_id INT NOT NULL');
- $this->addSql('ALTER TABLE sylius_product_review ADD CONSTRAINT FK_C7056A99F675F31B FOREIGN KEY (author_id) REFERENCES sylius_customer (id) ON DELETE CASCADE');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_review DROP FOREIGN KEY FK_C7056A99F675F31B');
- $this->addSql('ALTER TABLE sylius_product_review CHANGE author_id author_id INT DEFAULT NULL');
- $this->addSql('ALTER TABLE sylius_product_review ADD CONSTRAINT FK_C7056A99F675F31B FOREIGN KEY (author_id) REFERENCES sylius_customer (id)');
- }
-}
diff --git a/app/migrations/Version20170214104908.php b/app/migrations/Version20170214104908.php
deleted file mode 100644
index f11e5d1ce6..0000000000
--- a/app/migrations/Version20170214104908.php
+++ /dev/null
@@ -1,31 +0,0 @@
-addSql('ALTER TABLE sylius_channel ADD skipping_shipping_step_allowed TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_channel SET skipping_shipping_step_allowed = 0');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel DROP skipping_shipping_step_allowed');
- }
-}
diff --git a/app/migrations/Version20170215143031.php b/app/migrations/Version20170215143031.php
deleted file mode 100644
index cc5bc06303..0000000000
--- a/app/migrations/Version20170215143031.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('DROP INDEX UNIQ_105A908989D9B62 ON sylius_product_translation');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_105A9084180C698989D9B62 ON sylius_product_translation (locale, slug)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP INDEX UNIQ_105A9084180C698989D9B62 ON sylius_product_translation');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_105A908989D9B62 ON sylius_product_translation (slug)');
- }
-}
diff --git a/app/migrations/Version20170217141621.php b/app/migrations/Version20170217141621.php
deleted file mode 100644
index 59a3514d23..0000000000
--- a/app/migrations/Version20170217141621.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_exchange_rate ADD created_at DATETIME DEFAULT NULL, ADD updated_at DATETIME DEFAULT NULL');
- $this->addSql('UPDATE sylius_exchange_rate SET created_at = NOW()');
- $this->addSql('ALTER TABLE sylius_exchange_rate MODIFY created_at DATETIME NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_exchange_rate DROP created_at, DROP updated_at');
- }
-}
diff --git a/app/migrations/Version20170220150813.php b/app/migrations/Version20170220150813.php
deleted file mode 100644
index deb42bb0af..0000000000
--- a/app/migrations/Version20170220150813.php
+++ /dev/null
@@ -1,31 +0,0 @@
-addSql('ALTER TABLE sylius_channel ADD account_verification_required TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_channel SET account_verification_required = 1');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel DROP account_verification_required');
- }
-}
diff --git a/app/migrations/Version20170223071604.php b/app/migrations/Version20170223071604.php
deleted file mode 100644
index 33228c3050..0000000000
--- a/app/migrations/Version20170223071604.php
+++ /dev/null
@@ -1,44 +0,0 @@
-addSql('ALTER TABLE sylius_channel_pricing ADD channel_code VARCHAR(255) NOT NULL;');
- $this->addSql('UPDATE sylius_channel_pricing, sylius_channel SET sylius_channel_pricing.channel_code = sylius_channel.code WHERE sylius_channel.id = sylius_channel_pricing.channel_id');
-
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP FOREIGN KEY FK_7801820C72F5A1AA');
- $this->addSql('DROP INDEX IDX_7801820C72F5A1AA ON sylius_channel_pricing');
- $this->addSql('DROP INDEX product_variant_channel_idx ON sylius_channel_pricing');
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP channel_id');
- $this->addSql('CREATE UNIQUE INDEX product_variant_channel_idx ON sylius_channel_pricing (product_variant_id, channel_code)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP INDEX product_variant_channel_idx ON sylius_channel_pricing');
- $this->addSql('ALTER TABLE sylius_channel_pricing ADD channel_id INT NOT NULL');
- $this->addSql('UPDATE sylius_channel_pricing, sylius_channel SET sylius_channel_pricing.channel_id = sylius_channel.id WHERE sylius_channel.code = sylius_channel_pricing.channel_code');
-
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP channel_code');
- $this->addSql('ALTER TABLE sylius_channel_pricing ADD CONSTRAINT FK_7801820C72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('CREATE INDEX IDX_7801820C72F5A1AA ON sylius_channel_pricing (channel_id)');
- $this->addSql('CREATE UNIQUE INDEX product_variant_channel_idx ON sylius_channel_pricing (product_variant_id, channel_id)');
- }
-}
diff --git a/app/migrations/Version20170301135010.php b/app/migrations/Version20170301135010.php
deleted file mode 100644
index 9a16bfd252..0000000000
--- a/app/migrations/Version20170301135010.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('CREATE TABLE sylius_product_image_product_variants (image_id INT NOT NULL, variant_id INT NOT NULL, INDEX IDX_8FFDAE8D3DA5256D (image_id), INDEX IDX_8FFDAE8D3B69A9AF (variant_id), PRIMARY KEY(image_id, variant_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_product_image_product_variants ADD CONSTRAINT FK_8FFDAE8D3DA5256D FOREIGN KEY (image_id) REFERENCES sylius_product_image (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_product_image_product_variants ADD CONSTRAINT FK_8FFDAE8D3B69A9AF FOREIGN KEY (variant_id) REFERENCES sylius_product_variant (id) ON DELETE CASCADE');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP TABLE sylius_product_image_product_variants');
- }
-}
diff --git a/app/migrations/Version20170303170201.php b/app/migrations/Version20170303170201.php
deleted file mode 100644
index aec28bddd0..0000000000
--- a/app/migrations/Version20170303170201.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_channel_pricing ADD original_price INT');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel_pricing DROP original_price');
- }
-}
diff --git a/app/migrations/Version20170313125424.php b/app/migrations/Version20170313125424.php
deleted file mode 100644
index 1b59ec8f94..0000000000
--- a/app/migrations/Version20170313125424.php
+++ /dev/null
@@ -1,96 +0,0 @@
-addSql('ALTER TABLE sylius_api_access_token RENAME sylius_admin_api_access_token');
- $this->addSql('ALTER TABLE sylius_api_auth_code RENAME sylius_admin_api_auth_code');
- $this->addSql('ALTER TABLE sylius_api_client RENAME sylius_admin_api_client');
- $this->addSql('ALTER TABLE sylius_api_refresh_token RENAME sylius_admin_api_refresh_token');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7F19EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7FA76ED395');
- $this->addSql('DROP INDEX UNIQ_7D83AA7F5F37A13B ON sylius_admin_api_access_token');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_2AA4915D5F37A13B ON sylius_admin_api_access_token (token)');
- $this->addSql('DROP INDEX IDX_7D83AA7F19EB6921 ON sylius_admin_api_access_token');
- $this->addSql('CREATE INDEX IDX_2AA4915D19EB6921 ON sylius_admin_api_access_token (client_id)');
- $this->addSql('DROP INDEX IDX_7D83AA7FA76ED395 ON sylius_admin_api_access_token');
- $this->addSql('CREATE INDEX IDX_2AA4915DA76ED395 ON sylius_admin_api_access_token (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915D19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915DA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C840417919EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C8404179A76ED395');
- $this->addSql('DROP INDEX UNIQ_C84041795F37A13B ON sylius_admin_api_auth_code');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_E366D8485F37A13B ON sylius_admin_api_auth_code (token)');
- $this->addSql('DROP INDEX IDX_C840417919EB6921 ON sylius_admin_api_auth_code');
- $this->addSql('CREATE INDEX IDX_E366D84819EB6921 ON sylius_admin_api_auth_code (client_id)');
- $this->addSql('DROP INDEX IDX_C8404179A76ED395 ON sylius_admin_api_auth_code');
- $this->addSql('CREATE INDEX IDX_E366D848A76ED395 ON sylius_admin_api_auth_code (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D84819EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D848A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_4457852519EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_44578525A76ED395');
- $this->addSql('DROP INDEX UNIQ_445785255F37A13B ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_9160E3FA5F37A13B ON sylius_admin_api_refresh_token (token)');
- $this->addSql('DROP INDEX IDX_4457852519EB6921 ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE INDEX IDX_9160E3FA19EB6921 ON sylius_admin_api_refresh_token (client_id)');
- $this->addSql('DROP INDEX IDX_44578525A76ED395 ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE INDEX IDX_9160E3FAA76ED395 ON sylius_admin_api_refresh_token (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_2AA4915D19EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_2AA4915DA76ED395');
- $this->addSql('DROP INDEX UNIQ_2AA4915D5F37A13B ON sylius_admin_api_access_token');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_7D83AA7F5F37A13B ON sylius_admin_api_access_token (token)');
- $this->addSql('DROP INDEX IDX_2AA4915D19EB6921 ON sylius_admin_api_access_token');
- $this->addSql('CREATE INDEX IDX_7D83AA7F19EB6921 ON sylius_admin_api_access_token (client_id)');
- $this->addSql('DROP INDEX IDX_2AA4915DA76ED395 ON sylius_admin_api_access_token');
- $this->addSql('CREATE INDEX IDX_7D83AA7FA76ED395 ON sylius_admin_api_access_token (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_7D83AA7F19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_7D83AA7FA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_E366D84819EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_E366D848A76ED395');
- $this->addSql('DROP INDEX UNIQ_E366D8485F37A13B ON sylius_admin_api_auth_code');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_C84041795F37A13B ON sylius_admin_api_auth_code (token)');
- $this->addSql('DROP INDEX IDX_E366D84819EB6921 ON sylius_admin_api_auth_code');
- $this->addSql('CREATE INDEX IDX_C840417919EB6921 ON sylius_admin_api_auth_code (client_id)');
- $this->addSql('DROP INDEX IDX_E366D848A76ED395 ON sylius_admin_api_auth_code');
- $this->addSql('CREATE INDEX IDX_C8404179A76ED395 ON sylius_admin_api_auth_code (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_C840417919EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_C8404179A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_9160E3FA19EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_9160E3FAA76ED395');
- $this->addSql('DROP INDEX UNIQ_9160E3FA5F37A13B ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_445785255F37A13B ON sylius_admin_api_refresh_token (token)');
- $this->addSql('DROP INDEX IDX_9160E3FA19EB6921 ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE INDEX IDX_4457852519EB6921 ON sylius_admin_api_refresh_token (client_id)');
- $this->addSql('DROP INDEX IDX_9160E3FAA76ED395 ON sylius_admin_api_refresh_token');
- $this->addSql('CREATE INDEX IDX_44578525A76ED395 ON sylius_admin_api_refresh_token (user_id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_4457852519EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_44578525A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token RENAME sylius_api_access_token');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code RENAME sylius_api_auth_code');
- $this->addSql('ALTER TABLE sylius_admin_api_client RENAME sylius_api_client');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token RENAME sylius_api_refresh_token');
- }
-}
diff --git a/app/migrations/Version20170321131352.php b/app/migrations/Version20170321131352.php
deleted file mode 100644
index 97d740e046..0000000000
--- a/app/migrations/Version20170321131352.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_product_variant DROP available_on, DROP available_until');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_variant ADD available_on DATETIME DEFAULT NULL, ADD available_until DATETIME DEFAULT NULL');
- }
-}
diff --git a/app/migrations/Version20170327135945.php b/app/migrations/Version20170327135945.php
deleted file mode 100644
index 1285addf13..0000000000
--- a/app/migrations/Version20170327135945.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_taxon ADD created_at DATETIME DEFAULT NULL, ADD updated_at DATETIME DEFAULT NULL');
- $this->addSql('UPDATE sylius_taxon SET created_at = NOW()');
- $this->addSql('ALTER TABLE sylius_taxon MODIFY created_at DATETIME NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_taxon DROP created_at, DROP updated_at');
- }
-}
diff --git a/app/migrations/Version20170401200415.php b/app/migrations/Version20170401200415.php
deleted file mode 100644
index 656088b46b..0000000000
--- a/app/migrations/Version20170401200415.php
+++ /dev/null
@@ -1,31 +0,0 @@
-addSql('ALTER TABLE sylius_channel ADD skipping_payment_step_allowed TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_channel SET skipping_payment_step_allowed = 0');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel DROP skipping_payment_step_allowed');
- }
-}
diff --git a/app/migrations/Version20170518123056.php b/app/migrations/Version20170518123056.php
deleted file mode 100644
index a5c8a893df..0000000000
--- a/app/migrations/Version20170518123056.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_address_log_entries CHANGE loggedat logged_at DATETIME NOT NULL, CHANGE objectid object_id VARCHAR(64) DEFAULT NULL, CHANGE objectclass object_class VARCHAR(255) NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_address_log_entries CHANGE logged_at loggedAt DATETIME NOT NULL, CHANGE object_id objectId VARCHAR(64) DEFAULT NULL COLLATE utf8_unicode_ci, CHANGE object_class objectClass VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci');
- }
-}
diff --git a/app/migrations/Version20170711151342.php b/app/migrations/Version20170711151342.php
deleted file mode 100644
index 85a0187c12..0000000000
--- a/app/migrations/Version20170711151342.php
+++ /dev/null
@@ -1,45 +0,0 @@
-getTable('sylius_admin_api_access_token')->getForeignKeys() as $key) {
- $this->skipIf($key->getName() === 'FK_2AA4915D19EB6921', 'Database has correct index name');
- }
-
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7F19EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token DROP FOREIGN KEY FK_7D83AA7FA76ED395');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915D19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_access_token ADD CONSTRAINT FK_2AA4915DA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C840417919EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code DROP FOREIGN KEY FK_C8404179A76ED395');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D84819EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_auth_code ADD CONSTRAINT FK_E366D848A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_4457852519EB6921');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token DROP FOREIGN KEY FK_44578525A76ED395');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES sylius_admin_api_client (id)');
- $this->addSql('ALTER TABLE sylius_admin_api_refresh_token ADD CONSTRAINT FK_9160E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES sylius_admin_user (id)');
- }
-
- public function down(Schema $schema): void
- {
- }
-}
diff --git a/app/migrations/Version20170824124122.php b/app/migrations/Version20170824124122.php
deleted file mode 100644
index bb341aa896..0000000000
--- a/app/migrations/Version20170824124122.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_order CHANGE notes notes LONGTEXT DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_order CHANGE notes notes VARCHAR(1000) DEFAULT NULL COLLATE utf8_unicode_ci');
- }
-}
diff --git a/app/migrations/Version20170913125128.php b/app/migrations/Version20170913125128.php
deleted file mode 100644
index baafa6e33e..0000000000
--- a/app/migrations/Version20170913125128.php
+++ /dev/null
@@ -1,51 +0,0 @@
-addSql('ALTER TABLE sylius_order_item ADD product_name VARCHAR(255), ADD variant_name VARCHAR(255)');
-
- $this->addSql('
- UPDATE sylius_order_item
- INNER JOIN sylius_order ON sylius_order_item.order_id = sylius_order.id
- INNER JOIN sylius_product_variant ON sylius_order_item.variant_id = sylius_product_variant.id
- INNER JOIN sylius_product ON sylius_product_variant.product_id = sylius_product.id
- INNER JOIN sylius_product_translation ON sylius_product_translation.translatable_id = sylius_product.id
- SET sylius_order_item.product_name = sylius_product_translation.name
- WHERE sylius_product_translation.locale = sylius_order.locale_code
-
- ');
- $this->addSql('
- UPDATE sylius_order_item
- INNER JOIN sylius_order ON sylius_order_item.order_id = sylius_order.id
- INNER JOIN sylius_product_variant ON sylius_order_item.variant_id = sylius_product_variant.id
- INNER JOIN sylius_product_variant_translation ON sylius_product_variant_translation.translatable_id = sylius_product_variant.id
- SET sylius_order_item.variant_name = sylius_product_variant_translation.name
- WHERE sylius_product_variant_translation.locale = sylius_order.locale_code
- ');
-
- $this->addSql('ALTER TABLE sylius_order_item CHANGE product_name product_name VARCHAR(255) DEFAULT NULL, CHANGE variant_name variant_name VARCHAR(255) DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_order_item DROP product_name, DROP variant_name');
- }
-}
diff --git a/app/migrations/Version20171003103916.php b/app/migrations/Version20171003103916.php
deleted file mode 100644
index ba55e2e773..0000000000
--- a/app/migrations/Version20171003103916.php
+++ /dev/null
@@ -1,105 +0,0 @@
-container = $container;
- }
-
- public function up(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
- $productAttributeRepository = $this->container->get('sylius.repository.product_attribute');
-
- $productAttributes = $productAttributeRepository
- ->createQueryBuilder('o')
- ->select([
- 'o.id',
- 'o.configuration',
- ])
- ->where('o.type = :type')
- ->setParameter('type', SelectAttributeType::TYPE)
- ->getQuery()
- ->getResult()
- ;
-
- /** @var ProductAttributeInterface $productAttribute */
- foreach ($productAttributes as $productAttribute) {
- $configuration = $productAttribute->getConfiguration();
- $upgradedConfiguration = [];
-
- foreach ($configuration as $configurationKey => $value) {
- if ('choices' === $configurationKey) {
- foreach ($value as $key => $choice) {
- $upgradedConfiguration[$configurationKey][$key][$defaultLocale] = $choice;
- }
-
- continue;
- }
-
- $upgradedConfiguration[$configurationKey] = $value;
- }
-
- $this->addSql('UPDATE sylius_product_attribute SET configuration = :configuration WHERE id = :id', [
- 'id' => $productAttribute->getId(),
- 'configuration' => serialize($upgradedConfiguration),
- ]);
- }
- }
-
- public function down(Schema $schema): void
- {
- $defaultLocale = $this->container->getParameter('locale');
- $productAttributeRepository = $this->container->get('sylius.repository.product_attribute');
-
- $productAttributes = $productAttributeRepository->findBy(['type' => SelectAttributeType::TYPE]);
- /** @var ProductAttributeInterface $productAttribute */
- foreach ($productAttributes as $productAttribute) {
- $configuration = $productAttribute->getConfiguration();
- $downgradedConfiguration = [];
-
- foreach ($configuration as $configurationKey => $value) {
- if ('choices' === $configurationKey) {
- foreach ($value as $key => $choice) {
- if (array_key_exists($defaultLocale, $choice)) {
- $downgradedConfiguration[$configurationKey][$key] = $choice[$defaultLocale];
- }
- }
-
- continue;
- }
-
- $downgradedConfiguration[$configurationKey] = $value;
- }
-
- $this->addSql('UPDATE sylius_product_attribute SET configuration = :configuration WHERE id = :id', [
- 'id' => $productAttribute->getId(),
- 'configuration' => serialize($downgradedConfiguration),
- ]);
- }
- }
-}
diff --git a/app/migrations/Version20180102140039.php b/app/migrations/Version20180102140039.php
deleted file mode 100644
index 12f833b587..0000000000
--- a/app/migrations/Version20180102140039.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('CREATE INDEX IDX_16C8119EE551C011 ON sylius_channel (hostname)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP INDEX IDX_16C8119EE551C011 ON sylius_channel');
- }
-}
diff --git a/app/migrations/Version20180226142349.php b/app/migrations/Version20180226142349.php
deleted file mode 100644
index 061b0dde1a..0000000000
--- a/app/migrations/Version20180226142349.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addSql('ALTER TABLE sylius_product_review CHANGE title title VARCHAR(255) DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_product_review CHANGE title title VARCHAR(255) NOT NULL COLLATE utf8_unicode_ci');
- }
-}
diff --git a/app/migrations/Version20190109095211.php b/app/migrations/Version20190109095211.php
deleted file mode 100644
index 162a41ea02..0000000000
--- a/app/migrations/Version20190109095211.php
+++ /dev/null
@@ -1,39 +0,0 @@
-addSql('CREATE TABLE sylius_shop_billing_data (id INT AUTO_INCREMENT NOT NULL, company VARCHAR(255) DEFAULT NULL, tax_id VARCHAR(255) DEFAULT NULL, country_code VARCHAR(255) DEFAULT NULL, street VARCHAR(255) DEFAULT NULL, city VARCHAR(255) DEFAULT NULL, postcode VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE UTF8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_channel ADD shop_billing_data_id INT DEFAULT NULL');
- $this->addSql('ALTER TABLE sylius_channel ADD CONSTRAINT FK_16C8119EB5282EDF FOREIGN KEY (shop_billing_data_id) REFERENCES sylius_shop_billing_data (id) ON DELETE CASCADE');
- $this->addSql('CREATE UNIQUE INDEX UNIQ_16C8119EB5282EDF ON sylius_channel (shop_billing_data_id)');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_channel DROP FOREIGN KEY FK_16C8119EB5282EDF');
- $this->addSql('DROP TABLE sylius_shop_billing_data');
- $this->addSql('DROP INDEX UNIQ_16C8119EB5282EDF ON sylius_channel');
- $this->addSql('ALTER TABLE sylius_channel DROP shop_billing_data_id');
- }
-}
diff --git a/app/migrations/Version20190109160409.php b/app/migrations/Version20190109160409.php
deleted file mode 100644
index 3b31176426..0000000000
--- a/app/migrations/Version20190109160409.php
+++ /dev/null
@@ -1,35 +0,0 @@
-addSql('ALTER TABLE sylius_shop_user ADD encoder_name VARCHAR(255) DEFAULT NULL');
- $this->addSql('ALTER TABLE sylius_admin_user ADD encoder_name VARCHAR(255) DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_admin_user DROP encoder_name');
- $this->addSql('ALTER TABLE sylius_shop_user DROP encoder_name');
- }
-}
diff --git a/app/migrations/Version20190204092544.php b/app/migrations/Version20190204092544.php
deleted file mode 100644
index 3f215fbe6b..0000000000
--- a/app/migrations/Version20190204092544.php
+++ /dev/null
@@ -1,35 +0,0 @@
-addSql('CREATE INDEX IDX_6196A1F9A393D2FB43625D9F ON sylius_order (state, updated_at)');
- }
-
- public function down(Schema $schema): void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('DROP INDEX IDX_6196A1F9A393D2FB43625D9F ON sylius_order');
- }
-}
diff --git a/app/migrations/Version20190416073011.php b/app/migrations/Version20190416073011.php
deleted file mode 100644
index 01963506c8..0000000000
--- a/app/migrations/Version20190416073011.php
+++ /dev/null
@@ -1,26 +0,0 @@
-addSql('ALTER TABLE sylius_promotion_coupon ADD reusable_from_cancelled_orders TINYINT(1) DEFAULT \'1\' NOT NULL');
- }
-
- public function down(Schema $schema): void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('ALTER TABLE sylius_promotion_coupon DROP reusable_from_cancelled_orders');
- }
-}
diff --git a/app/migrations/Version20190607135638.php b/app/migrations/Version20190607135638.php
deleted file mode 100644
index dde34c956a..0000000000
--- a/app/migrations/Version20190607135638.php
+++ /dev/null
@@ -1,31 +0,0 @@
-addSql('CREATE TABLE sylius_avatar_image (id INT AUTO_INCREMENT NOT NULL, owner_id INT NOT NULL, type VARCHAR(255) DEFAULT NULL, path VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_1068A3A97E3C61F9 (owner_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE UTF8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_avatar_image ADD CONSTRAINT FK_1068A3A97E3C61F9 FOREIGN KEY (owner_id) REFERENCES sylius_admin_user (id) ON DELETE CASCADE');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('DROP TABLE sylius_avatar_image');
- }
-}
diff --git a/app/migrations/Version20191024065651.php b/app/migrations/Version20191024065651.php
deleted file mode 100644
index 39122b764a..0000000000
--- a/app/migrations/Version20191024065651.php
+++ /dev/null
@@ -1,22 +0,0 @@
-addSql('CREATE TABLE sylius_shipping_method_rule (id INT AUTO_INCREMENT NOT NULL, shipping_method_id INT DEFAULT NULL, type VARCHAR(255) NOT NULL, configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', INDEX IDX_88A0EB655F7D6850 (shipping_method_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE UTF8_unicode_ci ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_shipping_method_rule ADD CONSTRAINT FK_88A0EB655F7D6850 FOREIGN KEY (shipping_method_id) REFERENCES sylius_shipping_method (id)');
- }
-
- public function down(Schema $schema) : void
- {
- $this->addSql('DROP TABLE sylius_shipping_method_rule');
- }
-}
diff --git a/app/migrations/Version20200110132702.php b/app/migrations/Version20200110132702.php
deleted file mode 100644
index 33db08b27c..0000000000
--- a/app/migrations/Version20200110132702.php
+++ /dev/null
@@ -1,36 +0,0 @@
-addSql('ALTER TABLE sylius_channel ADD menu_taxon_id INT DEFAULT NULL');
- $this->addSql('ALTER TABLE sylius_channel ADD CONSTRAINT FK_16C8119EF242B1E6 FOREIGN KEY (menu_taxon_id) REFERENCES sylius_taxon (id) ON DELETE SET NULL');
- $this->addSql('CREATE INDEX IDX_16C8119EF242B1E6 ON sylius_channel (menu_taxon_id)');
- }
-
- public function down(Schema $schema): void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('ALTER TABLE sylius_channel DROP FOREIGN KEY FK_16C8119EF242B1E6');
- $this->addSql('DROP INDEX IDX_16C8119EF242B1E6 ON sylius_channel');
- $this->addSql('ALTER TABLE sylius_channel DROP menu_taxon_id');
- }
-}
diff --git a/app/migrations/Version20200122082429.php b/app/migrations/Version20200122082429.php
deleted file mode 100644
index 8fac3f3a63..0000000000
--- a/app/migrations/Version20200122082429.php
+++ /dev/null
@@ -1,33 +0,0 @@
-addSql('CREATE TABLE sylius_channel_countries (channel_id INT NOT NULL, country_id INT NOT NULL, INDEX IDX_D96E51AE72F5A1AA (channel_id), INDEX IDX_D96E51AEF92F3E70 (country_id), PRIMARY KEY(channel_id, country_id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB');
- $this->addSql('ALTER TABLE sylius_channel_countries ADD CONSTRAINT FK_D96E51AE72F5A1AA FOREIGN KEY (channel_id) REFERENCES sylius_channel (id) ON DELETE CASCADE');
- $this->addSql('ALTER TABLE sylius_channel_countries ADD CONSTRAINT FK_D96E51AEF92F3E70 FOREIGN KEY (country_id) REFERENCES sylius_country (id) ON DELETE CASCADE');
- }
-
- public function down(Schema $schema) : void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('DROP TABLE sylius_channel_countries');
- }
-}
diff --git a/app/migrations/Version20200202104152.php b/app/migrations/Version20200202104152.php
deleted file mode 100644
index 104748d664..0000000000
--- a/app/migrations/Version20200202104152.php
+++ /dev/null
@@ -1,21 +0,0 @@
-addSql('ALTER TABLE sylius_shipment ADD shipped_at DATETIME DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- $this->addSql('ALTER TABLE sylius_shipment DROP shipped_at');
- }
-}
diff --git a/app/migrations/Version20200309172908.php b/app/migrations/Version20200309172908.php
deleted file mode 100644
index 759d231480..0000000000
--- a/app/migrations/Version20200309172908.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_product_variant ADD enabled TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_product_variant SET enabled = 1');
- }
-
- public function down(Schema $schema) : void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('ALTER TABLE sylius_product_variant DROP enabled');
- }
-}
diff --git a/app/migrations/Version20200325075815.php b/app/migrations/Version20200325075815.php
deleted file mode 100644
index c1414e94c5..0000000000
--- a/app/migrations/Version20200325075815.php
+++ /dev/null
@@ -1,32 +0,0 @@
-addSql('ALTER TABLE sylius_taxon ADD enabled TINYINT(1) NOT NULL');
- $this->addSql('UPDATE sylius_taxon SET enabled = 1');
- }
-
- public function down(Schema $schema) : void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('ALTER TABLE sylius_taxon DROP enabled');
- }
-}
diff --git a/app/migrations/Version20200916093101.php b/app/migrations/Version20200916093101.php
deleted file mode 100644
index 55ed6427c0..0000000000
--- a/app/migrations/Version20200916093101.php
+++ /dev/null
@@ -1,28 +0,0 @@
-addSql('ALTER TABLE sylius_channel_pricing CHANGE price price INT DEFAULT NULL');
- }
-
- public function down(Schema $schema): void
- {
- // this down() migration is auto-generated, please modify it to your needs
- $this->addSql('ALTER TABLE sylius_channel_pricing CHANGE price price INT NOT NULL');
- }
-}
diff --git a/bin/require-symfony-version b/bin/require-symfony-version
deleted file mode 100755
index d8f6a961ca..0000000000
--- a/bin/require-symfony-version
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env php
- $value) {
- if (in_array($key, $packages, true)) {
- $contents['require'][$key] = $version;
- }
-}
-
-foreach ($contents['require-dev'] ?? [] as $key => $value) {
- if (in_array($key, $packages, true)) {
- $contents['require-dev'][$key] = $version;
- }
-}
-
-file_put_contents($path, json_encode($contents, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES | \JSON_UNESCAPED_UNICODE));
diff --git a/composer-require-checker.json b/composer-require-checker.json
index 0002a8c244..ca2f65de74 100644
--- a/composer-require-checker.json
+++ b/composer-require-checker.json
@@ -3,7 +3,6 @@
"null", "true", "false",
"static", "self", "parent",
"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", "mixed", "never",
- "Swift_Message",
"ApiPlatform\\Core\\Api\\FilterInterface",
"ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Util\\QueryNameGeneratorInterface",
"ApiPlatform\\Core\\Metadata\\Extractor\\ExtractorInterface",
diff --git a/composer.json b/composer.json
index 40ccfb04a5..39492b2251 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"name": "sylius/sylius",
"type": "library",
- "version": "v1.13.0-dev",
+ "version": "v2.0.0-dev",
"description": "E-Commerce platform for PHP, based on Symfony framework.",
"homepage": "https://sylius.com",
"license": "MIT",
@@ -20,7 +20,7 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"ext-dom": "*",
"ext-exif": "*",
"ext-fileinfo": "*",
@@ -78,62 +78,61 @@
"sylius-labs/polyfill-symfony-event-dispatcher": "^1.0.1",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
"sylius-labs/polyfill-symfony-security": "^1.1",
- "sylius/calendar": "^0.3 || ^0.4 || ^0.5",
- "sylius/fixtures-bundle": "^1.7",
- "sylius/grid": "^1.11",
- "sylius/grid-bundle": "^1.11",
- "sylius/mailer": "^1.8 || ^2.0@beta",
- "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9",
- "sylius/resource-bundle": "^1.9",
- "sylius/theme-bundle": "^2.1.1 || ^2.3",
- "symfony/asset": "^5.4.21 || ^6.0",
- "symfony/config": "^5.4.21 || ^6.0",
- "symfony/console": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/deprecation-contracts": "^2.5",
- "symfony/doctrine-bridge": "^5.4.21 || ^6.0",
- "symfony/doctrine-messenger": "^5.4.21 || ^6.0",
- "symfony/event-dispatcher": "^5.4.21 || ^6.0",
- "symfony/expression-language": "^5.4.21 || ^6.0",
- "symfony/filesystem": "^5.4.21 || ^6.0",
- "symfony/finder": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/http-client": "^5.4.21 || ^6.0",
- "symfony/http-foundation": "^5.4.21 || ^6.0",
- "symfony/http-kernel": "^5.4.21 || ^6.0",
- "symfony/intl": "^5.4.21 || ^6.0",
- "symfony/mailer": "^5.4.21 || ^6.0",
- "symfony/messenger": "^5.4.21 || ^6.0",
- "symfony/monolog-bundle": "^3.5",
- "symfony/options-resolver": "^5.4.21 || ^6.0",
- "symfony/password-hasher": "^5.4.21 || ^6.0",
- "symfony/polyfill-iconv": "^1.17",
- "symfony/polyfill-intl-icu": "^1.22",
- "symfony/polyfill-mbstring": "^1.17",
- "symfony/polyfill-php80": "^1.17",
- "symfony/process": "^5.4.21 || ^6.0",
- "symfony/property-access": "^5.4.21 || ^6.0",
- "symfony/property-info": "^5.4.21 || ^6.0",
- "symfony/proxy-manager-bridge": "^5.4.21 || ^6.0",
- "symfony/routing": "^5.4.21 || ^6.0",
- "symfony/security-bundle": "^5.4.21 || ^6.0",
- "symfony/security-core": "^5.4.21 || ^6.0",
- "symfony/security-csrf": "^5.4.21 || ^6.0",
- "symfony/security-http": "^5.4.21 || ^6.0",
- "symfony/serializer": "^5.4.21 || ^6.0",
+ "sylius/fixtures-bundle": "^1.8",
+ "sylius/grid": "^1.12",
+ "sylius/grid-bundle": "^1.12",
+ "sylius/mailer": "^2.0",
+ "sylius/mailer-bundle": "^2.0",
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10",
+ "sylius/resource-bundle": "^1.10",
+ "sylius/theme-bundle": "^2.3",
+ "symfony/asset": "^6.3.0",
+ "symfony/clock": "^6.3.4",
+ "symfony/config": "^6.3.2",
+ "symfony/console": "^6.3.4",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/deprecation-contracts": "^2.5.2",
+ "symfony/doctrine-bridge": "^6.3.4",
+ "symfony/doctrine-messenger": "^6.3.1",
+ "symfony/event-dispatcher": "^6.3.2",
+ "symfony/expression-language": "^6.3.0",
+ "symfony/filesystem": "^6.3.1",
+ "symfony/finder": "^6.3.3",
+ "symfony/form": "^6.3.2",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/http-client": "^6.3.2",
+ "symfony/http-foundation": "^6.3.4",
+ "symfony/http-kernel": "^6.3.4",
+ "symfony/intl": "^6.3.2",
+ "symfony/mailer": "^6.3.0",
+ "symfony/messenger": "^6.3.4",
+ "symfony/monolog-bundle": "^3.8.0",
+ "symfony/options-resolver": "^6.3.0",
+ "symfony/password-hasher": "^6.3.0",
+ "symfony/polyfill-iconv": "^1.28",
+ "symfony/polyfill-intl-icu": "^1.28",
+ "symfony/polyfill-mbstring": "^1.28",
+ "symfony/process": "^6.3.4",
+ "symfony/property-access": "^6.3.2",
+ "symfony/property-info": "^6.3.0",
+ "symfony/proxy-manager-bridge": "^6.3.0",
+ "symfony/routing": "^6.3.3",
+ "symfony/security-bundle": "^6.3.4",
+ "symfony/security-core": "^6.3.3",
+ "symfony/security-csrf": "^6.3.2",
+ "symfony/security-http": "^6.3.4",
+ "symfony/serializer": "^6.3.4",
"symfony/service-contracts": "^2.5 || ^3.0",
- "symfony/string": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0",
- "symfony/translation": "^5.4.21 || ^6.0",
- "symfony/translation-contracts": "^2.5",
- "symfony/twig-bundle": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0",
- "symfony/webpack-encore-bundle": "^1.15",
- "symfony/workflow": "^5.4.21 || ^6.0",
- "symfony/yaml": "^5.4.21 || ^6.0",
+ "symfony/string": "^6.3.2",
+ "symfony/templating": "^6.3.0",
+ "symfony/translation": "^6.3.3",
+ "symfony/translation-contracts": "^2.5.2",
+ "symfony/twig-bundle": "^6.3.0",
+ "symfony/validator": "^6.3.4",
+ "symfony/webpack-encore-bundle": "^1.17.1",
+ "symfony/workflow": "^6.3.4",
+ "symfony/yaml": "^6.3.3",
"twig/intl-extra": "^2.12 || ^3.4",
"twig/twig": "^2.12 || ^3.3",
"webmozart/assert": "^1.9",
@@ -187,9 +186,7 @@
"conflict": {
"doctrine/orm": ">= 2.16.0",
"lexik/jwt-authentication-bundle": "^2.18",
- "stof/doctrine-extensions-bundle": "1.8.0",
- "symfony/framework-bundle": "6.2.8",
- "symfony/validator": "5.4.25 || 6.2.12 || 6.3.1"
+ "stof/doctrine-extensions-bundle": "1.8.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
@@ -228,12 +225,12 @@
"rector/rector": "^0.18.0",
"sylius-labs/coding-standard": "^4.2",
"sylius-labs/suite-tags-extension": "~0.1",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/debug-bundle": "^5.4.21 || ^6.0",
- "symfony/dotenv": "^5.4.21 || ^6.0",
- "symfony/flex": "^1.7",
- "symfony/runtime": "^5.4.21 || ^6.0",
- "symfony/web-profiler-bundle": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.4",
+ "symfony/debug-bundle": "^6.4",
+ "symfony/dotenv": "^6.4",
+ "symfony/flex": "^2.2",
+ "symfony/runtime": "^6.4",
+ "symfony/web-profiler-bundle": "^6.4",
"symplify/monorepo-builder": "^11.0"
},
"suggest": {
@@ -257,7 +254,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
- "require": "5.4.*"
+ "require": "~6.3.0"
}
},
"autoload": {
diff --git a/config/bundles.php b/config/bundles.php
index b433583b42..d66e91e6f2 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -6,7 +6,6 @@ return [
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
- Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
diff --git a/config/packages/assets.yaml b/config/packages/assets.yaml
new file mode 100644
index 0000000000..5382769eac
--- /dev/null
+++ b/config/packages/assets.yaml
@@ -0,0 +1,11 @@
+framework:
+ assets:
+ packages:
+ admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
+ shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
+ app.admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/admin/manifest.json'
+ app.shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/shop/manifest.json'
diff --git a/config/packages/liip_imagine.yaml b/config/packages/liip_imagine.yaml
deleted file mode 100644
index bb2e7ceb9b..0000000000
--- a/config/packages/liip_imagine.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-liip_imagine:
- resolvers:
- default:
- web_path:
- web_root: "%kernel.project_dir%/public"
- cache_prefix: "media/cache"
diff --git a/config/packages/webpack_encore.yaml b/config/packages/webpack_encore.yaml
new file mode 100644
index 0000000000..fe1b0b7af6
--- /dev/null
+++ b/config/packages/webpack_encore.yaml
@@ -0,0 +1,7 @@
+webpack_encore:
+ output_path: '%kernel.project_dir%/public/build/default'
+ builds:
+ admin: '%kernel.project_dir%/public/build/admin'
+ shop: '%kernel.project_dir%/public/build/shop'
+ app.admin: '%kernel.project_dir%/public/build/app/admin'
+ app.shop: '%kernel.project_dir%/public/build/app/shop'
diff --git a/config/services_test.yaml b/config/services_test.yaml
index 1b52a65b78..e05418aed3 100644
--- a/config/services_test.yaml
+++ b/config/services_test.yaml
@@ -1,5 +1,4 @@
imports:
- - { resource: "../vendor/sylius/calendar/tests/Behat/Resources/services.yaml" }
- { resource: "../src/Sylius/Behat/Resources/config/services.xml" }
# workaround needed for strange "test.client.history" problem
diff --git a/ecs.php b/ecs.php
index be0d66518f..e39aca904c 100644
--- a/ecs.php
+++ b/ecs.php
@@ -27,7 +27,6 @@ return static function (ECSConfig $config): void {
InlineDocCommentDeclarationSniff::class . '.MissingVariable',
InlineDocCommentDeclarationSniff::class . '.NoAssignment',
VisibilityRequiredFixer::class => ['*Spec.php'],
- ErrorSuppressionFixer::class => 'src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPass.php',
'**/var/*',
]);
$config->ruleWithConfiguration(PhpdocSeparationFixer::class, ['groups' => [['Given', 'When', 'Then']]]);
diff --git a/etc/bash/application.sh b/etc/bash/application.sh
deleted file mode 100644
index b0f2a5a840..0000000000
--- a/etc/bash/application.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Source nvm.sh to make the node command available
-run_command "source ~/.nvm/nvm.sh"
diff --git a/etc/bash/common.lib.sh b/etc/bash/common.lib.sh
deleted file mode 100644
index 4b0ef36bd0..0000000000
--- a/etc/bash/common.lib.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-
-# Argument 1: Command to run
-run_command() {
- echo "> $1"
-
- eval "$1"
-}
-
-# Argument 1: Command to run
-run_command_reporting_status()
-{
- local code=0
-
- run_command "$1" || code=$?
-
- if [ "${code}" = "0" ]; then
- print_success "Command \"$1\" exited with code ${code}\n"
- else
- print_error "Command \"$1\" exited with code ${code}\n"
- fi
-
- return ${code}
-}
-
-# Argument 1: Command to run
-retry_run_command() {
- run_command "$1"
-
- if [ "$?" != "0" ]; then
- run_command "$1"
- fi
-}
-
-# Argument 1: Text
-bold() {
- echo -e "\e[1m$1\e[0;20m"
-}
-
-# Argument 1: Text
-bold_green() {
- echo -e "\e[33;1m$1\e[0;20m"
-}
-
-# Argument 1: Text
-red() {
- echo -e "\e[31m$1\e[0m"
-}
-
-# Argument 1: Text
-bold_red() {
- echo -e "\e[31;1m$1\e[0;20m"
-}
-
-# Argument 1: Text
-print_error() {
- echo -e "$(bold_red "$1")" 1>&2
-}
-
-# Argument 1: Text
-print_success() {
- echo -e "$(bold_green "$1")"
-}
-
-# Argument 1: Action
-# Argument 2: Subject
-print_header() {
- echo -e "$(bold "$1"): $(bold_green "$2")"
-}
-
-# Argument 1: Text
-print_info() {
- echo "=> $1"
-}
-
-# Argument 1: Text
-print_warning() {
- echo "=> $1" 1>&2
-}
-
-# Argument 1: Text
-exit_on_error() {
- if [ "$?" != "0" ]; then
- print_error "$1"
- exit 1
- fi
-}
-
-# Argument 1: Binary name
-get_binary()
-{
- if [ -x "bin/$1" ]; then
- echo "bin/$1"
- elif [ -x "vendor/bin/$1" ]; then
- echo "vendor/bin/$1"
- else
- return 1
- fi
-}
-
-get_sylius_path()
-{
- echo "$(cd "$(dirname "${BASH_SOURCE[0]}")/../../" && pwd)"
-}
-
-locate_packages() {
- find "$(pwd)/src/Sylius" -mindepth 3 -maxdepth 3 -type f -name composer.json -exec dirname '{}' \;
-}
-
-find_packages() {
- locate_packages | package_path_to_package_name
-}
-
-# Argument 1: Package path
-package_path_to_package_name() {
- basename "$1"
-}
-
-# Argument 1: Package name
-package_name_to_package_path() {
- find "$(pwd)/src/Sylius" -mindepth 2 -maxdepth 2 -type d -name "$1"
-}
-
-# Argument 1: Package path or name
-cast_package_argument_to_package_path() {
- local package_path="$1"
-
- if [ ! -d "${package_path}" ]; then
- package_path="$(package_name_to_package_path "$1")"
- fi
-
- if [[ -z "${package_path}" || ! -d "${package_path}" ]]; then
- return 1
- fi
-
- echo "${package_path}"
-}
diff --git a/etc/migrations-1.8.sh b/etc/migrations-1.8.sh
deleted file mode 100644
index ae7df751dc..0000000000
--- a/etc/migrations-1.8.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-echo "Removing redundant Sylius-Standard migrations"
-
-rm "src/Migrations/Version20170912085504.php"
-rm "src/Migrations/Version20170913125128.php"
-rm "src/Migrations/Version20171003103916.php"
-rm "src/Migrations/Version20180102140039.php"
-rm "src/Migrations/Version20190109095211.php"
-rm "src/Migrations/Version20190109160409.php"
-rm "src/Migrations/Version20190508083953.php"
-rm "src/Migrations/Version20190621035710.php"
-rm "src/Migrations/Version20191119131635.php"
-rm "src/Migrations/Version20200301170604.php"
-
-echo "Adding executed migrations from Sylius"
-
-bin/console doctrine:migrations:sync-metadata-storage
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161202011555" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161209095131" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161214153137" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161215103325" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161219160441" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161220092422" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161221133514" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161223091334" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20161223164558" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170103120334" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170109143010" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170110120125" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170116215417" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170117075436" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170120164250" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170124221955" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170201094058" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170206122839" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170206141520" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170208102345" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170208103250" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170214095710" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170214104908" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170215143031" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170217141621" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170220150813" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170223071604" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170301135010" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170303170201" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170321131352" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170327135945" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170401200415" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170518123056" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170824124122" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20170913125128" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20171003103916" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20180102140039" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20180226142349" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20190109095211" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20190109160409" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20190204092544" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20190416073011" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20190607135638" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20200110132702" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20200122082429" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\CoreBundle\Migrations\Version20200202104152" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\AdminApiBundle\Migrations\Version20161202011556" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\AdminApiBundle\Migrations\Version20170313125424" --add --no-interaction
-bin/console doctrine:migrations:version "Sylius\Bundle\AdminApiBundle\Migrations\Version20170711151342" --add --no-interaction
diff --git a/etc/phpcs/.php_cs b/etc/phpcs/.php_cs
deleted file mode 100644
index 34929b9b7c..0000000000
--- a/etc/phpcs/.php_cs
+++ /dev/null
@@ -1,25 +0,0 @@
-files()
- ->notName('*Spec.php')
- ->name('*.php')
- ->in(['app/migrations','src'])
-;
-
-return Symfony\CS\Config\Config::create()
- ->setUsingCache(true)
- ->fixers($fixers)
- ->finder($finder)
-;
diff --git a/etc/phpcs/.phpspec_cs b/etc/phpcs/.phpspec_cs
deleted file mode 100644
index 1fa2cf788c..0000000000
--- a/etc/phpcs/.phpspec_cs
+++ /dev/null
@@ -1,26 +0,0 @@
-files()
- ->name('*Spec.php')
- ->in('src')
-;
-
-return Symfony\CS\Config\Config::create()
- ->setUsingCache(true)
- ->fixers($fixers)
- ->finder($finder)
-;
diff --git a/etc/phpcs/common.php b/etc/phpcs/common.php
deleted file mode 100644
index 54c96f5735..0000000000
--- a/etc/phpcs/common.php
+++ /dev/null
@@ -1,33 +0,0 @@
- path to public assets directory',
- type: 'string',
- requiresArg: true,
- required: false,
- },
- nodeModulesPath: {
- description: ' path to node_modules directory',
- type: 'string',
- requiresArg: true,
- required: false,
- },
- });
-
-const config = [
- '--rootPath',
- argv.rootPath || '../../../../public/assets',
- '--nodeModulesPath',
- argv.nodeModulesPath || '../../../../node_modules',
-];
-
-export const buildAdmin = function buildAdmin() {
- return gulp.src('src/Sylius/Bundle/AdminBundle/gulpfile.babel.js', { read: false })
- .pipe(chug({ args: config, tasks: 'build' }));
-};
-buildAdmin.description = 'Build admin assets.';
-
-export const watchAdmin = function watchAdmin() {
- return gulp.src('src/Sylius/Bundle/AdminBundle/gulpfile.babel.js', { read: false })
- .pipe(chug({ args: config, tasks: 'watch' }));
-};
-watchAdmin.description = 'Watch admin asset sources and rebuild on changes.';
-
-export const buildShop = function buildShop() {
- return gulp.src('src/Sylius/Bundle/ShopBundle/gulpfile.babel.js', { read: false })
- .pipe(chug({ args: config, tasks: 'build' }));
-};
-buildShop.description = 'Build shop assets.';
-
-export const watchShop = function watchShop() {
- return gulp.src('src/Sylius/Bundle/ShopBundle/gulpfile.babel.js', { read: false })
- .pipe(chug({ args: config, tasks: 'watch' }));
-};
-watchShop.description = 'Watch shop asset sources and rebuild on changes.';
-
-export const build = gulp.parallel(buildAdmin, buildShop);
-build.description = 'Build assets.';
-
-export const watch = gulp.parallel(watchAdmin, watchShop);
-watch.description = 'Watch asset sources and rebuild on changes.';
-
-gulp.task('admin', buildAdmin);
-gulp.task('admin-watch', watchAdmin);
-gulp.task('shop', buildShop);
-gulp.task('shop-watch', watchShop);
-
-export default build;
diff --git a/package.json b/package.json
index 558b75a7d5..ae3b19a68b 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,9 @@
{
"name": "@sylius-ui/frontend",
- "version": "1.0.1",
+ "version": "2.0.0",
"license": "MIT",
"author": "Sylius Sp. z o.o.",
"dependencies": {
- "@babel/polyfill": "^7.0.0",
"chart.js": "^3.7.1",
"jquery": "^3.5.0",
"jquery.dirtyforms": "^2.0.0",
@@ -14,40 +13,18 @@
},
"devDependencies": {
"@babel/core": "^7.0.0",
- "@babel/plugin-external-helpers": "^7.0.0",
+ "@babel/polyfill": "^7.0.0",
"@babel/plugin-proposal-object-rest-spread": "^7.18.9",
"@babel/preset-env": "^7.18.10",
"@babel/register": "^7.0.0",
- "@rollup/plugin-babel": "^5.3.1",
- "@rollup/plugin-commonjs": "^22.0.2",
- "@rollup/plugin-inject": "^4.0.4",
- "@rollup/plugin-node-resolve": "^13.3.0",
"@semantic-ui-react/css-patch": "^1.1.2",
"@symfony/webpack-encore": "^3.1.0",
- "babel-plugin-fast-async": "^6.1.2",
- "babel-plugin-module-resolver": "^4.1.0",
- "dedent": "^0.7.0",
"eslint": "^8.23.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-import-resolver-babel-module": "^5.3.1",
"eslint-plugin-import": "^2.26.0",
- "fast-async": "^6.3.8",
- "gulp": "^4.0.2",
- "gulp-chug": "^0.5.1",
- "gulp-concat": "^2.6.1",
- "gulp-debug": "^4.0.0",
- "gulp-if": "^3.0.0",
- "gulp-livereload": "^4.0.2",
- "gulp-order": "^1.2.0",
- "gulp-sass": "^5.1.0",
- "gulp-sourcemaps": "^3.0.0",
- "gulp-uglifycss": "^1.1.0",
- "merge-stream": "^2.0.0",
- "rollup": "^2.79.0",
- "rollup-plugin-terser": "^7.0.2",
"sass": "^1.54.8",
"sass-loader": "^13.0.0",
- "upath": "^2.0.1",
"yargs": "^17.5.1"
},
"engines": {
@@ -58,15 +35,11 @@
"watch": "encore dev --watch",
"build": "encore dev",
"build:prod": "encore production",
- "gulp": "gulp build",
"lint": "yarn lint:js",
- "lint:js": "eslint gulpfile.babel.js src/Sylius/Bundle/AdminBundle/gulpfile.babel.js src/Sylius/Bundle/ShopBundle/gulpfile.babel.js src/Sylius/Bundle/UiBundle/Resources/private/js src/Sylius/Bundle/AdminBundle/Resources/private/js src/Sylius/Bundle/ShopBundle/Resources/private/js",
"postinstall": "semantic-ui-css-patch"
},
"repository": {
"type": "git",
"url": "git+https://github.com/Sylius/Sylius.git"
- },
- "author": "Sylius Sp. z o.o.",
- "license": "MIT"
+ }
}
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 6deadb25a2..b906f956cb 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -29,7 +29,6 @@ parameters:
# Deprecated classes
- 'src/Sylius/Bundle/CoreBundle/Application/Kernel.php'
- - 'src/Sylius/Bundle/UserBundle/Security/UserPasswordEncoder.php'
# To investigate, occurs after release of doctrine/orm 2.14, the processing of these classes ends with exit code 143
- 'src/Sylius/Bundle/CoreBundle/Doctrine/DQL/**.php'
diff --git a/src/Sylius/Behat/Context/Hook/CalendarContext.php b/src/Sylius/Behat/Context/Hook/CalendarContext.php
new file mode 100644
index 0000000000..208dc803bf
--- /dev/null
+++ b/src/Sylius/Behat/Context/Hook/CalendarContext.php
@@ -0,0 +1,31 @@
+dateFilePath)) {
+ unlink($this->dateFilePath);
+ }
+ }
+}
diff --git a/src/Sylius/Behat/Context/Setup/CalendarContext.php b/src/Sylius/Behat/Context/Setup/CalendarContext.php
new file mode 100644
index 0000000000..9cae9c246f
--- /dev/null
+++ b/src/Sylius/Behat/Context/Setup/CalendarContext.php
@@ -0,0 +1,31 @@
+dateFilePath, $dateTime);
+ }
+}
diff --git a/src/Sylius/Behat/Context/Setup/PriceHistoryContext.php b/src/Sylius/Behat/Context/Setup/PriceHistoryContext.php
index 6324041ae2..b12aa06df0 100644
--- a/src/Sylius/Behat/Context/Setup/PriceHistoryContext.php
+++ b/src/Sylius/Behat/Context/Setup/PriceHistoryContext.php
@@ -15,7 +15,6 @@ namespace Sylius\Behat\Context\Setup;
use Behat\Behat\Context\Context;
use Doctrine\Persistence\ObjectManager;
-use Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext;
use Sylius\Component\Core\Model\ChannelPricingInterface;
use Sylius\Component\Core\Model\ProductInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
diff --git a/src/Sylius/Behat/Resources/config/services.xml b/src/Sylius/Behat/Resources/config/services.xml
index efb8320160..3148a2ba68 100644
--- a/src/Sylius/Behat/Resources/config/services.xml
+++ b/src/Sylius/Behat/Resources/config/services.xml
@@ -19,6 +19,10 @@
+ %kernel.project_dir%/var/date.txt
+
+
+ %sylius.behat.clock.date_file%
+
+
+ %sylius.behat.clock.date_file%
+
+
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
index 84d71ccf64..78bc7958dd 100644
--- a/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
+++ b/src/Sylius/Behat/Resources/config/services/contexts/setup.xml
@@ -30,6 +30,10 @@
+
+ %sylius.behat.clock.date_file%
+
+
-
@@ -313,7 +317,7 @@
-
diff --git a/src/Sylius/Behat/Resources/config/suites/api/order/managing_orders.yml b/src/Sylius/Behat/Resources/config/suites/api/order/managing_orders.yml
index dd579e3ce4..bcba439587 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/order/managing_orders.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/order/managing_orders.yml
@@ -7,7 +7,7 @@ default:
contexts:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.mailer
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.setup.admin_api_security
- sylius.behat.context.setup.admin_user
diff --git a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_products.yml b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_products.yml
index 46a74280dd..2c9b874a41 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/product/viewing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/product/viewing_products.yml
@@ -31,7 +31,7 @@ default:
- sylius.behat.context.setup.taxonomy
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- Sylius\Behat\Context\Setup\PriceHistoryContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.api.shop.channel
- sylius.behat.context.api.shop.product
diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
index eedb5128b8..0b18eaa46d 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/applying_catalog_promotions.yml
@@ -6,7 +6,7 @@ default:
api_applying_catalog_promotions:
contexts:
- sylius.behat.context.hook.doctrine_orm
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.setup.admin_api_security
- sylius.behat.context.setup.channel
@@ -14,7 +14,7 @@ default:
- sylius.behat.context.setup.product_taxon
- sylius.behat.context.setup.taxonomy
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.transform.channel
- sylius.behat.context.transform.lexical
diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
index a48553f688..e283360a7a 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/managing_catalog_promotions.yml
@@ -6,7 +6,7 @@ default:
api_managing_catalog_promotions:
contexts:
- sylius.behat.context.hook.doctrine_orm
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.channel
- sylius.behat.context.transform.lexical
diff --git a/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml
index a6ea05f54f..cbb8068c77 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/promotion/removing_catalog_promotions.yml
@@ -6,7 +6,7 @@ default:
api_removing_catalog_promotions:
contexts:
- sylius.behat.context.hook.doctrine_orm
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.channel
- sylius.behat.context.transform.lexical
@@ -23,7 +23,7 @@ default:
- sylius.behat.context.setup.product_taxon
- sylius.behat.context.setup.taxonomy
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.api.admin.managing_catalog_promotions
- sylius.behat.context.api.shop.product_variant
diff --git a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipments.yml b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipments.yml
index 943228c0e8..98ce6d1e98 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipments.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/shipping/managing_shipments.yml
@@ -7,7 +7,7 @@ default:
contexts:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.mailer
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.address
- sylius.behat.context.transform.channel
@@ -29,7 +29,7 @@ default:
- sylius.behat.context.setup.product
- sylius.behat.context.setup.shipping
- sylius.behat.context.setup.zone
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.api.email
diff --git a/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml b/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml
index fd93531cec..8cb23f5e72 100644
--- a/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml
+++ b/src/Sylius/Behat/Resources/config/suites/api/taxation/applying_taxes.yml
@@ -6,7 +6,7 @@ default:
api_applying_taxes:
contexts:
- sylius.behat.context.hook.doctrine_orm
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.address
- sylius.behat.context.transform.cart
@@ -32,7 +32,7 @@ default:
- sylius.behat.context.setup.zone
- sylius.behat.context.setup.shop_api_security
- sylius.behat.context.setup.cart
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.api.shop.cart
- sylius.behat.context.api.shop.checkout
diff --git a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_price_history.yml b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_price_history.yml
index b2d98f4c8a..73b9103c1d 100644
--- a/src/Sylius/Behat/Resources/config/suites/domain/product/managing_price_history.yml
+++ b/src/Sylius/Behat/Resources/config/suites/domain/product/managing_price_history.yml
@@ -15,7 +15,7 @@ default:
- sylius.behat.context.setup.channel
- sylius.behat.context.setup.product
- Sylius\Behat\Context\Setup\PriceHistoryContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- Sylius\Behat\Context\Domain\ManagingPriceHistoryContext
filters:
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml b/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
index aff270db17..d7fabe5fd3 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/order/managing_orders.yml
@@ -8,7 +8,7 @@ default:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.session
- sylius.behat.context.hook.mailer
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.setup.admin_security
- sylius.behat.context.setup.admin_user
@@ -28,7 +28,7 @@ default:
- sylius.behat.context.setup.taxonomy
- sylius.behat.context.setup.user
- sylius.behat.context.setup.zone
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.transform.address
- sylius.behat.context.transform.cart
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
index f7377f00db..308f23979b 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/product/viewing_products.yml
@@ -42,7 +42,7 @@ default:
- sylius.behat.context.setup.product_option
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- Sylius\Behat\Context\Setup\PriceHistoryContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.ui.admin.managing_product_attributes
- sylius.behat.context.ui.admin.product_showpage
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_catalog_promotions.yml
index 4457c92a03..21f19af0cb 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/applying_catalog_promotions.yml
@@ -7,7 +7,7 @@ default:
contexts:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.session
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.setup.admin_security
- sylius.behat.context.setup.channel
@@ -15,7 +15,7 @@ default:
- sylius.behat.context.setup.product_taxon
- sylius.behat.context.setup.taxonomy
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.transform.channel
- sylius.behat.context.transform.lexical
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/promotion/removing_catalog_promotions.yml b/src/Sylius/Behat/Resources/config/suites/ui/promotion/removing_catalog_promotions.yml
index c4bcb74a80..a150c5f972 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/promotion/removing_catalog_promotions.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/promotion/removing_catalog_promotions.yml
@@ -7,7 +7,7 @@ default:
contexts:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.session
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.channel
- sylius.behat.context.transform.lexical
@@ -24,7 +24,7 @@ default:
- sylius.behat.context.setup.product_taxon
- sylius.behat.context.setup.taxonomy
- Sylius\Behat\Context\Setup\CatalogPromotionContext
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.ui.admin.notification
- sylius.behat.context.ui.shop.product
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml
index fde45b4af7..ce599e5c88 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml
@@ -5,7 +5,7 @@ default:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.mailer
- sylius.behat.context.hook.session
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.address
- sylius.behat.context.transform.channel
@@ -27,7 +27,7 @@ default:
- sylius.behat.context.setup.product
- sylius.behat.context.setup.shipping
- sylius.behat.context.setup.zone
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.ui.channel
- sylius.behat.context.ui.email
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml b/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
index 8ca33d181d..f004f6376a 100644
--- a/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
+++ b/src/Sylius/Behat/Resources/config/suites/ui/taxation/applying_taxes.yml
@@ -7,7 +7,7 @@ default:
contexts:
- sylius.behat.context.hook.doctrine_orm
- sylius.behat.context.hook.session
- - Sylius\Calendar\Tests\Behat\Context\Hook\CalendarContext
+ - sylius.behat.context.hook.calendar
- sylius.behat.context.transform.address
- sylius.behat.context.transform.country
@@ -31,7 +31,7 @@ default:
- sylius.behat.context.setup.user
- sylius.behat.context.setup.zone
- sylius.behat.context.setup.shop_security
- - Sylius\Calendar\Tests\Behat\Context\Setup\CalendarContext
+ - sylius.behat.context.setup.calendar
- sylius.behat.context.ui.shop.cart
- sylius.behat.context.ui.shop.checkout
diff --git a/src/Sylius/Behat/Service/Clock.php b/src/Sylius/Behat/Service/Clock.php
new file mode 100644
index 0000000000..a2e2722e63
--- /dev/null
+++ b/src/Sylius/Behat/Service/Clock.php
@@ -0,0 +1,47 @@
+dateFilePath)) {
+ $dateTime = file_get_contents($this->dateFilePath);
+
+ return new \DateTimeImmutable($dateTime);
+ }
+
+ return new \DateTimeImmutable();
+ }
+
+ public function withTimeZone(\DateTimeZone|string $timezone): static
+ {
+ $clone = clone $this;
+ $clone->timezone = \is_string($timezone) ? new \DateTimeZone($timezone) : $timezone;
+
+ return $clone;
+ }
+}
diff --git a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
index fed7c017d7..3851b89526 100644
--- a/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
@@ -14,6 +14,10 @@ declare(strict_types=1);
namespace Sylius\Bundle\AddressingBundle\DependencyInjection;
use Sylius\Bundle\AddressingBundle\Controller\ProvinceController;
+use Sylius\Bundle\AddressingBundle\Doctrine\ORM\AddressRepository;
+use Sylius\Bundle\AddressingBundle\Doctrine\ORM\CountryRepository;
+use Sylius\Bundle\AddressingBundle\Doctrine\ORM\ProvinceRepository;
+use Sylius\Bundle\AddressingBundle\Doctrine\ORM\ZoneMemberRepository;
use Sylius\Bundle\AddressingBundle\Form\Type\AddressType;
use Sylius\Bundle\AddressingBundle\Form\Type\CountryType;
use Sylius\Bundle\AddressingBundle\Form\Type\ProvinceType;
@@ -77,7 +81,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Address::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(AddressInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(AddressRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(AddressType::class)->cannotBeEmpty()->end()
->end()
@@ -109,7 +113,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Country::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(CountryInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(CountryRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(CountryType::class)->cannotBeEmpty()->end()
->end()
@@ -126,7 +130,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Province::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProvinceInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ProvinceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProvinceRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ProvinceType::class)->cannotBeEmpty()->end()
->end()
@@ -160,7 +164,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ZoneMember::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ZoneMemberInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ZoneMemberRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ZoneMemberType::class)->cannotBeEmpty()->end()
->end()
diff --git a/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/AddressRepository.php b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/AddressRepository.php
new file mode 100644
index 0000000000..28ec20afd9
--- /dev/null
+++ b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/AddressRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class AddressRepository extends EntityRepository implements AddressRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/CountryRepository.php b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/CountryRepository.php
new file mode 100644
index 0000000000..0586511909
--- /dev/null
+++ b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/CountryRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class CountryRepository extends EntityRepository implements CountryRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ProvinceRepository.php b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ProvinceRepository.php
new file mode 100644
index 0000000000..0aa9ef408e
--- /dev/null
+++ b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ProvinceRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class ProvinceRepository extends EntityRepository implements ProvinceRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ZoneMemberRepository.php b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ZoneMemberRepository.php
new file mode 100644
index 0000000000..5632ed0477
--- /dev/null
+++ b/src/Sylius/Bundle/AddressingBundle/Doctrine/ORM/ZoneMemberRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class ZoneMemberRepository extends EntityRepository implements ZoneMemberRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json
index 05cfa43e91..5d0a3a5edb 100644
--- a/src/Sylius/Bundle/AddressingBundle/composer.json
+++ b/src/Sylius/Bundle/AddressingBundle/composer.json
@@ -26,12 +26,12 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"stof/doctrine-extensions-bundle": "^1.4",
- "sylius/addressing": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/intl": "^5.4.21 || ^6.0"
+ "sylius/addressing": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/intl": "^6.3.2"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -45,10 +45,10 @@
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
+ "symfony/validator": "^6.3.4",
"theofidry/alice-data-fixtures": "^1.4"
},
"config": {
@@ -58,10 +58,10 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
},
"symfony": {
- "require": "^5.4"
+ "require": "6.3.*"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/AdminBundle/Action/Account/RenderResetPasswordPageAction.php b/src/Sylius/Bundle/AdminBundle/Action/Account/RenderResetPasswordPageAction.php
index 9792c4b579..f144e9a4cd 100644
--- a/src/Sylius/Bundle/AdminBundle/Action/Account/RenderResetPasswordPageAction.php
+++ b/src/Sylius/Bundle/AdminBundle/Action/Account/RenderResetPasswordPageAction.php
@@ -16,37 +16,30 @@ namespace Sylius\Bundle\AdminBundle\Action\Account;
use Sylius\Bundle\AdminBundle\Form\Type\ResetPasswordType;
use Sylius\Bundle\CoreBundle\Provider\FlashBagProvider;
use Sylius\Component\Core\Model\AdminUserInterface;
+use Sylius\Component\User\Model\UserInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Symfony\Component\Form\FormFactoryInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\RouterInterface;
use Twig\Environment;
-final class RenderResetPasswordPageAction
+final readonly class RenderResetPasswordPageAction
{
+ /**
+ * @param UserRepositoryInterface $userRepository
+ */
public function __construct(
private UserRepositoryInterface $userRepository,
private FormFactoryInterface $formFactory,
- private FlashBagInterface|RequestStack $requestStackOrFlashBag,
+ private RequestStack $requestStack,
private RouterInterface $router,
private Environment $twig,
private string $tokenTtl,
) {
- if ($this->requestStackOrFlashBag instanceof FlashBagInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- FlashBagInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function __invoke(Request $request, string $token): Response
@@ -75,7 +68,7 @@ final class RenderResetPasswordPageAction
private function handleExpiredPasswordRequest(Request $request): RedirectResponse
{
FlashBagProvider
- ::getFlashBag($this->requestStackOrFlashBag)
+ ::getFlashBag($this->requestStack)
->add('error', 'sylius.admin.password_reset.token_expired')
;
diff --git a/src/Sylius/Bundle/AdminBundle/Action/Account/RequestPasswordResetAction.php b/src/Sylius/Bundle/AdminBundle/Action/Account/RequestPasswordResetAction.php
index 53d75621b4..acaf627876 100644
--- a/src/Sylius/Bundle/AdminBundle/Action/Account/RequestPasswordResetAction.php
+++ b/src/Sylius/Bundle/AdminBundle/Action/Account/RequestPasswordResetAction.php
@@ -22,30 +22,19 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Routing\RouterInterface;
use Twig\Environment;
-final class RequestPasswordResetAction
+final readonly class RequestPasswordResetAction
{
public function __construct(
private FormFactoryInterface $formFactory,
private MessageBusInterface $messageBus,
- private FlashBagInterface|RequestStack $requestStackOrFlashBag,
+ private RequestStack $requestStack,
private RouterInterface $router,
private Environment $twig,
) {
- if ($this->requestStackOrFlashBag instanceof FlashBagInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- FlashBagInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function __invoke(Request $request): Response
@@ -63,7 +52,7 @@ final class RequestPasswordResetAction
$this->messageBus->dispatch($requestPasswordResetMessage);
FlashBagProvider
- ::getFlashBag($this->requestStackOrFlashBag)
+ ::getFlashBag($this->requestStack)
->add('success', 'sylius.admin.request_reset_password.success')
;
diff --git a/src/Sylius/Bundle/AdminBundle/Action/Account/ResetPasswordAction.php b/src/Sylius/Bundle/AdminBundle/Action/Account/ResetPasswordAction.php
index b3ab525f7a..61421f555a 100644
--- a/src/Sylius/Bundle/AdminBundle/Action/Account/ResetPasswordAction.php
+++ b/src/Sylius/Bundle/AdminBundle/Action/Account/ResetPasswordAction.php
@@ -22,7 +22,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
use Symfony\Component\Routing\RouterInterface;
use Twig\Environment;
@@ -31,20 +30,10 @@ final class ResetPasswordAction
public function __construct(
private FormFactoryInterface $formFactory,
private ResetPasswordDispatcherInterface $resetPasswordDispatcher,
- private FlashBagInterface|RequestStack $requestStackOrFlashBag,
+ private RequestStack $requestStack,
private RouterInterface $router,
private Environment $twig,
) {
- if ($this->requestStackOrFlashBag instanceof FlashBagInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- FlashBagInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function __invoke(Request $request, string $token): Response
@@ -59,7 +48,7 @@ final class ResetPasswordAction
$this->resetPasswordDispatcher->dispatch($token, $passwordReset->getPassword());
FlashBagProvider
- ::getFlashBag($this->requestStackOrFlashBag)
+ ::getFlashBag($this->requestStack)
->add('success', 'sylius.admin.password_reset.success')
;
diff --git a/src/Sylius/Bundle/AdminBundle/Action/ResendOrderConfirmationEmailAction.php b/src/Sylius/Bundle/AdminBundle/Action/ResendOrderConfirmationEmailAction.php
index b1d223ee28..02441a1d4f 100644
--- a/src/Sylius/Bundle/AdminBundle/Action/ResendOrderConfirmationEmailAction.php
+++ b/src/Sylius/Bundle/AdminBundle/Action/ResendOrderConfirmationEmailAction.php
@@ -21,30 +21,19 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Csrf\CsrfToken;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-final class ResendOrderConfirmationEmailAction
+final readonly class ResendOrderConfirmationEmailAction
{
public function __construct(
private OrderRepositoryInterface $orderRepository,
private OrderEmailManagerInterface $orderEmailManager,
private CsrfTokenManagerInterface $csrfTokenManager,
- private SessionInterface|RequestStack $requestStackOrSession,
+ private RequestStack $requestStack,
) {
- if ($this->requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function __invoke(Request $request): Response
@@ -66,7 +55,7 @@ final class ResendOrderConfirmationEmailAction
$this->orderEmailManager->sendConfirmationEmail($order);
FlashBagProvider
- ::getFlashBag($this->requestStackOrSession)
+ ::getFlashBag($this->requestStack)
->add('success', 'sylius.email.order_confirmation_resent')
;
diff --git a/src/Sylius/Bundle/AdminBundle/Action/ResendShipmentConfirmationEmailAction.php b/src/Sylius/Bundle/AdminBundle/Action/ResendShipmentConfirmationEmailAction.php
index d1041da851..6a6eebfc42 100644
--- a/src/Sylius/Bundle/AdminBundle/Action/ResendShipmentConfirmationEmailAction.php
+++ b/src/Sylius/Bundle/AdminBundle/Action/ResendShipmentConfirmationEmailAction.php
@@ -21,30 +21,19 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Security\Csrf\CsrfToken;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-final class ResendShipmentConfirmationEmailAction
+final readonly class ResendShipmentConfirmationEmailAction
{
public function __construct(
private ShipmentRepositoryInterface $shipmentRepository,
private ShipmentEmailManagerInterface $shipmentEmailManager,
private CsrfTokenManagerInterface $csrfTokenManager,
- private SessionInterface|RequestStack $requestStackOrSession,
+ private RequestStack $requestStack,
) {
- if ($this->requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function __invoke(Request $request): Response
@@ -66,7 +55,7 @@ final class ResendShipmentConfirmationEmailAction
$this->shipmentEmailManager->sendConfirmationEmail($shipment);
FlashBagProvider
- ::getFlashBag($this->requestStackOrSession)
+ ::getFlashBag($this->requestStack)
->add('success', 'sylius.email.shipment_confirmation_resent')
;
diff --git a/src/Sylius/Bundle/AdminBundle/Controller/ImpersonateUserController.php b/src/Sylius/Bundle/AdminBundle/Controller/ImpersonateUserController.php
index f4a8fa918a..e7a45b741e 100644
--- a/src/Sylius/Bundle/AdminBundle/Controller/ImpersonateUserController.php
+++ b/src/Sylius/Bundle/AdminBundle/Controller/ImpersonateUserController.php
@@ -28,23 +28,13 @@ use Webmozart\Assert\Assert;
final class ImpersonateUserController
{
- private ?RouterInterface $router;
-
public function __construct(
private UserImpersonatorInterface $impersonator,
private AuthorizationCheckerInterface $authorizationChecker,
private UserProviderInterface $userProvider,
- ?RouterInterface $router,
+ private RouterInterface $router,
private string $authorizationRole,
) {
- if (null === $router) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.13',
- 'Not passing a $router as the fourth argument is deprecated and will be prohibited in Sylius 2.0',
- );
- }
- $this->router = $router;
}
public function impersonateAction(Request $request, string $username): Response
diff --git a/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php b/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php
index 9c961a75f7..0afa4f6f4d 100644
--- a/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php
+++ b/src/Sylius/Bundle/AdminBundle/Controller/NotificationController.php
@@ -13,10 +13,6 @@ declare(strict_types=1);
namespace Sylius\Bundle\AdminBundle\Controller;
-use GuzzleHttp\ClientInterface as DeprecatedClientInterface;
-use GuzzleHttp\Exception\GuzzleException;
-use Http\Message\MessageFactory;
-use Nyholm\Psr7\Stream;
use Psr\Http\Client\ClientExceptionInterface;
use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestFactoryInterface;
@@ -25,44 +21,15 @@ use Sylius\Bundle\CoreBundle\SyliusCoreBundle;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
-final class NotificationController
+final readonly class NotificationController
{
public function __construct(
- private ClientInterface|DeprecatedClientInterface $client,
- private RequestFactoryInterface|MessageFactory $requestFactory,
+ private ClientInterface $client,
+ private RequestFactoryInterface $requestFactory,
private string $hubUri,
private string $environment,
- private ?StreamFactoryInterface $streamFactory = null,
+ private StreamFactoryInterface $streamFactory,
) {
- if (!$client instanceof ClientInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.13',
- 'Using a service that does not implement "%s" as a 1st argument of "%s" constructor is deprecated and will be prohibited in Sylius 2.0.',
- ClientInterface::class,
- self::class,
- );
- }
-
- if (!$requestFactory instanceof RequestFactoryInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.13',
- 'Using a service that does not implement "%s" as a 2nd argument of "%s" constructor is deprecated and will be prohibited in Sylius 2.0.',
- RequestFactoryInterface::class,
- self::class,
- );
- }
-
- if (null === $streamFactory) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.13',
- 'Not passing a service that implements "%s" as a 5th argument of "%s" constructor is deprecated and will be prohibited in Sylius 2.0.',
- StreamFactoryInterface::class,
- self::class,
- );
- }
}
public function getVersionAction(Request $request): JsonResponse
@@ -78,20 +45,12 @@ final class NotificationController
$hubRequest = $this->requestFactory
->createRequest(Request::METHOD_GET, $this->hubUri)
->withHeader('Content-Type', 'application/json')
- ->withBody(
- null === $this->streamFactory
- ? Stream::create($content)
- : $this->streamFactory->createStream($content),
- )
+ ->withBody($this->streamFactory->createStream($content))
;
try {
- if ($this->client instanceof DeprecatedClientInterface) {
- $hubResponse = $this->client->send($hubRequest, ['verify' => false]);
- } else {
- $hubResponse = $this->client->sendRequest($hubRequest);
- }
- } catch (ClientExceptionInterface|GuzzleException) {
+ $hubResponse = $this->client->sendRequest($hubRequest);
+ } catch (ClientExceptionInterface) {
return new JsonResponse('', JsonResponse::HTTP_NO_CONTENT);
}
diff --git a/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php b/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php
index 2fa630aa32..83128a778f 100644
--- a/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php
+++ b/src/Sylius/Bundle/AdminBundle/EventListener/ResourceDeleteSubscriber.php
@@ -20,27 +20,16 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpKernel\Event\ExceptionEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-final class ResourceDeleteSubscriber implements EventSubscriberInterface
+final readonly class ResourceDeleteSubscriber implements EventSubscriberInterface
{
public function __construct(
private UrlGeneratorInterface $router,
- private SessionInterface|RequestStack $requestStackOrSession,
+ private RequestStack $requestStack,
) {
- if ($this->requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/admin-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public static function getSubscribedEvents(): array
@@ -84,7 +73,7 @@ final class ResourceDeleteSubscriber implements EventSubscriberInterface
return;
}
- FlashBagProvider::getFlashBag($this->requestStackOrSession)->add('error', [
+ FlashBagProvider::getFlashBag($this->requestStack)->add('error', [
'message' => 'sylius.resource.delete_error',
'parameters' => ['%resource%' => $resourceName],
]);
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
index 4f45dcf2fc..5e22cb21c5 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
@@ -162,10 +162,10 @@ sylius_ui:
context:
event: sylius.admin.layout.sidebar_top
logo:
- template: "@SyliusAdmin/_logo.html.twig"
+ template: "@SyliusAdmin/Layout/_logo.html.twig"
priority: 20
menu:
- template: "@SyliusAdmin/_menu.html.twig"
+ template: "@SyliusAdmin/Layout/_menu.html.twig"
priority: 10
down_legacy:
template: "@SyliusUi/Block/_legacySonataEvent.html.twig"
@@ -176,7 +176,7 @@ sylius_ui:
sylius.admin.layout.javascripts:
blocks:
scripts:
- template: "@SyliusAdmin/_scripts.html.twig"
+ template: "@SyliusAdmin/Layout/_scripts.html.twig"
priority: 10
legacy:
template: "@SyliusUi/Block/_legacySonataEvent.html.twig"
@@ -187,7 +187,7 @@ sylius_ui:
sylius.admin.layout.stylesheets:
blocks:
styles:
- template: "@SyliusAdmin/_styles.html.twig"
+ template: "@SyliusAdmin/Layout/_styles.html.twig"
priority: 10
legacy:
template: "@SyliusUi/Block/_legacySonataEvent.html.twig"
@@ -209,7 +209,7 @@ sylius_ui:
template: "@SyliusAdmin/Layout/_channelLinksWidget.html.twig"
priority: 20
search:
- template: "@SyliusAdmin/_search.html.twig"
+ template: "@SyliusAdmin/Layout/_search.html.twig"
priority: 10
sylius.admin.layout.topbar_middle:
@@ -225,10 +225,10 @@ sylius_ui:
template: "@SyliusAdmin/Layout/_notificationWidget.html.twig"
priority: 30
support:
- template: "@SyliusAdmin/_support.html.twig"
+ template: "@SyliusAdmin/Layout/_support.html.twig"
priority: 20
security:
- template: "@SyliusAdmin/_security.html.twig"
+ template: "@SyliusAdmin/Layout/_security.html.twig"
priority: 10
legacy:
template: "@SyliusUi/Block/_legacySonataEvent.html.twig"
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/sylius/sylius_mailer.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/sylius/sylius_mailer.yml
index 88a4e89916..84a1e0af36 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/app/sylius/sylius_mailer.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/app/sylius/sylius_mailer.yml
@@ -5,7 +5,7 @@ sylius_mailer:
emails:
order_confirmation_resent:
subject: sylius.emails.order_confirmation.subject
- template: "@SyliusAdmin/Email/orderConfirmation.html.twig"
+ template: "@SyliusCore/Email/orderConfirmation.html.twig"
shipment_confirmation:
subject: sylius.emails.shipment_confirmation.subject
template: "@SyliusAdmin/Email/shipmentConfirmation.html.twig"
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml
index 7639ef523c..3b30871108 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/ajax/taxon.yml
@@ -60,17 +60,6 @@ sylius_admin_ajax_generate_taxon_slug:
_controller: sylius.controller.taxon_slug::generateAction
_format: json
-# This route is deprecated since Sylius 1.13.0 and will be removed in 2.0.0.
-sylius_admin_ajax_taxon_move:
- path: /{id}/move
- methods: [PUT]
- defaults:
- _controller: sylius.controller.taxon::updateAction
- _format: json
- _sylius:
- permission: true
- form: Sylius\Bundle\TaxonomyBundle\Form\Type\TaxonPositionType
-
sylius_admin_ajax_taxon_move_up:
path: /{id}/move-up
methods: [PUT]
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
index 1430fe51c2..20466c28e3 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/config/services.xml
@@ -84,8 +84,5 @@
- The "%service_id%" service is deprecated since 1.13 and will be removed in 2.0. Use "Psr\Http\Message\RequestFactoryInterface" instead.
-
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.cs.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.cs.yml
index 77d04170a0..4b81fa234c 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.cs.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.cs.yml
@@ -50,8 +50,6 @@ sylius:
product_not_active_in_channel: Produkt ještě není v tomto kanálu aktivován.
gateway:
no_sca_support_notice: Zvolená platební brána nepodporuje SCA.
- pay_pal_express_checkout_deprecation_notice: >
- PayPal Express Checkout je zastaralý. Použijte prosím novou integraci PayPal Commerce Platform.
sales_summary: Přehled prodejů
statistics:
day: Den
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de.yml
index 31ae666d65..d89011c60e 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de.yml
@@ -58,8 +58,6 @@ sylius:
minimum_price_details: Mindestpreis - die Schwelle, unter die der aktuelle Preis weder durch Katalog- noch Warenkorb-Werbeaktionen verringert werden kann. Verwenden Sie dieses Feld, um Rentabilität Ihre Verkäufe zu sichern.
gateway:
no_sca_support_notice: Das gewählte Zahlungs-Gateway unterstützt kein SCA.
- pay_pal_express_checkout_deprecation_notice: >
- PayPal Express Checkout ist veraltet. Bitte verwenden Sie die neue PayPal Handelsplattform Integration.
sales_summary: Verkaufszusammenfassung
statistics:
day: Tag
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de_CH.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de_CH.yml
index 31ae666d65..d89011c60e 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de_CH.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.de_CH.yml
@@ -58,8 +58,6 @@ sylius:
minimum_price_details: Mindestpreis - die Schwelle, unter die der aktuelle Preis weder durch Katalog- noch Warenkorb-Werbeaktionen verringert werden kann. Verwenden Sie dieses Feld, um Rentabilität Ihre Verkäufe zu sichern.
gateway:
no_sca_support_notice: Das gewählte Zahlungs-Gateway unterstützt kein SCA.
- pay_pal_express_checkout_deprecation_notice: >
- PayPal Express Checkout ist veraltet. Bitte verwenden Sie die neue PayPal Handelsplattform Integration.
sales_summary: Verkaufszusammenfassung
statistics:
day: Tag
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml
index 564a0691a4..580a386d51 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.en.yml
@@ -62,9 +62,6 @@ sylius:
channel_pricings: Channel pricings
gateway:
no_sca_support_notice: The chosen payment gateway does not support SCA.
- pay_pal_express_checkout_deprecation_notice: >
- PayPal Express Checkout is deprecated. Please, use new
- PayPal Commerce Platform integration.
lowest_price_before_discount: 'Lowest price before discount'
minimum_price_details: Minimum price - this is the pricing threshold below which the current price cannot be discounted by neither catalog nor cart promotions. Use this to guard the profitability of your sales.
original_price_details: Original price - this is the price of the product variant It is displayed as crossed-out in the catalog. It is used as the base for current price calculations. If this value is not defined, Catalog Promotion logic will copy value from Price to Original Price.
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.fr.yml b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.fr.yml
index 1107f28c8b..a9a353035f 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.fr.yml
+++ b/src/Sylius/Bundle/AdminBundle/Resources/translations/messages.fr.yml
@@ -52,8 +52,6 @@ sylius:
product_not_active_in_channel: Le produit n'est pas encore activé pour ce canal.
gateway:
no_sca_support_notice: L'interface de paiement choisie ne prend pas en charge l'authentification forte du client.
- pay_pal_express_checkout_deprecation_notice: >
- PayPal Express Checkout est obsolète. Veuillez utiliser la nouvelle intégration de PayPal Commerce Platform.
sales_summary: Récapitulatif des ventes
statistics:
day: Jour
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig
deleted file mode 100644
index e6fe865979..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Customer/Show/_menu.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% deprecated "This template is deprecated since Sylius 1.12" %}
-
-
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/_chart.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/_chart.html.twig
deleted file mode 100644
index 26776fc198..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Dashboard/_chart.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-{% deprecated "This template is deprecated since Sylius 1.8" %}
-{% set labels, values = sales_summary.months, sales_summary.sales %}
-
-{% if labels and values %}
-
-- {{ form_widget(form) }}
-+ {{ block('form_widget') }}
-
-{% endblock %}
-
-{% block sylius_promotion_action_widget %}
-
-- {{ form_widget(form) }}
-+ {{ block('form_widget') }}
-
-{% endblock %}
-```
-
-#### Upgrades Symfony to v5.2
-
-1. Upgrade Symfony dependencies by:
-
- ```bash
- composer config extra.symfony.require "^5.2"
- composer require --dev "symfony/browser-kit":"^5.2" --no-update --no-scripts
- composer require --dev "symfony/debug-bundle":"^5.2" --no-update --no-scripts
- composer require --dev "symfony/intl":"^5.2" --no-update --no-scripts
- composer require --dev "symfony/web-profiler-bundle":"^5.2" --no-update --no-scripts
- composer update
- ```
-
-1. We've removed the support for Symfony's Templating component (which is removed in Symfony 5).
-
- * Remove `templating` from framework's configuration:
-
- ```diff
- # config/packages/framework.yaml
-
- framework:
- # ...
- - templating: { engines: ["twig"] }
- ```
-
- * Replace any usages of `Symfony\Bundle\FrameworkBundle\Templating\EngineInterface` with `Twig\Environment`.
-
- Inject `twig` service into your controllers instead of `templating` or `templating.engine.twig`.
-
- `$templating->renderResponse(...)` might be replaced with `new Response($twig->render(...))`.
-
-1. Remove Twig route configuration from your `config/routes/dev/twig.yaml`:
-
- ```diff
- - _errors:
- - resource: '@TwigBundle/Resources/config/routing/errors.xml'
- - prefix: /_error
- ```
-
-1. Replace and add new keys in `config/packages/dev/jms_serializer.yaml`:
-
- ```diff
- jms_serializer:
- visitors:
- - json:
- + json_serialization:
- options:
- - JSON_PRETTY_PRINT
- - JSON_UNESCAPED_SLASHES
- - JSON_PRESERVE_ZERO_FRACTION
- + json_deserialization:
- + options:
- + - JSON_PRETTY_PRINT
- + - JSON_UNESCAPED_SLASHES
- + - JSON_PRESERVE_ZERO_FRACTION
- ```
-
-1. Replace and add new keys in `config/packages/prod/jms_serializer.yaml`:
-
- ```diff
- jms_serializer:
- visitors:
- - json:
- + json_serialization:
- options:
- - JSON_UNESCAPED_SLASHES
- - JSON_PRESERVE_ZERO_FRACTION
- + json_deserialization:
- + options:
- + - JSON_UNESCAPED_SLASHES
- + - JSON_PRESERVE_ZERO_FRACTION
- ```
-
-1. Replace key in `config/packages/jms_serializer.yaml`:
-
- ```diff
- jms_serializer:
- visitors:
- - xml:
- + xml_serialization:
- ```
-
-1. `config/packages/fos_rest.yaml` rules have been changed to:
-
- ```diff
- rules:
- - - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
- + - { path: '^/api/v1/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
- ```
-
-### Data migrations
-
-1. The `CoreBundle/Migrations/Version20201208105207.php` migration was added which extends existing adjustments with additional details (context).
-
- Depending on the type of adjustment, additionally defined information are:
-
- * Taxation details (percentage and relation to tax rate)
- * Shipping details (shipping relation)
- * Taxation for shipping (combined details of percentage and shipping relation)
-
- This data is fetched based on two assumptions:
-
- * Order level taxes relates to shipping only (default Sylius behaviour)
- * Tax rate name has not changed since the time, the first order has been placed
-
- If these are not true, please adjust migration accordingly to your need. To exclude following migration from execution run following code:
-
- ```
- bin/console doctrine:migrations:version 'Sylius\Bundle\CoreBundle\Migrations\Version20201208105207' --add
- ```
-
-1. The base of the `Adjustment` class has changed. If you extend your adjustments already (or have them overridden
- by default, because of Sylius-Standard usage), you should base your Adjustment class
- on `Sylius\Component\Core\Model\Adjustment` instead of `Sylius\Component\Order\Model\Adjustment`.
-
- ```diff
- - use Sylius\Component\Order\Model\Adjustment as BaseAdjustment;
- + use Sylius\Component\Core\Model\Adjustment as BaseAdjustment;
- ```
-
-### API v2
-
-For changes according to the API v2, please visit [API v2 upgrade file](UPGRADE-API-1.9.md).
diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md
index 52dd776ec7..aeb3b978ed 100644
--- a/UPGRADE-2.0.md
+++ b/UPGRADE-2.0.md
@@ -1,9 +1,9 @@
-# UPGRADE FROM `v1.X.X` TO `v2.0.0`
+# UPGRADE FROM `1.13` TO `2.0`
## Codebase
* Doctrine MongoDB and PHPCR is not longer supported in ResourceBundle and GridBundle:
-
+
* The following classes were removed:
* `Sylius\Bundle\GridBundle\Doctrine\PHPCRODM\DataSource`
@@ -26,16 +26,150 @@
* `Sylius\Bundle\ResourceBundle\EventListener\ODMTranslatableListener`
* The following services were removed:
-
+
* `sylius.event_subscriber.odm_mapped_super_class`
* `sylius.event_subscriber.odm_repository_class`
* `sylius.grid_driver.doctrine.phpcrodm`
-
+
* The following parameters were removed:
-
+
* `sylius.mongodb_odm.repository.class`
* `sylius.phpcr_odm.repository.class`
* The following configuration options were removed:
* `sylius.mailer.templates`
+
+* Added the `Sylius\Component\Order\Context\ResettableCartContextInterface` that
+ extends `Sylius\Component\Order\Context\CartContextInterface` and `Symfony\Contracts\Service\ResetInterface`.
+
+* The name of the default `LiipImagineBundle`'s resolver and loader were changed from **default** to **sylius_image
+ ** ([reference](https://github.com/Sylius/Sylius/pull/12543)).
+ To change the default resolver and/or loader for `LiipImagineBundle`, configure `cache` and/or `data_loader`
+ parameters under the `liip_imagine` key.
+
+* The `sylius/calendar` package has been replaced with `symfony/clock` package. All usages of
+ the `Sylius\Calendar\Provider\DateTimeProviderInterface` class
+ have been replaced with `Symfony\Component\Clock\ClockInterface` class.
+
+ * The following classes were changed:
+
+ * `Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncer`
+ * `Sylius\Bundle\CoreBundle\MessageHandler\Admin\Account\RequestResetPasswordEmailHandler`
+ * `Sylius\Bundle\CoreBundle\PriceHistory\Logger\PriceChangeLogger`
+ * `Sylius\Bundle\CoreBundle\PriceHistory\Remover\ChannelPricingLogEntriesRemover`
+ * `Sylius\Bundle\ShippingBundle\Assigner\ShippingDateAssigner`
+ * `Sylius\Bundle\PromotionBundle\Criteria\DateRange`
+ * `Sylius\Bundle\ApiBundle\Applicator\ArchivingShippingMethodApplicator`
+ * `Sylius\Bundle\ApiBundle\CommandHandler\Account\RequestResetPasswordTokenHandler`
+ * `Sylius\Bundle\ApiBundle\CommandHandler\Account\VerifyCustomerAccountHandler`
+ * `Sylius\Component\Taxation\Checker\TaxRateDateEligibilityChecker`
+
+* The parameter order of `Sylius\Bundle\CoreBundle\Form\Type\Checkout\AddressType::__construct` has been changed:
+
+```php
+ public function __construct(
+ + private readonly AddressComparatorInterface $addressComparator,
+ string $dataClass,
+ array $validationGroups = []
+ - private readonly AddressComparatorInterface $addressComparator = null,
+ )
+```
+
+* The `\Serializable` interface has been removed from the `Sylius\Component\User\Model\UserInterface`.
+
+* The parameter order of the `Sylius\Component\Core\OrderProcessing\OrderPaymentProcessor::__construct` has been
+ changed:
+
+```php
+ public function __construct(
+ private OrderPaymentProviderInterface $orderPaymentProvider,
+ - private string $targetState = PaymentInterface::STATE_CART,
+ private OrderPaymentsRemoverInterface $orderPaymentsRemover,
+ private array $unprocessableOrderStates,
+ + private string $targetState = PaymentInterface::STATE_CART,
+ )
+```
+
+* The `swiftmailer/swiftmailer` dependency has been removed. Use `symfony/mailer` instead.
+
+* The following repository classes and interfaces were added, if you have custom repositories,
+ you need to update them to extend the new ones:
+
+ Addressing:
+
+ * `Sylius\Bundle\AddressingBundle\Doctrine\ORM\AddressRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Addressing\Repository\AddressRepositoryInterface`
+ * `Sylius\Bundle\AddressingBundle\Doctrine\ORM\CountryRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Addressing\Repository\CountryRepositoryInterface`
+ * `Sylius\Bundle\AddressingBundle\Doctrine\ORM\ProvinceRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Addressing\Repository\ProvinceRepositoryInterface`
+ * `Sylius\Bundle\AddressingBundle\Doctrine\ORM\ZoneMemberRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Addressing\Repository\ZoneMemberRepositoryInterface`
+
+ Attribute:
+
+ * `Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Attribute\Repository\AttributeRepositoryInterface`
+ * `Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeTranslationRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Attribute\Repository\AttributeTranslationRepositoryInterface`
+ * `Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeValueRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Attribute\Repository\AttributeValueRepositoryInterface`
+
+ Product:
+
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationTypeTranslationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAttributeRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAttributeTranslationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionTranslationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionValueRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionValueTranslationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductTranslationRepository`
+ * `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductVariantTranslationRepository`
+
+ Currency:
+
+ * `Sylius\Bundle\CurrencyBundle\Doctrine\ORM\CurrencyRepository`
+ extends `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository`
+ implements `Sylius\Component\Currency\Repository\CurrencyRepositoryInterface`
+
+* The following repository classes and interfaces namespaces were changed, if you have custom repositories,
+ you need to update them to extend the new ones:
+
+ Addressing:
+
+ * `Sylius\Bundle\CoreBundle\Doctrine\ORM\AddressRepository` extended class changed from
+ `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository` to
+ `Sylius\Bundle\AddressingBundle\Doctrine\ORM\AddressRepository`
+ * `Sylius\Component\Core\Repository\AddressRepositoryInterface` implemented interface changed from
+ `Sylius\Component\Resource\Repository\RepositoryInterface` to
+ `Sylius\Component\Addressing\Repository\AddressRepositoryInterface`
+
+ Attribute:
+
+ * `Sylius\Bundle\CoreBundle\Doctrine\ORM\AttributeRepository` extended class changed from
+ `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository` to
+ `Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeRepository`
+ * `Sylius\Component\Product\Repository\ProductAttributeValueRepositoryInterface` extended interface changed from
+ `Sylius\Component\Resource\Repository\RepositoryInterface` to
+ `Sylius\Component\Attribute\Repository\AttributeValueRepositoryInterface`
+
+ Product:
+
+ * `Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductAssociationRepository` extended class changed from
+ `Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository` to
+ `Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationRepository`
+
+## Frontend
+
+* `use_webpack` option was removed from the `sylius_ui` configuration, and the Webpack has become the only module
+ bundler provided by Sylius.
+* `use_webpack` twig global variable was removed. Webpack is always used now, and there is no need to check for it.
diff --git a/UPGRADE-API-1.10.md b/UPGRADE-API-1.10.md
deleted file mode 100644
index 904b2be44e..0000000000
--- a/UPGRADE-API-1.10.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# UPGRADE FROM `v1.10.0` TO `v1.10.1`
-
-1. API is disabled by default, to enable it you need to set flag to ``true`` in ``config/packages/_sylius.yaml``:
-
- ```yaml
- sylius_api:
- enabled: true
- ```
-
-# UPGRADE FROM `v1.9.X` TO `v1.10.0`
-
-1. API CartShippingMethod key `cost` has been changed to `price`.
-
-1. API Ship Shipment endpoint (PATCH api/v2/admin/shipments/{id}/ship) body value `tracking` has been changed to `trackingCode`.
-
-1. To have better control over the serialization process, we introduced `shop` and `admin` prefixes to names of serialization groups on `src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/*` and `src/Sylius/Bundle/ApiBundle/Resources/config/serialization/*`.
- Several additional serialization groups have been rephrased, to improve readability and predictability of them.
- If you are using they on your custom entity `api_resource` configuration or serialization groups, you should check if one of these changes may affect on your app. If yes, change all occurs by this pattern:
-
-- `product_review:update` changed to: `admin:product_review:update` and `shop:product_review:update`
-
-- `product_association_type` changed to: `admin:product_association_type`
-
-- `product_option` changed to: `admin:product_option`
-
-- `product_option_value` changed to: `admin:product_option_value`
-
-- `product_taxon` changed to: `admin:product_taxon` and `shop:product_taxon`
-
-- `product_variant` changed to: `admin:product_variant` and `shop:product_variant`
-
-- `taxon_translation` changed to: `admin:taxon_translation` and `shop:taxon_translation`
-
-1. We've removed `Sylius\Bundle\ApiBundle\ApiPlatform\Bridge\Doctrine\ORM\SubresourceDataProvider`. It's no longer needed because `ApiPlatform\Core\Bridge\Doctrine\Orm\SubresourceDataProvider` has the same logic.
-
-1. API Change Quantity endpoint `PATCH api/v2/admin/orders/{tokenValue}/change-quantity` has been changed to `PATCH api/v2/admin/orders/{tokenValue}/items/{orderItemId}` and its body value `orderItemId` has been removed (now it is a route parameter) and `newQuantity` has been renamed to `quantity`.
-
-1. API Add to cart endpoint `PATCH /api/v2/shop/orders/{tokenValue}/items` no longer requires `productCode` in request body.
-
-1. Channel pricing resource and its serialization has been removed from shop section
-
-1. `Sylius\Bundle\ApiBundle\DataProvider\AddressCollectionDataProvider` has been removed in favour of `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\AddressesExtension`
-
-1. Second argument of `Sylius\Bundle\ApiBundle\DataPersister\AddressDataPersister` has been changed
- from `CustomerContextInterface $customerContext` to `UserContextInterface $userContext`
-
-#### Commands
-
-1. We've removed `productCode` from `Sylius\Bundle\ApiBundle\Command\Cart\AddItemToCart` command.
-
-1. Endpoints with changed code to IRI:
-
-PATCH on `/api/v2/shop/account/orders/{tokenValue}/payments/{paymentId}`:
-
-````
-{
- - "paymentMethodCode": "string"
- + "paymentMethod": "string"
-}
-````
-
-POST on `/api/v2/shop/product-reviews`:
-
-````
-{
- "title": "string",
- "rating": 0,
- "comment": "string",
- - "productCode": "string",
- + "product": "string",
- "email": "string"
-}
-````
-
-POST on `/api/v2/shop/reset-password-requests`:
-
-````
-{
- - "localeCode": "string"
- + "locale": "string"
-}
-````
-
-
-POST on `api/v2/shop/account-verification-requests`:
-
-````
-{
- - "localeCode": "string"
- + "locale": "string"
-}
-````
-
-PATCH on `/api/v2/shop/account/orders/{tokenValue}/shipments/{shipmentId}`:
-
-````
-{
- - "shippingMethodCode": "string"
- + "shippingMethod": "string"
-}
-````
-
-PATCH on `/api/v2/shop/account/orders/{tokenValue}/items`:
-
-````
-{
- - "productVariantCode": "string"
- + "productVariant": "string"
-}
-````
diff --git a/UPGRADE-API-1.11.md b/UPGRADE-API-1.11.md
deleted file mode 100644
index 3298d4e55d..0000000000
--- a/UPGRADE-API-1.11.md
+++ /dev/null
@@ -1,423 +0,0 @@
-# UPGRADE FROM `v1.11.11` TO `v1.11.12`
-
-1. So far, on production environment when any non-validation related error occurred, the `FOS\RestBundle\Serializer\Normalizer\FlattenExceptionHandler` was used, even on API Platform endpoints.
- Now, depending on the path of the request, the `FOS\RestBundle\Serializer\Normalizer\FlattenExceptionHandler` or `ApiPlatform\Hydra\Serializer\ErrorNormalizer` is used. If your code
- rely on the previous behavior, you should add the following configuration to your `config/packages/_sylius.yaml` file:
- ```yaml
- sylius_api:
- legacy_error_handling: true
- ```
-
- Example response before bugfix:
- ```json
- {
- "code": 500,
- "message": "Internal Server Error"
- }
- ```
-
- Example response after bugfix:
- ```json
- {
- "@context": "/api/v2/contexts/Error",
- "@type": "hydra:Error",
- "hydra:title": "An error occurred",
- "hydra:description": "Internal Server Error"
- }
- ```
- The status code is passed along the response as an HTTP status code, and the `message` value is returned in a `hydra:description` field.
-
-# UPGRADE FROM `v1.10.X` TO `v1.11.0`
-
-1. The product images should have a proper prefix (`/media/image/`) added to the path, so the images could be resolved.
- This is now done out of the box and response of `Product Image` resource is now:
-
- ```diff
- {
- "@context": "/api/v2/contexts/ProductImage",
- "@id": "/api/v2/shop/product-images/123",
- "@type": "ProductImage",
- "id": "123",
- "type": "thumbnail",
- - "path": "uo/product.jpg",
- + "path": "/media/image/uo/product.jpg"
- }
- ```
-
- To change the prefix you need to set parameter in ``config/packages/_sylius.yaml``:
-
- ```yaml
- sylius_api:
- product_image_prefix: 'media/image'
- ```
-
-1. The following resources' response format changed:
- * Taxons
- * Products
- * ProductVariants
- * ProductOptions
- * ProductOptionValues
- * ShippingMethods
- * Payments
- * PaymentMethods
- * Orders
-
- Note that it concerns only `shop` endpoints. Now instead of returning an array of `translations` for a given resource,
- translation is done automatically based on the current locale. For example changes in request body of `GET` `api/v2/shop/shipping-methods/{code}` endpoint:
-
- ```diff
- {
- "@context": "string",
- "@id": "string",
- "@type": "string",
- "id": 0,
- "code": "string",
- "position": 0,
- - "translations": {
- - "en_US": {
- - "name": "string",
- - "description": "string",
- - "locale": "string"
- - }
- - },
- "name": "string"
- + "description": "string"
- }
- ```
-
-1. The `api/v2/shop/payment/{id}/methods` endpoint has now `shop:payment_method:read` serialization group assigned.
- Therefore its body will look like this by default:
-
- ```
- {
- "@context": "\/api\/v2\/contexts\/PaymentMethod",
- "@id": "\/api\/v2\/shop\/orders\/nAWw2jewpA\/payments\/@integer@\/methods",
- "@id": "\/api\/v2\/shop\/payments\/@integer@\/methods",
- "@type": "hydra:Collection",
- "hydra:member": [
- {
- "@id": "\/api\/v2\/shop\/payment-methods\/CASH_ON_DELIVERY",
- "@type": "PaymentMethod",
- "id": 1,
- "code": "CASH_ON_DELIVERY",
- "position": 0,
- "name": "Cash on delivery",
- "description": "Description",
- "instructions": null
- }
- ],
- "hydra:totalItems": 1
- }
- ```
-
-1. The method of the `/shop/orders/{tokenValue}/items` endpoint has been changed from `PATCH` to `POST`
-
-1. `Sylius\Bundle\ApiBundle\View\CartShippingMethodInterface` and `Sylius\Bundle\ApiBundle\View\CartShippingMethod` have been removed.
-
-1. `Sylius\Bundle\ApiBundle\Applicator\ShipmentStateMachineTransitionApplicatorInterface` and `Sylius\Bundle\ApiBundle\Applicator\ShipmentStateMachineTransitionApplicator` have been removed.
-
-1. `Sylius\Bundle\ApiBundle\View\Factory\CartShippingMethodFactoryInterface` and `Sylius\Bundle\ApiBundle\View\Factory\CartShippingMethodFactory` have been removed.
-
-1. The `Sylius\Bundle\ApiBundle\DataTransformer\LoggedInShopUserEmailAwareCommandDataTransformer` service has been renamed to `Sylius\Bundle\ApiBundle\DataTransformer\LoggedInCustomerEmailAwareCommandDataTransformer`
-
-1. The constructor of `Sylius\Bundle\ApiBundle\DataProvider\CartShippingMethodsSubresourceDataProvider` has been changed:
-
- ```diff
- public function __construct(
- OrderRepositoryInterface $orderRepository,
- ShipmentRepositoryInterface $shipmentRepository,
- ShippingMethodsResolverInterface $shippingMethodsResolver,
- - ServiceRegistryInterface $calculators,
- - CartShippingMethodFactoryInterface $cartShippingMethodFactory
- ) {
- ...
- }
- ```
-
-1. The `Sylius\Bundle\ApiBundle\Command\Cart\PickupCart` command has interface changed from `Sylius\Bundle\ApiBundle\Command\ShopUserIdAwareInterface`
- to `Sylius\Bundle\ApiBundle\Command\CustomerEmailAwareInterface`, therefore following fields and methods have been changed
-
- ```diff
- - public $shopUserId;
- + public ?string $email = null;
-
- - public function getShopUserId()
- + public function getEmail(): ?string
-
- - public function setShopUserId($shopUserId): void
- + public function setEmail(?string $email): void
- ```
-
-1. The constructor of `Sylius\Bundle\ApiBundle\CommandHandler\Cart\PickupCartHandler` has been changed:
-
- ```diff
- public function __construct(
- FactoryInterface $cartFactory,
- OrderRepositoryInterface $cartRepository,
- ChannelRepositoryInterface $channelRepository,
- ObjectManager $orderManager,
- RandomnessGeneratorInterface $generator,
- - UserRepositoryInterface $userRepository
- + CustomerRepositoryInterface $customerRepository
- ) {
- ...
- }
- ```
-
-1. The constructor of `Sylius\Bundle\ApiBundle\CommandHandler\Checkout\AddressOrderHandler` has been changed:
-
- ```diff
- public function __construct(
- OrderRepositoryInterface $orderRepository,
- - CustomerRepositoryInterface $customerRepository,
- - FactoryInterface $customerFactory,
- ObjectManager $manager,
- StateMachineFactoryInterface $stateMachineFactory,
- AddressMapperInterface $addressMapper
- AddressMapperInterface $addressMapper,
- + CustomerProviderInterface $customerProvider
- ) {
- ```
-
-1. The response schema for endpoint `GET /api/v2/shop/orders/{tokenValue}/shipments/{shipments}/methods` has been changed from:
-
- ```
- ...
- "hydra:member": [
- {
- ...
- "@type": "CartShippingMethod",
- "shippingMethod": {
- ...
- "price": 500
- }
- }
- ]
- ```
- to:
- ```
- ...
- "hydra:member": [
- {
- ...
- "@type": "ShippingMethod",
- ...
- "price": 500
- }
- ]
- ```
-
-1. Constructor of `Core/OrderProcessing/OrderTaxesProcessor.php` has been changed where new service implementing
- `TaxationAddressResolverInterface` will become mandatory from Sylius version 2.0:
-
- ```diff
- public function __construct(
- ZoneProviderInterface $defaultTaxZoneProvider,
- ZoneMatcherInterface $zoneMatcher,
- PrioritizedServiceRegistryInterface $strategyRegistry,
- + ?TaxationAddressResolverInterface $taxationAddressResolver = null
- ) {
- ...
- }
- ```
-
-1. Constructor of `Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail` has been removed. Relation to the current
- customer is set through `setShopUserId()`
-
-1. The `Sylius\Bundle\ApiBundle\Validator\Constraints\ShopUserExists` constraint and the `Sylius\Bundle\ApiBundle\Validator\Constraints\ShopUserExistsValidator`
- have been removed
-
-1. Constructor of `ApiBundle/Serializer/ProductVariantNormalizer.php` has been extended with `SectionProviderInterface`
- argument:
-
- ```diff
- public function __construct(
- ProductVariantPricesCalculatorInterface $priceCalculator,
- ChannelContextInterface $channelContext,
- AvailabilityCheckerInterface $availabilityChecker,
- + SectionProviderInterface $uriBasedSectionContext
- ) {
- ...
- }
- ```
-
-1. Request body of `POST` `api/v2/shop/addresses` endpoint has been changed:
-
- ```diff
- {
- - "customer": "string",
- "firstName": "string",
- "lastName": "string",
- "phoneNumber": "string",
- "company": "string",
- "countryCode": "string",
- "provinceCode": "string",
- "provinceName": "string",
- "street": "string",
- "city": "string",
- "postcode": "string"
- }
- ```
-
-1. Request body of `POST` `api/v2/shop/account-verification-requests` endpoint has been removed:
-
- ```diff
- {
- - "email": "string",
- - "localeCode": "string"
- }
- ```
-
-1. The service `Sylius\Bundle\ApiBundle\Converter\ItemIriToIdentifierConverter` has changed its name to `Sylius\Bundle\ApiBundle\Converter\IriToIdentifierConverter`
- and its service definition from `Sylius\Bundle\ApiBundle\Converter\ItemIriToIdentifierConverter` to `Sylius\Bundle\ApiBundle\Converter\IriToIdentifierConverterInterface`
-
-1. The service `Sylius\Bundle\ApiBundle\Serializer\CommandFieldItemIriToIdentifierDenormalizer` has changed its name to `Sylius\Bundle\ApiBundle\Serializer\CommandArgumentsDenormalizer`
- and also its service definition.
-
-1. Following namespaces has been changed:
- * '\Sylius\Bundle\ApiBundle\CommandHandler\AddProductReviewHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Catalog\AddProductReviewHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\BlameCartHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Cart\BlameCartHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\RequestResetPasswordTokenHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\RequestResetPasswordTokenHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\ResendVerificationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\ResendVerificationEmailHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\ResetPasswordHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\ResetPasswordHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\SendAccountRegistrationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendAccountRegistrationEmailHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\SendAccountVerificationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendAccountVerificationEmailHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\SendOrderConfirmationHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Checkout\SendOrderConfirmationHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\SendResetPasswordEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\SendResetPasswordEmailHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\SendShipmentConfirmationEmailHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Checkout\SendShipmentConfirmationEmailHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\VerifyCustomerAccountHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\VerifyCustomerAccountHandler'
- * '\Sylius\Bundle\ApiBundle\Command\AddProductReview' => '\Sylius\Bundle\ApiBundle\Command\Catalog\AddProductReview'
- * '\Sylius\Bundle\ApiBundle\Command\BlameCart' => '\Sylius\Bundle\ApiBundle\Command\Cart\BlameCart'
- * '\Sylius\Bundle\ApiBundle\Command\RequestResetPasswordToken' => '\Sylius\Bundle\ApiBundle\Command\Account\RequestResetPasswordToken'
- * '\Sylius\Bundle\ApiBundle\Command\ResendVerificationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\ResendVerificationEmail'
- * '\Sylius\Bundle\ApiBundle\Command\ResetPassword' => '\Sylius\Bundle\ApiBundle\Command\Account\ResetPassword'
- * '\Sylius\Bundle\ApiBundle\Command\SendAccountRegistrationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail'
- * '\Sylius\Bundle\ApiBundle\Command\SendAccountVerificationEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendAccountVerificationEmail'
- * '\Sylius\Bundle\ApiBundle\Command\SendOrderConfirmation' => '\Sylius\Bundle\ApiBundle\Command\Checkout\SendOrderConfirmation'
- * '\Sylius\Bundle\ApiBundle\Command\SendResetPasswordEmail' => '\Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail'
- * '\Sylius\Bundle\ApiBundle\Command\SendShipmentConfirmationEmail' => '\Sylius\Bundle\ApiBundle\Command\Checkout\SendShipmentConfirmationEmail'
- * '\Sylius\Bundle\ApiBundle\Command\VerifyCustomerAccount' => '\Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\ChangeShopUserPasswordHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\ChangeShopUserPasswordHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\PickupCartHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Cart\PickupCartHandler'
- * '\Sylius\Bundle\ApiBundle\CommandHandler\RegisterShopUserHandler' => '\Sylius\Bundle\ApiBundle\CommandHandler\Account\RegisterShopUserHandler'
- * '\Sylius\Bundle\ApiBundle\Command\ChangeShopUserPassword' => '\Sylius\Bundle\ApiBundle\Command\Account\ChangeShopUserPassword'
- * '\Sylius\Bundle\ApiBundle\Command\RegisterShopUser' => '\Sylius\Bundle\ApiBundle\Command\Account\RegisterShopUser'
- * '\Sylius\Bundle\ApiBundle\Doctrine\Filters\ExchangeRateFilter' => '\Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter'
- * '\Sylius\Bundle\ApiBundle\Doctrine\Filters\TranslationOrderNameAndLocaleFilter' => 'Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter'
-
-1. Following validator alias has been changed:
- * `sylius.validator.unique_shop_user_email` => `sylius_validator_unique_shop_user_email`
-
-1. Following services ids has been changed:
- * `sylius.api.upload_avatar_image_action` => `Sylius\Bundle\ApiBundle\Controller\UploadAvatarImageAction`
- * `sylius.api.upload_avatar_image_action` => `Sylius\Bundle\ApiBundle\Controller\UploadAvatarImageAction`
- * `Sylius\Bundle\ApiBundle\Changer\PaymentMethodChanger` => `Sylius\Bundle\ApiBundle\Changer\PaymentMethodChangerInterface`
- * `sylius_api.serializer_context_builder.channel` => `Sylius\Bundle\ApiBundle\SerializerContextBuilder\ChannelContextBuilder`
- * `sylius.api.context.user` => `Sylius\Bundle\ApiBundle\Context\UserContextInterface`
- * `sylius.api.checker.applied_coupon_eligibility_checker` => `Sylius\Bundle\ApiBundle\Checker\AppliedCouponEligibilityCheckerInterface`
- * `Sylius\Bundle\ApiBundle\Applicator\ArchivingShippingMethodApplicator` => `Sylius\Bundle\ApiBundle\Applicator\ArchivingShippingMethodApplicatorInterface`
- * `Sylius\Bundle\ApiBundle\Applicator\OrderStateMachineTransitionApplicator` => `Sylius\Bundle\ApiBundle\Applicator\OrderStateMachineTransitionApplicatorInterface`
- * `Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicator` => `Sylius\Bundle\ApiBundle\Applicator\PaymentStateMachineTransitionApplicatorInterface`
- * `Sylius\Bundle\ApiBundle\Applicator\ProductReviewStateMachineTransitionApplicator` => `Sylius\Bundle\ApiBundle\Applicator\ProductReviewStateMachineTransitionApplicatorInterface`
- * `sylius.api.property_info.extractor.empty_list_extractor` => `Sylius\Bundle\ApiBundle\PropertyInfo\Extractor\EmptyPropertyListExtractor`
- * `sylius.api.data_transformer.order_token_value_aware_input_data_transformer` => `Sylius\Bundle\ApiBundle\DataTransformer\OrderTokenValueAwareInputCommandDataTransformer`
- * `sylius.api.data_transformer.shipment_id_aware_input_command` => `Sylius\Bundle\ApiBundle\DataTransformer\ShipmentIdAwareInputCommandDataTransformer`
- * `sylius.api.data_transformer.logged_in_shop_user_id_aware_input_data_transformer` => `Sylius\Bundle\ApiBundle\DataTransformer\LoggedInShopUserIdAwareCommandDataTransformer`
- * `sylius.api.data_transformer.channel_code_aware_input_data_transformer` => `Sylius\Bundle\ApiBundle\DataTransformer\ChannelCodeAwareInputCommandDataTransformer`
- * `sylius.api.data_transformer.logged_in_shop_user_email_aware_command` => `Sylius\Bundle\ApiBundle\DataTransformer\LoggedInCustomerEmailAwareCommandDataTransformer`
- * `sylius.api.data_transformer.locale_code_aware_input_data_transformer` => `Sylius\Bundle\ApiBundle\DataTransformer\LocaleCodeAwareInputCommandDataTransformer`
- * `sylius.api.data_transformer.subresource_id_aware_data_transformer` => `Sylius\Bundle\ApiBundle\DataTransformer\SubresourceIdAwareCommandDataTransformer`
- * `sylius.api.section_resolver.admin_api_uri_based_section_resolver` => `Sylius\Bundle\ApiBundle\SectionResolver\AdminApiUriBasedSectionResolver`
- * `sylius.api.section_resolver.shop_api_uri_based_section_resolver` => `Sylius\Bundle\ApiBundle\SectionResolver\ShopApiUriBasedSectionResolver`
- * `sylius.listener.api_cart_blamer` => `Sylius\Bundle\ApiBundle\EventListener\ApiCartBlamerListener`
- * `sylius.context.cart.token_value_based` => `Sylius\Bundle\ApiBundle\Context\TokenValueBasedCartContext`
- * `sylius.api.data_persister.address` => `Sylius\Bundle\ApiBundle\DataPersister\AddressDataPersister`
- * `sylius.api.data_persister.admin_user` => `Sylius\Bundle\ApiBundle\DataPersister\AdminUserDataPersister`
- * `sylius.api.data_persister.shipping_method` => `Sylius\Bundle\ApiBundle\DataPersister\ShippingMethodDataPersister`
- * `sylius.api.item_data_provider.address` => `Sylius\Bundle\ApiBundle\DataProvider\AddressItemDataProvider`
- * `sylius.api.item_data_provider.order_item` => `Sylius\Bundle\ApiBundle\DataProvider\OrderItemItemDataProvider`
- * `sylius.api.item_data_provider.order_item_unit` => `Sylius\Bundle\ApiBundle\DataProvider\OrderItemUnitItemDataProvider`
- * `sylius.api.item_data_provider.payment` => `Sylius\Bundle\ApiBundle\DataProvider\PaymentItemDataProvider`
- * `sylius.api.item_data_provider.shipment` => `Sylius\Bundle\ApiBundle\DataProvider\ShipmentItemDataProvider`
- * `sylius.api.collection_data_provider.country` => `Sylius\Bundle\ApiBundle\DataProvider\CountryCollectionDataProvider`
- * `sylius.api.collection_data_provider.taxon` => `Sylius\Bundle\ApiBundle\DataProvider\TaxonCollectionDataProvider`
- * `sylius.api.collection_data_provider.locale` => `Sylius\Bundle\ApiBundle\DataProvider\LocaleCollectionDataProvider`
- * `sylius.api.collection_data_provider.product` => `Sylius\Bundle\ApiBundle\DataProvider\ProductItemDataProvider`
- * `sylius.api.collection_data_provider.customer` => `Sylius\Bundle\ApiBundle\DataProvider\CustomerItemDataProvider`
- * `sylius.api.item_data_provider.reset_password_item` => `Sylius\Bundle\ApiBundle\DataProvider\ResetPasswordItemDataProvider`
- * `sylius.api.kerner_request_event_subscriber` => `Sylius\Bundle\ApiBundle\EventSubscriber\KernelRequestEventSubscriber`
- * `sylius.api.product_slug_event_subscriber` => `Sylius\Bundle\ApiBundle\EventSubscriber\ProductSlugEventSubscriber`
- * `sylius.api.product_taxon_filter` => `Sylius\Bundle\ApiBundle\Filter\Doctrine\TaxonFilter`
- * `sylius.api.exchange_rate_filter` => `Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter`
- * `sylius.api.translation_order_name_and_locale_filter` => `Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter`
- * `sylius.api.product_variant_option_value_filter` => `Sylius\Bundle\ApiBundle\Doctrine\Filter\ProductVariantOptionValueFilter`
- * `sylius.api.get_configuration_action` => `Sylius\Bundle\ApiBundle\Controller\Payment\GetPaymentConfiguration" public="true`
- * `sylius.validator.unique_shop_user_email` => `Sylius\Bundle\ApiBundle\Validator\Constraints\UniqueShopUserEmailValidator`
- * `sylius.api.validator.order_not_empty` => `Sylius\Bundle\ApiBundle\Validator\Constraints\OrderNotEmptyValidator`
- * `sylius.api.validator.order_product_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\OrderProductEligibilityValidator`
- * `sylius.api.validator.order_item_availability` => `Sylius\Bundle\ApiBundle\Validator\Constraints\OrderItemAvailabilityValidator`
- * `sylius.api.validator.shipping_method_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\OrderShippingMethodEligibilityValidator`
- * `sylius.api.validator.chosen_shipping_method_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenShippingMethodEligibilityValidator`
- * `sylius.api.validator.adding_eligible_product_variant_to_cart` => `Sylius\Bundle\ApiBundle\Validator\Constraints\AddingEligibleProductVariantToCartValidator`
- * `sylius.api.validator.changing_item_quantity_in_cart` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ChangedItemQuantityInCartValidator`
- * `sylius.api.validator.correct_order_address` => `Sylius\Bundle\ApiBundle\Validator\Constraints\CorrectOrderAddressValidator`
- * `sylius.api.validator.payment_method_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\OrderPaymentMethodEligibilityValidator`
- * `sylius.api.validator.chosen_payment_method_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ChosenPaymentMethodEligibilityValidator`
- * `sylius.api.validator.correct_change_shop_user_confirm_password` => `Sylius\Bundle\ApiBundle\Validator\Constraints\CorrectChangeShopUserConfirmPasswordValidator`
- * `sylius.api.validator.confirm_reset_password` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ConfirmResetPasswordValidator`
- * `sylius.api.validator.promotion_coupon_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\PromotionCouponEligibilityValidator`
- * `sylius.api.validator.shipment_already_shipped` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ShipmentAlreadyShippedValidator`
- * `sylius.api.validator.shop_user_not_verified` => `Sylius\Bundle\ApiBundle\Validator\Constraints\ShopUserNotVerifiedValidator`
- * `sylius.api.validator.account_verification_token_eligibility` => `Sylius\Bundle\ApiBundle\Validator\Constraints\AccountVerificationTokenEligibilityValidator`
- * `sylius.api.validator.unique_reviewer_email` => `Sylius\Bundle\ApiBundle\Validator\Constraints\UniqueReviewerEmailValidator`
- * `sylius.api.collection_data_provider.payment_method` => `Sylius\Bundle\ApiBundle\DataProvider\CartPaymentMethodsSubresourceDataProvider`
- * `sylius.api.collection_data_provider.adjustments_for_order` => `Sylius\Bundle\ApiBundle\DataProvider\OrderAdjustmentsSubresourceDataProvider`
- * `sylius.api.collection_data_provider.adjustments_for_order_item` => `Sylius\Bundle\ApiBundle\DataProvider\OrderItemAdjustmentsSubresourceDataProvider`
- * `sylius.api.item_data_provider.verify_customer_account` => `Sylius\Bundle\ApiBundle\DataProvider\VerifyCustomerAccountItemDataProvider`
- * `sylius_api.serializer_context_builder.locale` => `Sylius\Bundle\ApiBundle\SerializerContextBuilder\LocaleContextBuilder`
- * `sylius_api.serializer_context_builder.http_request_method_type` => `Sylius\Bundle\ApiBundle\SerializerContextBuilder\HttpRequestMethodTypeContextBuilder`
- * `sylius.api.doctrine.query_collection_extension.hide_archived_shipping_method` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\HideArchivedShippingMethodExtension`
- * `sylius.api.doctrine.query_collection_extension.accepted_product_reviews` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\AcceptedProductReviewsExtension`
- * `sylius.api.doctrine.query_collection_extension.addresses` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\AddressesExtension`
- * `sylius.api.doctrine.query_collection_extension.products_by_channel_and_locale_code` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\ProductsByChannelAndLocaleCodeExtension`
- * `sylius.api.doctrine.query_collection_extension.orders_by_logged_in_user` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\OrdersByLoggedInUserExtension`
- * `sylius.api.doctrine.query_collection_extension.products_with_enable_flag` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\ProductsWithEnableFlagExtension`
- * `sylius.api.doctrine.query_item_extension.get_order` => `Sylius\Bundle\ApiBundle\Doctrine\QueryItemExtension\OrderGetMethodItemExtension`
- * `sylius.api.doctrine.query_item_extension.delete_order` => `Sylius\Bundle\ApiBundle\Doctrine\QueryItemExtension\OrderMethodsItemExtension`
- * `sylius.api.collection_data_provider.shipping_methods_available_for_order` => `Sylius\Bundle\ApiBundle\DataProvider\CartShippingMethodsSubresourceDataProvider`
- * `sylius.api.swagger_admin_authentication_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\AdminAuthenticationTokenDocumentationNormalizer`
- * `sylius.api.swagger_shop_authentication_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\ShopAuthenticationTokenDocumentationNormalizer`
- * `sylius.api.swagger_product_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\ProductDocumentationNormalizer`
- * `sylius.api.swagger_product_image_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\ProductImageDocumentationNormalizer`
- * `sylius.api.swagger_product_variant_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\ProductVariantDocumentationNormalizer`
- * `sylius.api.swagger_shipping_method_documentation_normalizer` => `Sylius\Bundle\ApiBundle\Swagger\ShippingMethodDocumentationNormalizer`
-
-1. Following Data Providers have been transformed to Doctrine Extensions:
- * `Sylius\Bundle\ApiBundle\DataProvider\AddressItemDataProvider` => `Sylius\Bundle\ApiBundle\Doctrine\QueryItemExtension\AddressItemExtension`
- * `Sylius\Bundle\ApiBundle\DataProvider\CountryCollectionDataProvider` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\CountryCollectionExtension`
- * `Sylius\Bundle\ApiBundle\DataProvider\CurrencyCollectionDataProvider` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\CurrencyCollectionExtension`
- * `Sylius\Bundle\ApiBundle\DataProvider\LocaleCollectionDataProvider` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\LocaleCollectionExtension`
- * `Sylius\Bundle\ApiBundle\DataProvider\TaxonCollectionDataProvider` => `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\TaxonCollectionExtension`
-
-1. The following filters have been moved to new namespace:
- * `Sylius\Bundle\ApiBundle\Doctrine\Filter\ExchangeRateFilter` service has been moved and renamed to `Sylius\Bundle\ApiBundle\Filter\Doctrine\ExchangeRateFilter`
- * `Sylius\Bundle\ApiBundle\Doctrine\Filter\TranslationOrderNameAndLocaleFilter` service has been moved and renamed to `Sylius\Bundle\ApiBundle\Filter\Doctrine\TranslationOrderNameAndLocaleFilter`
- * `Sylius\Bundle\ApiBundle\Doctrine\Filter\ProductVariantOptionValueFilter` service has been moved and renamed to `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductVariantOptionValueFilter`
- * `Sylius\Bundle\ApiBundle\Doctrine\Filter\ProductPriceOrderFilter` service has been moved and renamed to `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductPriceOrderFilter`
-
-1. `Sylius\Bundle\ApiBundle\Command\Cart\ApplyCouponToCart` and `Sylius\Bundle\ApiBundle\Command\Checkout\AddressOrder` commands have been replaced with `Sylius\Bundle\ApiBundle\Command\Checkout\UpdateCart`.
-
-1. `Sylius\Bundle\ApiBundle\CommandHandler\Cart\ApplyCouponToCartHandler` and `Sylius\Bundle\ApiBundle\CommandHandler\Checkout\AddressOrderHandler` command handlers have been replaced with `Sylius\Bundle\ApiBundle\CommandHandler\Checkout\UpdateCartHandler`.
-
-1. The `sylius.api.filter_archived_shipping_methods` services has been renamed to `sylius.api.archived_shipping_methods_filter` to be coherent with rest of the filters
-
-1. The argument of `Sylius\Bundle\ApiBundle\Applicator\ArchivingShippingMethodApplicatorInterface` service has been changed
- from `sylius.calendar` to `Sylius\Calendar\Provider\DateTimeProviderInterface`.
-
-1. Renamed response body field `originalPrice` to `originalUnitPrice` of the following endpoints:
- - `'POST', '/api/v2/shop/orders/{tokenValue}/items'`
- - `'GET', '/api/v2/shop/orders/{tokenValue}/items'`
- - `'GET', '/api/v2/shop/orders/{tokenValue}'`
-
-1. Added response body field `originalUnitPrice` to the following endpoint:
- - `'GET', '/api/v2/admin/orders/{tokenValue}'`
diff --git a/UPGRADE-API-1.12.md b/UPGRADE-API-1.12.md
deleted file mode 100644
index c9cdd96287..0000000000
--- a/UPGRADE-API-1.12.md
+++ /dev/null
@@ -1,428 +0,0 @@
-# UPGRADE FROM `v1.12.1` TO `v1.12.2`
-
-1. So far, on production environment when any non-validation related error occurred, the `FOS\RestBundle\Serializer\Normalizer\FlattenExceptionHandler` was used, even on API Platform endpoints.
- Now, depending on the path of the request, the `FOS\RestBundle\Serializer\Normalizer\FlattenExceptionHandler` or `ApiPlatform\Hydra\Serializer\ErrorNormalizer` is used. If your code
- rely on the previous behavior, you should add the following configuration to your `config/packages/_sylius.yaml` file:
- ```yaml
- sylius_api:
- legacy_error_handling: true
- ```
-
- Example response before bugfix:
- ```json
- {
- "code": 500,
- "message": "Internal Server Error"
- }
- ```
-
- Example response after bugfix:
- ```json
- {
- "@context": "/api/v2/contexts/Error",
- "@type": "hydra:Error",
- "hydra:title": "An error occurred",
- "hydra:description": "Internal Server Error"
- }
- ```
- The status code is passed along the response as an HTTP status code, and the `message` value is returned in a `hydra:description` field.
-
-# UPGRADE FROM `v1.11.X` TO `v1.12.0`
-
-1. The `Sylius\Bundle\ApiBundle\DataProvider\CartShippingMethodsSubresourceDataProvider` has been removed and replaced by `Sylius\Bundle\ApiBundle\DataProvider\ShippingMethodsCollectionDataProvider`.
-
-1. The `Sylius\Bundle\ApiBundle\Provider\CustomerProviderInterface` has been refactored and moved to `CoreBundle` use `Sylius\Bundle\CoreBundle\Resolver\CustomerResolverInterface` instead.
-
-1. The `Sylius\Bundle\ApiBundle\Serializer\ShippingMethodNormalizer` logic and constructor has been changed due to refactor above.
-
- ```diff
- public function __construct(
- private OrderRepositoryInterface $orderRepository,
- private ShipmentRepositoryInterface $shipmentRepository,
- private ServiceRegistryInterface $shippingCalculators,
- + private RequestStack $requestStack,
- + private ChannelContextInterface $channelContext
- ) {
- ...
- }
- ```
-
-1. The `GET` `api/v2/shop/orders/{token}/shipments/{id}/methods` and `api/v2/shop/shipments/{id}/methods` endpoints have been removed and changed into collection request with 2 parameters `api/v2/shop/shipping-methods?shipmentId={id}&tokenValue={token}`.
-Now when we do not provide parameters in response it returns all available `shippingMethods` in channel.
-Wrong parameters otherwise cause empty array `[]` in response and correct parameters return `shippingMethods` available for your `shipment`.
-Here is how the response looks like:
-
- ```
- {
- "@context": "/api/v2/contexts/ShippingMethod",
- "@id": "/api/v2/shop/shipping-methods",
- "@type": "hydra:Collection",
- "hydra:member": [
- {
- "@id": "/api/v2/shop/shipping-methods/ups",
- "@type": "ShippingMethod",
- "id": 1,
- "code": "ups",
- "position": 0,
- "name": "UPS",
- "description": "Quasi perferendis debitis officiis ut inventore exercitationem."
- }
- ],
- "hydra:totalItems": 1,
- "hydra:search": {
- "@type": "hydra:IriTemplate",
- "hydra:template": "/api/v2/shop/shipping-methods{?shipmentId,tokenValue}",
- "hydra:variableRepresentation": "BasicRepresentation",
- "hydra:mapping": [
- {
- "@type": "IriTemplateMapping",
- "variable": "shipmentId",
- "property": null,
- "required": false
- },
- {
- "@type": "IriTemplateMapping",
- "variable": "tokenValue",
- "property": null,
- "required": false
- }
- ]
- }
- }
- ```
-
-1. Service `src/Sylius/Bundle/ApiBundle/DataProvider/CartPaymentMethodsSubresourceDataProvider.php` has been removed and logic was replaced by `src/Sylius/Bundle/ApiBundle/DataProvider/PaymentMethodsCollectionDataProvider.php`
-
-1. Endpoints `/shop/orders/{tokenValue}/payments/{payments}/methods`, `/shop/payments/{id}/methods` has been removed and replaced by `/shop/payment-methods` with filter `paymentId` and `tokenValue`
- `/shop/payment-methods` returns all enable payment methods if filters are not set, payment methods related to payment if filters are filled or empty response if filters ale filled with invalid data.
-1. Service `Sylius\Bundle\ApiBundle\DataProvider/CartPaymentMethodsSubresourceDataProvider` has been removed and logic was replaced by `Sylius\Bundle\ApiBundle\DataProvider\PaymentMethodsCollectionDataProvider`
-
-1. The `GET` `api/v2/shop/orders/{tokenValue}/payments/{payments}/methods` and `api/v2/shop/payments/{id}/methods` endpoints have been removed and changed into collection request with 2 parameters `api/v2/shop/payment-methods?paymentId={id}&tokenValue={token}`.
- Now when we do not provide parameters in response it returns all available `paymentMethods` in channel.
- Wrong parameters otherwise cause empty array `[]` in response and correct parameters return `paymentMethods` available for your `payment`.
-
-1. All arguments of `src/Sylius/Bundle/ApiBundle/CommandHandler/Account/ResetPasswordHandler` have been removed and substituted with `Sylius\Bundle\CoreBundle\Security\UserPasswordResetter`.
-
-1. The file `src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/ResetPassword.xml` has been renamed to `src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/AccountResetPassword.xml` and its short name has been changed from `ResetPasswordRequest` to `AccountResetPasswordRequest`.
-
-1. Constructor of `Sylius\Bundle\ApiBundle\CommandHandler\Account\RequestResetPasswordTokenHandler` has been extended with `Sylius\Calendar\Provider\DateTimeProviderInterface` argument:
-
- ```diff
- public function __construct(
- private UserRepositoryInterface $userRepository,
- private MessageBusInterface $commandBus,
- - private GeneratorInterface $generator
- + private GeneratorInterface $generator,
- + private DateTimeProviderInterface $calendar
- ) {
- }
- ```
-
-1. Constructor of `\Sylius\Bundle\ApiBundle\CommandHandler\Account\VerifyCustomerAccountHandler` has been extended with `Sylius\Calendar\Provider\DateTimeProviderInterface` argument:
-
- ```diff
- - public function __construct(private RepositoryInterface $shopUserRepository)
- - {
- + public function __construct(
- + private RepositoryInterface $shopUserRepository,
- + private DateTimeProviderInterface $calendar
- + ) {
- }
- ```
-
-1. The 2nd parameter `localeCode` has been removed from `src/Sylius/Bundle/ApiBundle/Command/Cart/PickupCart.php` and now is set automatically by `src/Sylius/Bundle/ApiBundle/DataTransformer/LocaleCodeAwareInputCommandDataTransformer.php`.
-
-1. The responses of endpoints `/api/v2/admin/products` and `/api/v2/admin/products/{code}` have been changed in such a way that the field `defaultVariant` has been removed.
-
-1. The configuration of `config/packages/security.yaml` has to be updated:
-
- ```diff
- security:
- access_control:
- + - { path: "%sylius.security.new_api_admin_route%/reset-password-requests", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
-
-1. The second argument `$billingAddress` of `Sylius\Bundle\ApiBundle\Modifier\OrderAddressModifierInterface::modify`
- has become nullable.
-
-1. The `Sylius\Bundle\ApiBundle\Assigner\OrderPromoCodeAssignerInterface` has been renamed to `Sylius\Bundle\ApiBundle\Assigner\OrderPromotionCodeAssignerInterface`.
-
-### API clients refactor
-
-#### New way of defining the clients
-
-In the `1.12` version we changed the way of defining API clients in our behat contexts.
-We extended the `Sylius/Behat/Client/ApiClientInterface` methods with extra parameter `$resource`.
-
- ```diff
- - public function index(): Response
- + public function index(string $resource): Response
-
- - public function subResourceIndex(string $subResource, string $id): Response;
- + public function subResourceIndex(string $resource, string $subResource, string $id): Response;
-
- - public function show(string $id): Response;
- + public function show(string $resource, string $id): Response;
-
- - public function delete(string $id): Response;
- + public function delete(string $resource, string $id): Response;
-
- - public function applyTransition(string $id, string $transition, array $content = []): Response;
- + public function applyTransition(string $resource, string $id, string $transition, array $content = []): Response;
-
- - public function customItemAction(string $id, string $type, string $action): Response;
- + public function customItemAction(string $resource, string $id, string $type, string $action): Response;
-
- - public function buildCreateRequest(): void;
- + public function buildCreateRequest(string $resource): void;
-
- - public function buildUpdateRequest(string $id): void;
- + public function buildUpdateRequest(string $resource, string $id): void;
-
- - public function buildUploadRequest(): void;
- + public function buildUploadRequest(string $resource): void;
- ```
-
-With this change, we reduced the number of clients from one per resource to only **two**, one for the `shop` section and one for the `admin`. To make a call for a specific resource you must pass it inside the methods shown above.
-You can see the actual difference in the example below:
-
- ```diff
- - $this->avatarImagesClient->buildUploadRequest();
- + $this->client->buildUploadRequest(Resources::AVATAR_IMAGES);
- ```
-
-The `Sylius\Behat\Context\Api\Resources` class contains constants for all the defined resources.
-We also removed the `Sylius\Behat\Client\ApiPlatformIriClient` alongside with `Sylius\Behat\Client\ApiIriClientInterface` as it's no more used.
-
-#### Changes in contexts
-
-The constructors of the behat contexts have changed in relation to the above improvements.
-Here is the example change of the constructor of `Sylius\Behat\Context\Api\Admin\ManagingOrdersContext`
-
- ```diff
- public function __construct(
- private ApiClientInterface $client,
- - private ApiClientInterface $shipmentsClient,
- - private ApiClientInterface $paymentsClient,
- ...
- )
- ```
-
-The list of changed contexts:
-
-###### Admin:
-
-- Sylius\Behat\Context\Api\Admin\ManagingAdministratorsContext
-- Sylius\Behat\Context\Api\Admin\ManagingCatalogPromotionsContext
-- Sylius\Behat\Context\Api\Admin\ManagingChannelsContext
-- Sylius\Behat\Context\Api\Admin\ManagingCountriesContext
-- Sylius\Behat\Context\Api\Admin\ManagingCurrenciesContext
-- Sylius\Behat\Context\Api\Admin\ManagingCustomerGroupsContext
-- Sylius\Behat\Context\Api\Admin\ManagingExchangeRatesContext
-- Sylius\Behat\Context\Api\Admin\ManagingLocalesContext
-- Sylius\Behat\Context\Api\Admin\ManagingOrdersContext
-- Sylius\Behat\Context\Api\Admin\ManagingPaymentsContext
-- Sylius\Behat\Context\Api\Admin\ManagingProductAssociationTypesContext
-- Sylius\Behat\Context\Api\Admin\ManagingProductOptionsContext
-- Sylius\Behat\Context\Api\Admin\ManagingProductReviewsContext
-- Sylius\Behat\Context\Api\Admin\ManagingProductVariantsContext
-- Sylius\Behat\Context\Api\Admin\ManagingProductsContext
-- Sylius\Behat\Context\Api\Admin\ManagingPromotionsContext
-- Sylius\Behat\Context\Api\Admin\ManagingShipmentsContext
-- Sylius\Behat\Context\Api\Admin\ManagingShippingCategoriesContext
-- Sylius\Behat\Context\Api\Admin\ManagingShippingMethodsContext
-- Sylius\Behat\Context\Api\Admin\ManagingTaxCategoriesContext
-- Sylius\Behat\Context\Api\Admin\ManagingZonesContext
-
-###### Shop:
-
-- Sylius\Behat\Context\Api\Shop\AddressContext
-- Sylius\Behat\Context\Api\Shop\CartContext
-- Sylius\Behat\Context\Api\Shop\ChannelContext
-- Sylius\Behat\Context\Api\Shop\CheckoutContext
-- Sylius\Behat\Context\Api\Shop\CurrencyContext
-- Sylius\Behat\Context\Api\Shop\CustomerContext
-- Sylius\Behat\Context\Api\Shop\HomepageContext
-- Sylius\Behat\Context\Api\Shop\LocaleContext
-- Sylius\Behat\Context\Api\Shop\LoginContext
-- Sylius\Behat\Context\Api\Shop\OrderContext
-- Sylius\Behat\Context\Api\Shop\OrderItemContext
-- Sylius\Behat\Context\Api\Shop\PaymentContext
-- Sylius\Behat\Context\Api\Shop\ProductContext
-- Sylius\Behat\Context\Api\Shop\ProductReviewContext
-- Sylius\Behat\Context\Api\Shop\ProductVariantContext
-- Sylius\Behat\Context\Api\Shop\PromotionContext
-- Sylius\Behat\Context\Api\Shop\RegistrationContext
-- Sylius\Behat\Context\Api\Shop\ShipmentContext
-
-### Creating Request refactored
-
-We removed some methods from `Sylius\Behat\Client\RequestInterface`.
-All of them have their corresponding implementation in `Sylius\Behat\Client\RequestFactory`.
-
- ```diff
- - public static function index(
- - ?string $section,
- - string $resource,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function subResourceIndex(?string $section, string $resource, string $id, string $subResource): self;
-
- - public static function show(
- - ?string $section,
- - string $resource,
- - string $id,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function create(
- - ?string $section,
- - string $resource,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function update(
- - ?string $section,
- - string $resource,
- - string $id,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function delete(
- - ?string $section,
- - string $resource,
- - string $id,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function transition(?string $section, string $resource, string $id, string $transition): self;
-
- - public static function customItemAction(?string $section, string $resource, string $id, string $type, string $action): self;
-
- - public static function upload(
- - ?string $section,
- - string $resource,
- - string $authorizationHeader,
- - ?string $token = null
- - ): self;
-
- - public static function custom(string $url, string $method, array $additionalHeaders = [], ?string $token = null): self;
- ```
-
-#### Changes in ApiPlatformClient
-
-Followed by this change the constructor of `Sylius\Behat\Client\ApiPlatformClient` also changed:
-
- ```diff
- public function __construct(
- private AbstractBrowser $client,
- private SharedStorageInterface $sharedStorage,
- + private RequestFactoryInterface $requestFactory,
- ...
- ) {
- }
- ```
-
-Now we are calling method by parameter `$this->requestFactory` instead of calling `Request` class itself.
-You can see the difference of usage below:
-
- ```diff
- public function index(string $resource): Response
- {
- - $this->request = Request::index($this->section, $resource, $this->authorizationHeader, $this->getToken());
- + $this->request = $this->requestFactory->index($this->section, $resource, $this->authorizationHeader, $this->getToken());
-
- return $this->request($this->request);
- }
- ```
-
-The `Sylius\Behat\Client\ApiClientInterface::buildUploadRequest` method has been removed, as it's replaced by methods in `Sylius\Behat\Client\RequestBuilder`.
-Example change of usage in `Sylius\Behat\Context\Api\Admin\ManagingAdministratorsContext`:
-
- ```diff
- - $this->client->buildUploadRequest(Resources::AVATAR_IMAGES);
- - $this->client->addParameter('owner', $this->iriConverter->getIriFromItem($administrator));
- - $this->client->addFile('file', new UploadedFile($this->minkParameters['files_path'] . $avatar, basename($avatar)));
- - $response = $this->client->upload();
-
- + $builder = RequestBuilder::create(
- + sprintf('/api/v2/%s/%s', 'admin', Resources::AVATAR_IMAGES),
- + Request::METHOD_POST,
- + );
- + $builder->withHeader('CONTENT_TYPE', 'multipart/form-data');
- + $builder->withHeader('HTTP_ACCEPT', 'application/ld+json');
- + $builder->withHeader('HTTP_Authorization', 'Bearer ' . $this->sharedStorage->get('token'));
- + $builder->withParameter('owner', $this->iriConverter->getIriFromItem($administrator));
- + $builder->withFile('file', new UploadedFile($this->minkParameters['files_path'] . $avatar, basename($avatar)));
-
- + $response = $this->client->request($builder->build());
- ```
-
-As you can see the builder contains the methods that makes the request responsive for additional headers and parameters.
-
-We also changed the `\Sylius\Behat\Client\ApiClientInterface::request` method visibility to public.
-
- ```diff
- - private function request(RequestInterface $request): Response
- + public function request(RequestInterface $request): Response
- ```
-
-#### Defining ContentType changed
-
-`Sylius\Behat\Client\ContentTypeGuide` provides solution for resolving http methods.
-When we pass the proper `HttpRequest` method inside of the new `Sylius\Behat\Client\ContentTypeGuide::guide` method it returns appropriate json content type:
-
- ```
- public function guide(string $method): string
- {
- if ($method === HttpRequest::METHOD_PATCH) {
- return self::PATCH_CONTENT_TYPE;
- }
-
- if ($method === HttpRequest::METHOD_PUT) {
- return self::LINKED_DATA_JSON_CONTENT_TYPE;
- }
-
- return self::JSON_CONTENT_TYPE;
- }
- ```
-
-Now to define the content type you just need to pass the appropriate `HttpRequest` type inside of the `guide()` method.
-You can see the improvement of usage below:
-
- ```diff
- - ['CONTENT_TYPE' => self::resolveHttpMethod($type)]
- + $builder->withHeader('CONTENT_TYPE', $this->contentTypeGuide->guide($type));
- ```
-
-#### Contexts Change
-
-The constructors of the behat contexts have changed in relation to the above improvements.
-
- ```diff
- public function __construct(
- + private RequestFactoryInterface $requestFactory,
- ...
- ) {
- ```
-
-List of changed contexts:
-
-###### Admin
-
-- Sylius\Behat\Context\Api\Admin\ManagingAdministratorsContext
-
-###### Shop
-
-- Sylius\Behat\Context\Api\Shop\CartContext
-- Sylius\Behat\Context\Api\Shop\CheckoutContext
-- Sylius\Behat\Context\Api\Shop\CustomerContext
-- Sylius\Behat\Context\Api\Shop\LoginContext
-- Sylius\Behat\Context\Api\Shop\OrderContext
-- Sylius\Behat\Context\Api\Shop\ProductContext
diff --git a/UPGRADE-API-1.13.md b/UPGRADE-API-1.13.md
deleted file mode 100644
index b2fa7f62f5..0000000000
--- a/UPGRADE-API-1.13.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# UPGRADE FROM `v1.12.x` TO `v1.13.0`
-
-1. The constructor of `Sylius\Bundle\ApiBundle\Serializer\ChannelDenormalizer` has been changed:
-
- ```diff
- public function __construct(
- private FactoryInterface $channelPriceHistoryConfigFactory,
- + private FactoryInterface $shopBillingDataFactory
- ) {
- }
- ```
-
-1. The constructor of `Sylius\Bundle\ApiBundle\EventSubscriber\TaxonDeletionEventSubscriber` has changed:
-
-````diff
- public function __construct(
- private ChannelRepositoryInterface $channelRepository,
-+ private TaxonInPromotionRuleCheckerInterface $taxonInPromotionRuleChecker,
- ) {
- }
-````
-
-1. The signature of constructor of `Sylius\Bundle\ApiBundle\Command\Cart\ChangeItemQuantityInCart` command changed:
-
-````diff
- public function __construct(
-- public int $quantity,
-+ public ?int $quantity,
- ) {
- }
-````
-
-1. The constructor signature of `Sylius\Bundle\ApiBundle\Command\Cart\AddItemToCart` changed:
-
-````diff
- public function __construct(
-- public string $productCode,
-+ public ?string $productCode,
-- public int $quantity,
-+ public ?int $quantity,
- ) {
- }
-````
-
-1. The constructor signature of `Sylius\Bundle\ApiBundle\Command\Catalog\AddProductReview` changed:
-
-````diff
- public function __construct(
- public ?string $title,
- public ?int $rating,
- public ?string $comment,
-- public string $productCode,
-+ public ?string $productCode,
- public ?string $email = null,
- ) {
- }
-````
-
-1. The constructor signature of `Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount` changed:
-
-````diff
- public function __construct(
-- public $token,
-+ public string $token,
-+ public ?string $channelCode = null,
-+ public ?string $localeCode = null,
- ) {
- }
-````
-
-1. The item operation paths for ProductVariantTranslation resource changed:
-
-- `GET /admin/product-variant-translation/{id}` -> `GET /admin/product-variant-translations/{id}`
-- `GET /shop/product-variant-translation/{id}` -> `GET /shop/product-variant-translations/{id}`
-
-1. Typo in the constraint validator's alias returned by `Sylius\Bundle\ApiBundle\Validator\Constraints\ChangedItemQuantityInCartValidator::validatedBy` has been fixed.
- Previously it was `sylius_api_validator_changed_item_guantity_in_cart` and now it is `sylius_api_validator_changed_item_quantity_in_cart`.
-
-1. The `ApiPlatform\Core\Bridge\Symfony\Bundle\Action\SwaggerUiAction` controller has been removed.
- Therefore, the `api_platform.swagger.action.ui` service ID points to the API Platform's `SwaggerUiAction` controller.
-
-1. The following services have been removed:
- * `Sylius\Bundle\ApiBundle\Swagger\AdminAuthenticationTokenDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ShopAuthenticationTokenDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ProductDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ProductImageDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ProductSlugDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ProductVariantDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\ShippingMethodDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\PathHiderDocumentationNormalizer`
- * `Sylius\Bundle\ApiBundle\Swagger\AcceptLanguageHeaderDocumentationNormalizer`
-
- Responsibility of these services has been moved to the corresponding services tagged with `sylius.open_api.modifier`:
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\AdminAuthenticationTokenDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ShopAuthenticationTokenDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductImageDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductSlugDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ProductVariantDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\ShippingMethodDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\PathHiderDocumentationModifier`
- * `Sylius\Bundle\ApiBundle\OpenApi\Documentation\AcceptLanguageHeaderDocumentationModifier`
-
-1. All usages of `ApiPlatform\Core\Api\IriConverterInterface` have been switched to its non-deprecated counterpart `ApiPlatform\Api\IriConverterInterface`.
- Due to that, the constructor and usage in the following classes have been changed accordingly:
- * `Sylius\Bundle\ApiBundle\Controller\GetProductBySlugAction`
- * `Sylius\Bundle\ApiBundle\Controller\UploadAvatarImageAction`
- * `Sylius\Bundle\ApiBundle\EventListener\AdminAuthenticationSuccessListener`
- * `Sylius\Bundle\ApiBundle\EventListener\AuthenticationSuccessListener`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\CatalogPromotionChannelFilter`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductVariantCatalogPromotionFilter`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductVariantOptionValueFilter`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductVariantCatalogPromotionFilter`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\ProductVariantOptionValueFilter`
- * `Sylius\Bundle\ApiBundle\Filter\Doctrine\TaxonFilter`
- * `Sylius\Bundle\ApiBundle\Serializer\ChannelPriceHistoryConfigDenormalizer`
- * `Sylius\Bundle\ApiBundle\Serializer\ProductNormalizer`
- * `Sylius\Bundle\ApiBundle\Serializer\ProductVariantNormalizer`
- * `Sylius\Bundle\ApiBundle\Serializer\ZoneDenormalizer`
-
-1. Update in Translations Handling
-
- The process for creating or updating translations via the API has been refined. Now, the locale for each translation
-is determined directly from its key, making the explicit transmission of the `locale` field redundant. Although the API
-continues to support the explicit sending of the `locale` field, it is essential that this explicitly sent locale matches
-the key in the translation array. In cases of a mismatch between the key and an explicitly sent locale, the API will
-respond with a `Sylius\Bundle\ApiBundle\Exception\TranslationLocaleMismatchException`.
diff --git a/UPGRADE-API-1.8.md b/UPGRADE-API-1.8.md
deleted file mode 100644
index a19ba5135a..0000000000
--- a/UPGRADE-API-1.8.md
+++ /dev/null
@@ -1,204 +0,0 @@
-# UPGRADE FROM `v1.8.4` TO `v1.8.6`
-
-1. Api is disabled by default, to enable it you need to set flag ``sylius_api.enabled`` to ``true`` in ``config/packages/_sylius.yaml``.
-
-1. Change configuration of new ApiBundle in your `config/packages/security.yaml` file:
-
- ```diff
- security:
- firewalls:
- new_api_admin_user:
- json_login:
- - check_path: "%sylius.security.new_api_route%/admin/authentication-token"
- + check_path: "%sylius.security.new_api_admin_route%/authentication-token"
- new_api_shop_user:
- json_login:
- - check_path: "%sylius.security.new_api_route%/shop/authentication-token"
- + check_path: "%sylius.security.new_api_shop_route%/authentication-token"
- access_control:
- - - { path: "%sylius.security.new_api_route%/admin/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- - - { path: "%sylius.security.new_api_route%/shop/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
-
-# UPGRADE FROM `v1.8.0` TO `v1.8.1`
-
-1. Change configuration of new ApiBundle in your `config/packages/security.yaml` file:
-
- ```diff
- security:
- providers:
- - sylius_api_chain_provider:
- - chain:
- - providers: [sylius_api_shop_user_provider, sylius_api_admin_user_provider]
-
- firewalls:
- new_api_admin_user:
- - pattern: "%sylius.security.new_api_route%/admin-user-authentication-token"
- - provider: sylius_admin_user_provider
- + pattern: "%sylius.security.new_api_admin_regex%/.*"
- + provider: sylius_api_admin_user_provider
- json_login:
- - check_path: "%sylius.security.new_api_route%/admin-user-authentication-token"
- + check_path: "%sylius.security.new_api_route%/admin/authentication-token"
-
- new_api_shop_user:
- - pattern: "%sylius.security.new_api_route%/shop-user-authentication-token"
- - provider: sylius_shop_user_provider
- + pattern: "%sylius.security.new_api_shop_regex%/.*"
- + provider: sylius_api_shop_user_provider
- json_login:
- - check_path: "%sylius.security.new_api_route%/shop-user-authentication-token"
- + check_path: "%sylius.security.new_api_route%/shop/authentication-token"
-
- - new_api:
- - pattern: "%sylius.security.new_api_regex%/*"
- - provider: sylius_api_chain_provider
- - stateless: true
- - anonymous: lazy
- - guard:
- - authenticators:
- - - lexik_jwt_authentication.jwt_token_authenticator
-
- access_control:
- + - { path: "%sylius.security.new_api_route%/admin/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_route%/shop/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
-
-# UPGRADE FROM `v1.7.X` TO `v1.8.0`
-
-1. Add new bundles to your list of used bundles in `config/bundles.php` if you are not using it apart from Sylius:
-
- ```diff
- + ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
- + Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
- + Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
- + SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
- ```
-
-1. Add configuration of new ApiBundle in your `config/packages/_sylius.yaml` file:
-
- ```diff
- imports:
- + - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" }
- ```
-
-1. Add configuration of new ApiBundle in your `config/packages/security.yaml` file:
-
- ```diff
- parameters:
- - sylius.security.admin_regex: "^/admin"
- - sylius.security.shop_regex: "^/(?!admin|api/.*|api$|media/.*)[^/]++"
- + sylius.security.admin_regex: "^/%sylius_admin.path_name%"
- + sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|new-api|api/.*|api$|media/.*)[^/]++"
- + sylius.security.new_api_route: "/new-api"
- + sylius.security.new_api_regex: "^%sylius.security.new_api_route%"
- + sylius.security.new_api_admin_route: "%sylius.security.new_api_route%/admin"
- + sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%"
- + sylius.security.new_api_shop_route: "%sylius.security.new_api_route%/shop"
- + sylius.security.new_api_shop_regex: "^%sylius.security.new_api_shop_route%"
-
- security:
- providers:
- + sylius_api_admin_user_provider:
- + id: sylius.admin_user_provider.email_or_name_based
- + sylius_api_shop_user_provider:
- + id: sylius.shop_user_provider.email_or_name_based
- + sylius_api_chain_provider:
- + chain:
- + providers: [sylius_api_shop_user_provider, sylius_api_admin_user_provider]
-
- firewalls:
- admin:
- remember_me:
- - path: /admin
- + path: "/%sylius_admin.path_name%"
- + new_api_admin_user:
- + pattern: "%sylius.security.new_api_route%/admin-user-authentication-token"
- + provider: sylius_admin_user_provider
- + stateless: true
- + anonymous: true
- + json_login:
- + check_path: "%sylius.security.new_api_route%/admin-user-authentication-token"
- + username_path: email
- + password_path: password
- + success_handler: lexik_jwt_authentication.handler.authentication_success
- + failure_handler: lexik_jwt_authentication.handler.authentication_failure
- + guard:
- + authenticators:
- + - lexik_jwt_authentication.jwt_token_authenticator
- +
- + new_api_shop_user:
- + pattern: "%sylius.security.new_api_route%/shop-user-authentication-token"
- + provider: sylius_shop_user_provider
- + stateless: true
- + anonymous: true
- + json_login:
- + check_path: "%sylius.security.new_api_route%/shop-user-authentication-token"
- + username_path: email
- + password_path: password
- + success_handler: lexik_jwt_authentication.handler.authentication_success
- + failure_handler: lexik_jwt_authentication.handler.authentication_failure
- + guard:
- + authenticators:
- + - lexik_jwt_authentication.jwt_token_authenticator
- +
- + new_api:
- + pattern: "%sylius.security.new_api_regex%/*"
- + provider: sylius_api_chain_provider
- + stateless: true
- + anonymous: lazy
- + guard:
- + authenticators:
- + - lexik_jwt_authentication.jwt_token_authenticator
- +
- access_control:
- + - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
- + - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
-1. Add `sylius_api.yaml` file to `config/routes/` directory:
-
- ```yaml
- sylius_api:
- resource: "@SyliusApiBundle/Resources/config/routing.yml"
- prefix: "%sylius.security.new_api_route%"
- ```
-
-1. Add `lexik_jwt_authentication.yaml` file to `config/packages/` directory:
-
- ```yaml
- lexik_jwt_authentication:
- secret_key: '%env(resolve:JWT_SECRET_KEY)%'
- public_key: '%env(resolve:JWT_PUBLIC_KEY)%'
- pass_phrase: '%env(JWT_PASSPHRASE)%'
- ```
-
-1. Add configuration in your `.env` file:
-
- ```diff
- + ###> lexik/jwt-authentication-bundle ###
- + JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
- + JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
- + JWT_PASSPHRASE=YOUR_SECRET_PASSPHRASE
- + ###< lexik/jwt-authentication-bundle ###
-
-1. Add configuration in your `.env.test` file:
-
- ```diff
- + ###> lexik/jwt-authentication-bundle ###
- + JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem
- + JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem
- + JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST
- + ###< lexik/jwt-authentication-bundle ###
-
-1. Add configuration in your `.env.test_cached` file:
-
- ```diff
- + ###> lexik/jwt-authentication-bundle ###
- + JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem
- + JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem
- + JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST
- + ###< lexik/jwt-authentication-bundle ###
-
-1. Sample JWT token generation is available [here](https://api-platform.com/docs/core/jwt/)
diff --git a/UPGRADE-API-1.9.md b/UPGRADE-API-1.9.md
deleted file mode 100644
index 053faf85a3..0000000000
--- a/UPGRADE-API-1.9.md
+++ /dev/null
@@ -1,156 +0,0 @@
-# UPGRADE FROM `v1.9.5` TO `v1.9.6`
-
-1. API is disabled by default, to enable it you need to set flag to ``true`` in ``config/packages/_sylius.yaml``:
-
- ```yaml
- sylius_api:
- enabled: true
- ```
-
-# UPGRADE FROM `v1.9.3` TO `v1.9.4`
-
-1. `Sylius\Bundle\ApiBundle\DataProvider\OrderCollectionDataProvider` has been removed and the same logic
- is now implemented in `Sylius\Bundle\ApiBundle\Doctrine\QueryCollectionExtension\OrdersByLoggedInUserExtension`
-
-1. The service `Sylius\Bundle\ApiBundle\Serializer\ProductVariantSerializer` has been changed to `Sylius\Bundle\ApiBundle\Serializer\ProductVariantNormalizer`
- and its first argument `NormalizerInterface $objectNormalizer` has been removed from constructor.
-
-# UPGRADE FROM `v1.9.2` TO `v1.9.3`
-
-1. The endpoint `GET api/v2/order-items/{id}/adjustments` has been changed to `GET api/v2/admin/order-items/{id}/adjustments`
-
-# UPGRADE FROM `v1.8.X` TO `v1.9.0`
-
-1. `/new-api` prefix has been changed to `/api/v2`. Please adjust your routes accordingly.
- Admin API is hardcoded to `/api/v1` instead of `/api/v{version}`.
-
-### New API
-
-1. Adjust your `config/packages/security.yaml`.
-
- * Parameters from `config/packages/security.yaml` has been moved to separated bundles.
- You may delete them if you are using the default values:
-
- ```diff
- - parameters:
- - sylius.security.admin_regex: "^/%sylius_admin.path_name%"
- - sylius.security.api_regex: "^/api/v1"
- - sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|api/.*|api$|media/.*)[^/]++"
- - 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"
- - sylius.security.new_api_admin_regex: "^%sylius.security.new_api_admin_route%"
- - sylius.security.new_api_shop_route: "%sylius.security.new_api_route%/shop"
- - sylius.security.new_api_shop_regex: "^%sylius.security.new_api_shop_route%"
- ```
-
- * If you are not using the default values, you may need to add and change parameters:
-
- ```diff
- parameters:
- - sylius.security.api_regex: "^/api"
- - sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|new-api|api/.*|api$|media/.*)[^/]++"
- - sylius.security.new_api_route: "/new-api"
- + sylius.security.api_regex: "^/api/v1"
- + sylius.security.shop_regex: "^/(?!%sylius_admin.path_name%|api/.*|api$|media/.*)[^/]++"
- + sylius.security.new_api_route: "/api/v2"
- + sylius.security.new_api_user_account_route: "%sylius.security.new_api_shop_route%/account"
- + sylius.security.new_api_user_account_regex: "^%sylius.security.new_api_user_account_route%"
- ```
-
- * Add new access control configuration and reorder it:
-
- ```diff
- security:
- access_control:
- + - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
- - - { path: "%sylius.security.new_api_route%/admin/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_admin_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_user_account_regex%/.*", role: ROLE_USER }
- - - { path: "%sylius.security.new_api_route%/shop/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- + - { path: "%sylius.security.new_api_shop_route%/authentication-token", role: IS_AUTHENTICATED_ANONYMOUSLY }
- - - { path: "%sylius.security.new_api_admin_regex%/.*", role: ROLE_API_ACCESS }
- - { path: "%sylius.security.new_api_shop_regex%/.*", role: IS_AUTHENTICATED_ANONYMOUSLY }
- ```
-
-1. Unified API registration path in shop has been changed from `/new-api/shop/register` to `/new-api/shop/customers/`.
-
-1. Identifier needed to retrieve a product in shop API endpoint (`/new-api/shop/products/{id}`) has been changed from `slug` to `code`.
-
-1. `config/packages/fos_rest.yaml` rules have been changed to:
-
- ```diff
- rules:
- - - { path: '^/api/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
- + - { path: '^/api/v1/.*', priorities: ['json', 'xml'], fallback_format: json, prefer_extension: true }
- ```
-
-1. To have better control over the serialization process, we introduced `shop` and `admin` prefixes
- to names of serialization groups on `src/Sylius/Bundle/ApiBundle/Resources/config/api_resources/*` and `src/Sylius/Bundle/ApiBundle/Resources/config/serialization/*`.
- Several additional serialization groups have been rephrased, to improve readability and predictability of them.
- If you are using they on your custom entity `api_resource` configuration or serialization groups, you should check
- if one of these changes may affect on your app. If yes, change all occurs by this pattern:
-
-- created serialization groups for `Locale` resource as: `admin:locale:read` and `admin:locale:create`
-- `adjustment:read` changed to: `admin:adjustment:read` and `shop:adjustment:read`
-- `admin_user:create` changed to: `admin:admin_user:create`
-- `admin_user:read` changed to: `admin:admin_user:read`
-- `admin_user:update` changed to: `admin:admin_user:update`
-- `avatar_image:read` changed to: `admin:avatar_image:read`
-- `cart:add_item` changed to: `shop:cart:add_item`
-- `cart:address` changed to: `shop:cart:address`
-- `cart:apply_coupon` changed to: `shop:cart:apply_coupon`
-- `cart:change_quantity` changed to: `shop:cart:change_quantity`
-- `cart:complete` changed to: `shop:cart:complete`
-- `cart:remove_item` changed to: `shop:cart:remove_item`
-- `cart:select_payment_method` changed to: `shop:cart:select_payment_method`
-- `cart:select_shipping_method` changed to: `shop:cart:select_shipping_method`
-- `cart:update` changed to: `shop:cart:update`
-- `channel:create` changed to: `admin:channel:create`
-- `channel:read` changed to: `admin:channel:read`
-- `checkout:read` changed to: `shop:cart:read`
-- `country:read` changed to: `admin:country:read`
-- `currency:read` changed to: `admin:currency:read`
-- `customer:password:write` changed to: `shop:customer:password:update`
-- `customer:read` changed to: `admin:customer:read` and `shop:customer:read`
-- `customer:update` changed to: `shop:customer:update`
-- `customer_group:create` changed to: `admin:customer_group:create`
-- `customer_group:read` changed to: `admin:customer_group:read`
-- `customer_group:update` changed to: `admin:customer_group:update`
-- `exchange_rate:create` changed to: `admin:exchange_rate:create`
-- `exchange_rate:read` changed to: `admin:exchange_rate:read`
-- `exchange_rate:update` changed to: `admin:exchange_rate:update`
-- `order:create` changed to: `shop:order:create`
-- `order:read` changed to: `admin:order:read`
-- `order:update` changed to: `admin:order:update`
-- `order_item:read` changed to: `admin:order_item:read` and `shop:order_item:read`
-- `order_item_unit:read` changed to: `admin:order_item_unit:read` and `shop:order_item_unit:read`
-- `payment:read` changed to: `admin:payment:read` and `shop:payment:read`
-- `payment_method:read` changed to: `admin:payment_method:read` and `shop:payment_method:read`
-- `product:create` changed to: `admin:product:create`
-- `product:read` changed to: `admin:product:read` and `shop:product:read`
-- `product:update` changed to: `admin:product:update`
-- `province:read` changed to: `admin:province:read`
-- `province:update` changed to: `admin:province:update`
-- `shipment:read` changed to: `admin:shipment:read` and `shop:shipment:read`
-- `shipment:update` changed to: `admin:shipment:update`
-- `shipping_category:create` changed to: `admin:shipping_category:create`
-- `shipping_category:read` changed to: `admin:shipping_category:read`
-- `shipping_category:update` changed to: `admin:shipping_category:update`
-- `shipping_method:create` changed to: `admin:shipping_method:create`
-- `shipping_method:read` changed to: `admin:shipping_method:read`
-- `shipping_method:update` changed to: `admin:shipping_method:update`
-- `shop:currencies:read` changed to: `shop:currency:read`
-- `shop:customer:write` changed to: `shop:customer:create`
-- `shop_billing_data:read` changed to: `admin:shop_billing_data:read`
-- `tax_category:read` changed to: `admin:tax_category:read`
-- `tax_category:update` changed to: `admin:tax_category:update`
-- `tax_category:create` changed to: `admin:tax_category:create`
-- `taxon:read` changed to: `admin:taxon:read` and `shop:taxon:read`
-- `taxon:update` changed to: `admin:taxon:update`
-- `taxon:create` changed to: `admin:taxon:create`
-- `zone:read` changed to: `admin:zone:read`
-- `zone:update` changed to: `admin:zone:update`
-- `zone:create` changed to: `admin:zone:create`
-- `zone_member:read` changed to: `admin:zone_member:read`
-- removed redundant `zone_member:write`
diff --git a/UPGRADE-API-2.0.md b/UPGRADE-API-2.0.md
new file mode 100644
index 0000000000..5b6e572f54
--- /dev/null
+++ b/UPGRADE-API-2.0.md
@@ -0,0 +1 @@
+# UPGRADE FROM `1.13` TO `2.0`
diff --git a/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13-LEGACY.md b/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13-LEGACY.md
deleted file mode 100644
index b0b8b44cf9..0000000000
--- a/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13-LEGACY.md
+++ /dev/null
@@ -1,156 +0,0 @@
-⚙️ Upgrade from Sylius 1.12 with PriceHistoryPlugin to Sylius 1.13
-==================================================================
-
-We encourage you to use the upgrade instructions based on Rector as it is more convenient and faster to accomplish.
-The rector installation guide is available [here](UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13.md).
-
-Legacy upgrade
---------------
-
-1. Remove the PriceHistoryPlugin from composer.json by running:
-
- ```bash
-
- composer remove sylius/price-history-plugin --no-scripts
-
- ```
-
-1. Make sure to remove the following config from your `config/packages/sylius_price_history_plugin.yaml` file:
-
- ```diff
-
- - - { resource: "@SyliusPriceHistoryPlugin/config/config.yaml" }
-
- ```
-
- And the route from your `config/routes/sylius_price_history_plugin.yaml`:
-
- ```diff
-
- - sylius_price_history_admin:
- - resource: '@SyliusPriceHistoryPlugin/config/admin_routing.yaml'
- - prefix: '/%sylius_admin.path_name%'
-
- ```
-
- And also remove the plugin from your `packages/bundles.php` file:
-
- ```diff
-
- - Sylius\PriceHistoryPlugin\SyliusPriceHistoryPlugin::class => ['all' => true],
-
- ```
-
-1. Update the `Channel` entity to use interface from `Core`:
-
- ```diff
-
- - use Sylius\PriceHistoryPlugin\Domain\Model\ChannelInterface;
- + use Sylius\Component\Core\Model\ChannelInterface;
-
- ```
-
- Then remove the trait:
-
- ```diff
-
- - use ChannelPriceHistoryConfigAwareTrait;
-
- ```
-
-1. Update the `ChannelPricing` entity to use interface from `Core`:
-
- ```diff
-
- - use Sylius\PriceHistoryPlugin\Domain\Model\ChannelPricingInterface;
- + use Sylius\Component\Core\Model\ChannelPricingInterface;
-
- ```
- Then remove the trait:
-
- ```diff
-
- - use LowestPriceBeforeDiscountAwareTrait;
-
- ```
-
-1. Update your resources configuration for `ChannelPricingLogEntry` and `ChannelPriceHistoryConfig` if you have changed them in your project:
-
- ```diff
-
- - sylius_price_history:
- - batch_size: 100
- + sylius_core:
- + price_history:
- + batch_size: 100
- resources:
- channel_price_history_config:
- classes:
- model: App\Entity\ChannelPriceHistoryConfig
- ...
- channel_pricing_log_entry:
- classes:
- model: App\Entity\ChannelPricingLogEntry
- ...
-
- ```
-
-1. The class `Sylius\PriceHistoryPlugin\Infrastructure\EventSubscriber\ChannelPricingLogEntryEventSubscriber` has been replaced by `Sylius\Bundle\CoreBundle\PriceHistory\EventListener\ChannelPricingLogEntryEventListener`.
-
-1. Change namespaces from the plugin to correct ones:
-
- ```
-
- Sylius\PriceHistoryPlugin\Application\Checker\ProductVariantLowestPriceDisplayChecker => Sylius\Component\Core\Checker\ProductVariantLowestPriceDisplayChecker
- Sylius\PriceHistoryPlugin\Application\Checker\ProductVariantLowestPriceDisplayCheckerInterface => Sylius\Component\Core\Checker\ProductVariantLowestPriceDisplayCheckerInterface
- Sylius\PriceHistoryPlugin\Application\Command\ApplyLowestPriceOnChannelPricings => Sylius\Bundle\CoreBundle\PriceHistory\Command\ApplyLowestPriceOnChannelPricings
- Sylius\PriceHistoryPlugin\Application\CommandDispatcher\BatchedApplyLowestPriceOnChannelPricingsCommandDispatcher => Sylius\Bundle\CoreBundle\PriceHistory\CommandDispatcher\BatchedApplyLowestPriceOnChannelPricingsCommandDispatcher
- Sylius\PriceHistoryPlugin\Application\CommandDispatcher\ApplyLowestPriceOnChannelPricingsCommandDispatcherInterface => Sylius\Bundle\CoreBundle\PriceHistory\CommandDispatcher\ApplyLowestPriceOnChannelPricingsCommandDispatcherInterface
- Sylius\PriceHistoryPlugin\Application\CommandHandler\ApplyLowestPriceOnChannelPricingsHandler => Sylius\Bundle\CoreBundle\PriceHistory\CommandHandler\ApplyLowestPriceOnChannelPricingsHandler
- Sylius\PriceHistoryPlugin\Application\Logger\PriceChangeLogger => Sylius\Bundle\CoreBundle\PriceHistory\Logger\PriceChangeLogger
- Sylius\PriceHistoryPlugin\Application\Logger\PriceChangeLoggerInterface => Sylius\Bundle\CoreBundle\PriceHistory\Logger\PriceChangeLoggerInterface
- Sylius\PriceHistoryPlugin\Application\Processor\ProductLowestPriceBeforeDiscountProcessor => Sylius\Bundle\CoreBundle\PriceHistory\Processor\ProductLowestPriceBeforeDiscountProcessor
- Sylius\PriceHistoryPlugin\Application\Processor\ProductLowestPriceBeforeDiscountProcessorInterface => Sylius\Bundle\CoreBundle\PriceHistory\Processor\ProductLowestPriceBeforeDiscountProcessorInterface
- Sylius\PriceHistoryPlugin\Application\Remover\ChannelPricingLogEntriesRemoverInterface => Sylius\Bundle\CoreBundle\PriceHistory\Remover\ChannelPricingLogEntriesRemoverInterface
- Sylius\PriceHistoryPlugin\Application\Templating\Helper\PriceHelper => Sylius\Bundle\CoreBundle\Templating\Helper\PriceHelper
- Sylius\PriceHistoryPlugin\Application\Validator\ResourceInputDataPropertiesValidatorInterface => Sylius\Bundle\ApiBundle\Validator\ResourceInputDataPropertiesValidatorInterface
- Sylius\PriceHistoryPlugin\Domain\Factory\ChannelFactory => Sylius\Component\Core\Factory\ChannelFactory
- Sylius\PriceHistoryPlugin\Domain\Factory\ChannelPricingLogEntryFactory => Sylius\Component\Core\Factory\ChannelPricingLogEntryFactory
- Sylius\PriceHistoryPlugin\Domain\Factory\ChannelPricingLogEntryFactoryInterface => Sylius\Component\Core\Factory\ChannelPricingLogEntryFactoryInterface
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelInterface => Sylius\Component\Core\Model\ChannelInterface
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelPriceHistoryConfig => Sylius\Component\Core\Model\ChannelPriceHistoryConfig
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelPricingLogEntry => Sylius\Component\Core\Model\ChannelPricingLogEntry
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelPriceHistoryConfigInterface => Sylius\Component\Core\Model\ChannelPriceHistoryConfigInterface
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelPricingInterface => Sylius\Component\Core\Model\ChannelPricingInterface
- Sylius\PriceHistoryPlugin\Domain\Model\ChannelPricingLogEntryInterface => Sylius\Component\Core\Model\ChannelPricingLogEntryInterface
- Sylius\PriceHistoryPlugin\Domain\Model\LowestPriceBeforeDiscountAwareInterface => Sylius\Component\Core\Model\ChannelPricingInterface
- Sylius\PriceHistoryPlugin\Domain\Repository\ChannelPricingLogEntryRepositoryInterface => Sylius\Component\Core\Repository\ChannelPricingLogEntryRepositoryInterface
- Sylius\PriceHistoryPlugin\Infrastructure\Cli\Command\ClearPriceHistoryCommand => Sylius\Bundle\CoreBundle\PriceHistory\Cli\Command\ClearPriceHistoryCommand
- Sylius\PriceHistoryPlugin\Infrastructure\Doctrine\ORM\ChannelPricingLogEntryRepository => Sylius\Component\Core\Repository\ChannelPricingLogEntryRepository
- Sylius\PriceHistoryPlugin\Infrastructure\Doctrine\ORM\ChannelPricingLogEntryRepositoryInterface => Sylius\Component\Core\Repository\ChannelPricingLogEntryRepositoryInterface
- Sylius\PriceHistoryPlugin\Infrastructure\EntityObserver\CreateLogEntryOnPriceChangeObserver => Sylius\Bundle\CoreBundle\PriceHistory\EntityObserver\CreateLogEntryOnPriceChangeObserver
- Sylius\PriceHistoryPlugin\Infrastructure\EntityObserver\EntityObserverInterface => Sylius\Bundle\CoreBundle\PriceHistory\EntityObserver\EntityObserverInterface
- Sylius\PriceHistoryPlugin\Infrastructure\EntityObserver\ProcessLowestPricesOnChannelChangeObserver => Sylius\Bundle\CoreBundle\PriceHistory\EntityObserver\ProcessLowestPricesOnChannelChangeObserver
- Sylius\PriceHistoryPlugin\Infrastructure\EntityObserver\ProcessLowestPricesOnChannelPriceHistoryConfigChangeObserver => Sylius\Bundle\CoreBundle\PriceHistory\EntityObserver\ProcessLowestPricesOnChannelPriceHistoryConfigChangeObserver
- Sylius\PriceHistoryPlugin\Infrastructure\Event\OldChannelPricingLogEntriesEvents => Sylius\Bundle\CoreBundle\PriceHistory\Event\OldChannelPricingLogEntriesEvents
- Sylius\PriceHistoryPlugin\Infrastructure\EventListener\OnFlushEntityObserverListener => Sylius\Bundle\CoreBundle\PriceHistory\EventListener\OnFlushEntityObserverListener
- Sylius\PriceHistoryPlugin\Infrastructure\EventSubscriber\ChannelPricingLogEntryEventSubscriber => Sylius\Bundle\CoreBundle\PriceHistory\EventListener\ChannelPricingLogEntryEventListener
- Sylius\PriceHistoryPlugin\Infrastructure\Form\Extension\ChannelTypeExtension => Sylius\Bundle\CoreBundle\Form\Extension\ChannelTypeExtension
- Sylius\PriceHistoryPlugin\Infrastructure\Form\Type\ChannelPriceHistoryConfigType => Sylius\Bundle\CoreBundle\Form\Type\ChannelPriceHistoryConfigType
- Sylius\PriceHistoryPlugin\Infrastructure\Provider\ProductVariantsPricesProvider => Sylius\Component\Core\Provider\ProductVariantsPricesProvider
- Sylius\PriceHistoryPlugin\Infrastructure\Remover\ChannelPricingLogEntriesRemover' => 'Sylius\Bundle\CoreBundle\PriceHistory\Remover\ChannelPricingLogEntriesRemover'
- Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ChannelDenormalizer => Sylius\Bundle\ApiBundle\Serializer\ChannelDenormalizer
- Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ChannelPriceHistoryConfigDenormalizer => Sylius\Bundle\ApiBundle\Serializer\ChannelPriceHistoryConfigDenormalizer
- Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ProductVariantNormalizer => Sylius\Bundle\ApiBundle\Serializer\ProductVariantNormalizer
- Sylius\PriceHistoryPlugin\Infrastructure\Twig\PriceExtension => Sylius\Bundle\CoreBundle\Twig\PriceExtension
- Sylius\PriceHistoryPlugin\Infrastructure\Twig\SyliusVersionExtension => Sylius\Bundle\CoreBundle\Twig\SyliusVersionExtension
- Sylius\PriceHistoryPlugin\Infrastructure\Validator\ResourceApiInputDataPropertiesValidator => Sylius\Bundle\ApiBundle\Validator\ResourceApiInputDataPropertiesValidator
-
- ```
-
-1. The `Sylius\PriceHistoryPlugin\Application\Calculator\ProductVariantLowestPriceCalculator` class along with its interface has been removed.
- If you have used it in your project, you should also remove it from your code.
-
- Use `Sylius\Component\Core\Calculator\ProductVariantPriceCalculator` instead, as it has been extended with the `calculateLowestPrice` method.
-
-1. Go through the rest of the [Sylius 1.13 upgrade file](UPGRADE-1.13.md).
diff --git a/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13.md b/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13.md
deleted file mode 100644
index e552b24a0a..0000000000
--- a/UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13.md
+++ /dev/null
@@ -1,86 +0,0 @@
-⚙️ Upgrade from Sylius 1.12 with PriceHistoryPlugin to Sylius 1.13
-==================================================================
-
-We encourage you to use the upgrade instructions based on Rector as it is more convenient and faster to accomplish.
-The legacy installation guide is available [here](UPGRADE-FROM-1.12-WITH-PRICE-HISTORY-PLUGIN-TO-1.13-LEGACY.md).
-
-Upgrade with Rector
--------------------
-
-1. Remove the PriceHistoryPlugin from composer.json by running:
-
- ```bash
-
- composer remove sylius/price-history-plugin --no-scripts
-
- ```
-
-1. Update your `
-
-{% endif %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Email/orderConfirmation.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Email/orderConfirmation.html.twig
deleted file mode 100644
index 7c98785ab9..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Email/orderConfirmation.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-{% deprecated 'The "@SyliusAdmin/Email/orderConfirmation.html.twig" template is deprecated since Sylius 1.8 and will be removed in Sylius 2.0, use "@SyliusCore/Email/orderConfirmation.html.twig" instead.' %}
-{% extends '@SyliusAdmin/Email/layout.html.twig' %}
-
-{% block subject %}
- {% include '@SyliusCore/Email/Blocks/OrderConfirmation/_subject.html.twig' %}
-{% endblock %}
-
-{% block content %}
- {% include '@SyliusCore/Email/Blocks/OrderConfirmation/_content.html.twig' %}
-{% endblock %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig
index da83422573..1690eb954b 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_channelLinksWidget.html.twig
@@ -1 +1 @@
-{{ render(url('sylius_admin_partial_channel_index', {'template': '@SyliusAdmin/_channelLinks.html.twig'})) }}
+{{ render(url('sylius_admin_partial_channel_index', {'template': '@SyliusAdmin/Layout/_channelLinks.html.twig'})) }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig
index d644ab5c61..1d9fa7d035 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_logo.html.twig
@@ -1,9 +1,5 @@
-
- {{ 'sylius.ui.sales_summary'|trans }}
-
-
-
-
- {% if use_webpack %}
-  }})
- {% else %}
-  }})
- {% endif %}
+
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig
index 56663102b5..f5f9835833 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_scripts.html.twig
@@ -1,5 +1 @@
-{% if use_webpack %}
- {{ encore_entry_script_tags('admin-entry', null, 'admin') }}
-{% else %}
- {% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/admin/js/app.js'} %}
-{% endif %}
+{{ encore_entry_script_tags('admin-entry', null, 'admin') }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig
index a1ab8b5ff4..a96144cd61 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Layout/_styles.html.twig
@@ -1,5 +1 @@
-{% if use_webpack %}
- {{ encore_entry_link_tags('admin-entry', null, 'admin') }}
-{% else %}
- {% include '@SyliusUi/_stylesheets.html.twig' with {'path': 'assets/admin/css/style.css'} %}
-{% endif %}
+{{ encore_entry_link_tags('admin-entry', null, 'admin') }}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig
index b96c7c308d..bf81276fb2 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/PaymentMethod/_form.html.twig
@@ -28,17 +28,6 @@
- {% else %}
-
- {% endif %}
+
{% for image in product.images %}
- {% if use_webpack %}
- {% set path = image.path is not null ? image.path|imagine_filter('sylius_admin_product_small_thumbnail') : asset('build/admin/images/200x200.png', 'admin') %}
- {% else %}
- {% set path = image.path is not null ? image.path|imagine_filter('sylius_admin_product_small_thumbnail') : asset('assets/admin/img/200x200.png') %}
- {% endif %}
+ {% set path = image.path is not null ? image.path|imagine_filter('sylius_admin_product_small_thumbnail') : asset('build/admin/images/200x200.png', 'admin') %}
{% if product.isConfigurable() and product.variants|length > 0 %}
{% include '@SyliusAdmin/Product/Show/_imageVariants.html.twig' %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig
index bb3b04e922..6fb55dcb60 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Product/_mainImage.html.twig
@@ -3,11 +3,7 @@
{% elseif product.images.first %}
{% set path = product.images.first.path|imagine_filter(filter|default('sylius_admin_product_thumbnail')) %}
{% else %}
- {% if use_webpack %}
- {% set path = asset('build/admin/images/50x50.png', 'admin') %}
- {% else %}
- {% set path = asset('assets/admin/img/50x50.png') %}
- {% endif %}
+ {% set path = asset('build/admin/images/50x50.png', 'admin') %}
{% endif %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig
index 6daf7f8789..3cdf42fac3 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_content.html.twig
@@ -1,15 +1,6 @@
-{% if use_webpack %}
- {% include '@SyliusUi/Security/_login.html.twig'
- with {
- 'action': path('sylius_admin_login_check'),
- 'paths': {'logo': asset('build/admin/images/logo.png', 'admin')}
- }
- %}
-{% else %}
- {% include '@SyliusUi/Security/_login.html.twig'
- with {
- 'action': path('sylius_admin_login_check'),
- 'paths': {'logo': 'assets/admin/img/logo.png'}
- }
- %}
-{% endif %}
+{% include '@SyliusUi/Security/_login.html.twig'
+ with {
+ 'action': path('sylius_admin_login_check'),
+ 'paths': {'logo': asset('build/admin/images/logo.png', 'admin')}
+ }
+%}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig
index e094700fac..06765f40a9 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Security/_logo.html.twig
@@ -1,5 +1 @@
-{% if use_webpack %}
- {% include '@SyliusUi/Security/_logo.html.twig' with {'paths': {'logo': asset('build/admin/images/logo.png', 'admin')}} %}
-{% else %}
- {% include '@SyliusUi/Security/_logo.html.twig' with {'paths': {'logo': 'assets/admin/img/logo.png'}} %}
-{% endif %}
+{% include '@SyliusUi/Security/_logo.html.twig' with {'paths': {'logo': asset('build/admin/images/logo.png', 'admin')}} %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig
deleted file mode 100644
index c60b9a21f4..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_channelLinks.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_channelLinks.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_channelLinks.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig
deleted file mode 100644
index a6d6567e8f..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_flashes.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_flashes.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_flashes.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig
deleted file mode 100644
index 49e1a0a7d1..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_logo.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_logo.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_logo.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig
deleted file mode 100644
index a9d9647458..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_menu.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_menu.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_menu.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig
deleted file mode 100644
index b3c246012e..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_notification.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_notification.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_notification.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig
deleted file mode 100644
index 0e6482422f..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_scripts.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_scripts.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_scripts.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig
deleted file mode 100644
index f7a47470ba..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_search.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_search.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_search.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig
deleted file mode 100644
index ebda5cfc59..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_security.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_security.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_security.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig
deleted file mode 100644
index d6356eea2a..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_styles.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_styles.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_styles.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig
deleted file mode 100644
index 809beaf033..0000000000
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/_support.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated "This template has been moved to @SyliusAdmin/Layout/_support.html.twig" %}
-
-{% include "@SyliusAdmin/Layout/_support.html.twig" %}
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig
index 298ea6dbf5..dc40065bb1 100644
--- a/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig
+++ b/src/Sylius/Bundle/AdminBundle/Resources/views/layout.html.twig
@@ -7,7 +7,7 @@
{% endblock %}
{% block flash_messages %}
- {% include '@SyliusAdmin/_flashes.html.twig' %}
+ {% include '@SyliusAdmin/Layout/_flashes.html.twig' %}
{% endblock %}
{% block topbar %}
diff --git a/src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php b/src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php
index 2532723ed6..cedc6eaae5 100644
--- a/src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php
+++ b/src/Sylius/Bundle/AdminBundle/Tests/Controller/NotificationControllerTest.php
@@ -20,6 +20,7 @@ use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Prophecy\Prophecy\ObjectProphecy;
use Prophecy\Prophecy\ProphecyInterface;
+use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestFactoryInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
@@ -35,8 +36,6 @@ final class NotificationControllerTest extends TestCase
private ObjectProphecy $client;
- private ObjectProphecy $legacyClient;
-
private ObjectProphecy $requestFactory;
private ObjectProphecy $messageFactory;
@@ -45,8 +44,6 @@ final class NotificationControllerTest extends TestCase
private NotificationController $controller;
- private NotificationController $legacyController;
-
private static string $hubUri = 'www.doesnotexist.test.com';
/** @test */
@@ -69,27 +66,6 @@ final class NotificationControllerTest extends TestCase
$this->assertEquals('""', $emptyResponse->getContent());
}
- /**
- * @test
- *
- * @legacy This test will be removed in Sylius 2.0.
- */
- public function it_returns_an_empty_json_response_upon_client_exception_deprecated(): void
- {
- $requestInterface = $this->prophesize(RequestInterface::class);
-
- $this->messageFactory->createRequest(Argument::cetera())->willReturn($requestInterface);
- $requestInterface->withHeader('Content-Type', 'application/json')->willReturn($requestInterface);
- $requestInterface->withBody(Argument::any())->willReturn($requestInterface);
-
- $this->legacyClient->send(Argument::cetera())->willThrow(ConnectException::class);
-
- $emptyResponse = $this->legacyController->getVersionAction(new Request());
-
- $this->assertEquals(JsonResponse::HTTP_NO_CONTENT, $emptyResponse->getStatusCode());
- $this->assertEquals('""', $emptyResponse->getContent());
- }
-
/** @test */
public function it_returns_json_response_from_client_on_success(): void
{
@@ -120,41 +96,9 @@ final class NotificationControllerTest extends TestCase
$this->assertEquals($content, $response->getContent());
}
- /**
- * @test
- *
- * @legacy This test will be removed in Sylius 2.0.
- */
- public function it_returns_json_response_from_client_on_success_deprecated(): void
- {
- $content = json_encode(['version' => '9001']);
-
- $requestInterface = $this->prophesize(RequestInterface::class);
-
- $this->messageFactory->createRequest(Argument::cetera())->willReturn($requestInterface);
- $requestInterface->withHeader('Content-Type', 'application/json')->willReturn($requestInterface);
- $requestInterface->withBody(Argument::any())->willReturn($requestInterface);
-
- /** @var ProphecyInterface|StreamInterface $stream */
- $stream = $this->prophesize(StreamInterface::class);
- $stream->getContents()->willReturn($content);
-
- /** @var ProphecyInterface|ResponseInterface $externalResponse */
- $externalResponse = $this->prophesize(ResponseInterface::class);
- $externalResponse->getBody()->willReturn($stream->reveal());
-
- $this->legacyClient->send(Argument::cetera())->willReturn($externalResponse->reveal());
-
- $response = $this->legacyController->getVersionAction(new Request());
-
- $this->assertEquals(JsonResponse::HTTP_OK, $response->getStatusCode());
- $this->assertEquals($content, $response->getContent());
- }
-
protected function setUp(): void
{
- $this->client = $this->prophesize(\Psr\Http\Client\ClientInterface::class);
- $this->legacyClient = $this->prophesize(\GuzzleHttp\ClientInterface::class);
+ $this->client = $this->prophesize(ClientInterface::class);
$this->requestFactory = $this->prophesize(RequestFactoryInterface::class);
$this->messageFactory = $this->prophesize(MessageFactory::class);
$this->streamFactory = $this->prophesize(StreamFactoryInterface::class);
@@ -167,13 +111,6 @@ final class NotificationControllerTest extends TestCase
$this->streamFactory->reveal(),
);
- $this->legacyController = new NotificationController(
- $this->legacyClient->reveal(),
- $this->messageFactory->reveal(),
- self::$hubUri,
- 'environment',
- );
-
parent::setUp();
}
}
diff --git a/src/Sylius/Bundle/AdminBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php b/src/Sylius/Bundle/AdminBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
index cca655a0a9..fedcc1aaa4 100644
--- a/src/Sylius/Bundle/AdminBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
+++ b/src/Sylius/Bundle/AdminBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
@@ -16,24 +16,16 @@ namespace Sylius\Bundle\AdminBundle\Tests\MessageHandler\Admin;
use Sylius\Bundle\CoreBundle\Message\Admin\Account\SendResetPasswordEmail;
use Sylius\Bundle\CoreBundle\MessageHandler\Admin\Account\SendResetPasswordEmailHandler;
use Sylius\Component\Core\Model\AdminUser;
-use Sylius\Component\Core\Test\SwiftmailerAssertionTrait;
use Sylius\Component\Mailer\Sender\SenderInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Filesystem\Filesystem;
use Symfony\Contracts\Translation\TranslatorInterface;
final class SendResetPasswordEmailHandlerTest extends KernelTestCase
{
- use SwiftmailerAssertionTrait;
-
/** @test */
public function it_sends_password_reset_token_email(): void
{
- if (self::isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::bootKernel()->getContainer();
/** @var TranslatorInterface $translator */
@@ -67,57 +59,4 @@ final class SendResetPasswordEmailHandlerTest extends KernelTestCase
$translator->trans('sylius.email.admin_password_reset.to_reset_your_password', [], null, 'en_US'),
);
}
-
- /** @test */
- public function it_sends_password_reset_token_email_with_swiftmailer(): void
- {
- if (!self::isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment with swiftmailer');
- }
-
- $container = self::bootKernel()->getContainer();
-
- self::setSpoolDirectory($container->getParameter('kernel.cache_dir') . '/spool');
-
- /** @var Filesystem $filesystem */
- $filesystem = $container->get('test.filesystem.public');
-
- $filesystem->remove(self::getSpoolDirectory());
-
- /** @var TranslatorInterface $translator */
- $translator = $container->get('translator');
-
- /** @var SenderInterface $emailSender */
- $emailSender = $container->get('sylius.email_sender');
-
- $adminUser = new AdminUser();
- $adminUser->setEmail('sylius@example.com');
- $adminUser->setPasswordResetToken('my_reset_token');
-
- $adminUserRepository = $this->createMock(UserRepositoryInterface::class);
- $adminUserRepository
- ->method('findOneByEmail')
- ->with('sylius@example.com')
- ->willReturn($adminUser)
- ;
-
- $resetPasswordEmailHandler = new SendResetPasswordEmailHandler($adminUserRepository, $emailSender);
- $resetPasswordEmailHandler(new SendResetPasswordEmail(
- 'sylius@example.com',
- 'en_US',
- ));
-
- self::assertSpooledMessagesCountWithRecipient(1, 'sylius@example.com');
- self::assertSpooledMessageWithContentHasRecipient(
- $translator->trans('sylius.email.admin_password_reset.to_reset_your_password', [], null, 'en_US'),
- 'sylius@example.com',
- );
- }
-
- private static function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php b/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php
index 00b4bd11fa..72edc128d6 100644
--- a/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php
+++ b/src/Sylius/Bundle/AdminBundle/Twig/NotificationWidgetExtension.php
@@ -44,7 +44,7 @@ final class NotificationWidgetExtension extends AbstractExtension
return '';
}
- return $environment->render('@SyliusAdmin/_notification.html.twig', [
+ return $environment->render('@SyliusAdmin/Layout/_notification.html.twig', [
'frequency' => $this->checkFrequency,
'currentVersion' => SyliusCoreBundle::VERSION,
]);
diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json
index 88df3c3934..ea93e69a36 100644
--- a/src/Sylius/Bundle/AdminBundle/composer.json
+++ b/src/Sylius/Bundle/AdminBundle/composer.json
@@ -30,13 +30,13 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"knplabs/knp-menu": "^3.1",
"knplabs/knp-menu-bundle": "^3.0",
- "sylius/core-bundle": "^1.12",
- "sylius/ui-bundle": "^1.12",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/webpack-encore-bundle": "^1.15",
+ "sylius/core-bundle": "^2.0",
+ "sylius/ui-bundle": "^2.0",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/webpack-encore-bundle": "^1.17.1",
"twig/intl-extra": "^2.12 || ^3.4",
"twig/twig": "^2.12 || ^3.3"
},
@@ -45,8 +45,8 @@
"phpspec/phpspec": "^7.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/dotenv": "^5.4.21 || ^6.0"
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/dotenv": "^6.3.0"
},
"config": {
"allow-plugins": {
@@ -55,7 +55,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js b/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js
deleted file mode 100644
index 6c69f99e64..0000000000
--- a/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js
+++ /dev/null
@@ -1,248 +0,0 @@
-import { rollup } from 'rollup';
-import { terser } from 'rollup-plugin-terser';
-import babel from '@rollup/plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import concat from 'gulp-concat';
-import dedent from 'dedent';
-import gulp from 'gulp';
-import gulpif from 'gulp-if';
-import gulpSass from 'gulp-sass';
-import inject from '@rollup/plugin-inject';
-import livereload from 'gulp-livereload';
-import merge from 'merge-stream';
-import order from 'gulp-order';
-import realSass from 'sass';
-import resolve from '@rollup/plugin-node-resolve';
-import sourcemaps from 'gulp-sourcemaps';
-import uglifycss from 'gulp-uglifycss';
-import upath from 'upath';
-import yargs from 'yargs';
-
-const sass = gulpSass(realSass);
-
-const { argv } = yargs
- .options({
- rootPath: {
- description: ' path to web assets directory',
- type: 'string',
- requiresArg: true,
- required: true,
- },
- vendorPath: {
- description: ' path to vendor directory',
- type: 'string',
- requiresArg: true,
- required: false,
- },
- nodeModulesPath: {
- description: ' path to node_modules directory',
- type: 'string',
- requiresArg: true,
- required: true,
- },
- });
-
-const env = process.env.GULP_ENV;
-const options = {
- minify: env === 'prod',
- sourcemaps: env !== 'prod',
-};
-
-const rootPath = upath.normalizeSafe(argv.rootPath);
-const adminRootPath = upath.joinSafe(rootPath, 'admin');
-const vendorPath = upath.normalizeSafe(argv.vendorPath || '.');
-const vendorAdminPath = vendorPath === '.' ? '.' : upath.joinSafe(vendorPath, 'AdminBundle');
-const vendorUiPath = vendorPath === '.' ? '../UiBundle/' : upath.joinSafe(vendorPath, 'UiBundle');
-const nodeModulesPath = upath.normalizeSafe(argv.nodeModulesPath);
-
-const paths = {
- admin: {
- js: [
- upath.joinSafe(vendorUiPath, 'Resources/private/js/**'),
- upath.joinSafe(vendorAdminPath, 'Resources/private/js/**'),
- ],
- sass: [
- upath.joinSafe(vendorUiPath, 'Resources/private/sass/**'),
- upath.joinSafe(vendorAdminPath, 'Resources/private/sass/**'),
- ],
- css: [
- upath.joinSafe(nodeModulesPath, 'semantic-ui-css/semantic.min.css'),
- upath.joinSafe(vendorUiPath, 'Resources/private/css/**'),
- upath.joinSafe(vendorAdminPath, 'Resources/private/css/**'),
- ],
- img: [
- upath.joinSafe(vendorUiPath, 'Resources/private/img/**'),
- upath.joinSafe(vendorAdminPath, 'Resources/private/img/**'),
- ],
- },
-};
-
-const sourcePathMap = [
- {
- sourceDir: upath.relative('', upath.joinSafe(vendorAdminPath, 'Resources/private/')),
- destPath: '/SyliusAdminBundle',
- },
- {
- sourceDir: upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private/')),
- destPath: '/SyliusUiBundle',
- },
- {
- sourceDir: upath.relative('', nodeModulesPath),
- destPath: '/node_modules',
- },
-];
-
-const mapSourcePath = function mapSourcePath(sourcePath) {
- const match = sourcePathMap.find(({ sourceDir }) => (
- sourcePath.substring(0, sourceDir.length) === sourceDir
- ));
-
- if (!match) {
- return sourcePath;
- }
-
- const { sourceDir, destPath } = match;
-
- return upath.joinSafe(destPath, sourcePath.substring(sourceDir.length));
-};
-
-export const buildAdminJs = async function buildAdminJs() {
- const bundle = await rollup({
- input: upath.joinSafe(vendorAdminPath, 'Resources/private/js/app.js'),
- plugins: [
- {
- name: 'shim-app',
-
- transform(code, id) {
- if (upath.relative('', id) === upath.relative('', upath.joinSafe(vendorAdminPath, 'Resources/private/js/app.js'))) {
- return {
- code: dedent`
- import './shim/shim-polyfill';
- import './shim/shim-jquery';
- import './shim/shim-semantic-ui';
-
- ${code}
- `,
- map: null,
- };
- }
-
- return undefined;
- },
- },
- inject({
- include: `${nodeModulesPath}/**`,
- modules: {
- $: 'jquery',
- jQuery: 'jquery',
- },
- }),
- resolve({
- jail: upath.resolve(nodeModulesPath),
- }),
- commonjs({
- include: `${nodeModulesPath}/**`,
- }),
- babel({
- babelrc: false,
- exclude: `${nodeModulesPath}/**`,
- presets: [
- ['@babel/preset-env', {
- targets: {
- browsers: [
- 'last 2 versions',
- 'Firefox ESR',
- 'IE >= 9',
- 'Android >= 4.0',
- 'iOS >= 7',
- ],
- },
- modules: false,
- exclude: [
- 'transform-async-to-generator',
- 'transform-regenerator',
- ]
- }],
- ],
- plugins: [
- ['fast-async'],
- ['module-resolver', {
- alias: {
- 'sylius/ui': upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private/js')),
- },
- }],
- ['@babel/plugin-proposal-object-rest-spread', {
- useBuiltIns: false,
- }],
- ],
- }),
- options.minify && terser(),
- ],
- treeshake: false,
- });
-
- await bundle.write({
- file: upath.joinSafe(adminRootPath, 'js/app.js'),
- format: 'iife',
- sourcemap: options.sourcemaps,
- });
-};
-buildAdminJs.description = 'Build admin js assets.';
-
-export const buildAdminCss = function buildAdminCss() {
- const copyStream = merge(
- gulp.src(upath.joinSafe(nodeModulesPath, 'semantic-ui-css/themes/**/*'))
- .pipe(gulp.dest(upath.joinSafe(adminRootPath, 'css/themes'))),
- );
-
- const cssStream = gulp.src(paths.admin.css, { base: './' })
- .pipe(gulpif(options.sourcemaps, sourcemaps.init()))
- .pipe(concat('css-files.css'));
-
- const sassStream = gulp.src(paths.admin.sass, { base: './' })
- .pipe(gulpif(options.sourcemaps, sourcemaps.init()))
- .pipe(sass())
- .pipe(concat('sass-files.scss'));
-
- return merge(
- copyStream,
- merge(cssStream, sassStream)
- .pipe(order(['css-files.css', 'sass-files.scss']))
- .pipe(concat('style.css'))
- .pipe(gulpif(options.minify, uglifycss()))
- .pipe(gulpif(options.sourcemaps, sourcemaps.mapSources(mapSourcePath)))
- .pipe(gulpif(options.sourcemaps, sourcemaps.write('./')))
- .pipe(gulp.dest(upath.joinSafe(adminRootPath, 'css')))
- .pipe(livereload()),
- );
-};
-buildAdminCss.description = 'Build admin css assets.';
-
-export const buildAdminImg = function buildAdminImg() {
- return gulp.src(paths.admin.img)
- .pipe(gulp.dest(upath.joinSafe(adminRootPath, 'img')));
-};
-buildAdminImg.description = 'Build admin img assets.';
-
-export const watchAdmin = function watchAdmin() {
- livereload.listen();
-
- gulp.watch(paths.admin.js, buildAdminJs);
- gulp.watch(paths.admin.sass, buildAdminCss);
- gulp.watch(paths.admin.css, buildAdminCss);
- gulp.watch(paths.admin.img, buildAdminImg);
-};
-watchAdmin.description = 'Watch admin asset sources and rebuild on changes.';
-
-export const build = gulp.parallel(buildAdminJs, buildAdminCss, buildAdminImg);
-build.description = 'Build assets.';
-
-export const watch = gulp.parallel(build, watchAdmin);
-watch.description = 'Watch asset sources and rebuild on changes.';
-
-gulp.task('admin-js', buildAdminJs);
-gulp.task('admin-css', buildAdminCss);
-gulp.task('admin-img', buildAdminImg);
-gulp.task('admin-watch', watchAdmin);
-
-export default build;
diff --git a/src/Sylius/Bundle/AdminBundle/test/config/bundles.php b/src/Sylius/Bundle/AdminBundle/test/config/bundles.php
index 6d2563035c..4f3ef19851 100644
--- a/src/Sylius/Bundle/AdminBundle/test/config/bundles.php
+++ b/src/Sylius/Bundle/AdminBundle/test/config/bundles.php
@@ -14,11 +14,9 @@ declare(strict_types=1);
return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
- Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['test_with_swiftmailer' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
- Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
diff --git a/src/Sylius/Bundle/AdminBundle/test/config/packages/config.yaml b/src/Sylius/Bundle/AdminBundle/test/config/packages/config.yaml
index dcdbff194e..dfea3e341e 100644
--- a/src/Sylius/Bundle/AdminBundle/test/config/packages/config.yaml
+++ b/src/Sylius/Bundle/AdminBundle/test/config/packages/config.yaml
@@ -15,6 +15,16 @@ framework:
test: ~
mailer:
dsn: 'null://null'
+ assets:
+ packages:
+ admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
+ shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
+ app.admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/admin/manifest.json'
+ app.shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/shop/manifest.json'
workflows: ~
security:
@@ -32,3 +42,11 @@ doctrine:
driver: "%database_driver%"
path: "%database_path%"
charset: UTF8
+
+webpack_encore:
+ output_path: '%kernel.project_dir%/public/build/default'
+ builds:
+ admin: '%kernel.project_dir%/public/build/admin'
+ shop: '%kernel.project_dir%/public/build/shop'
+ app.admin: '%kernel.project_dir%/public/build/app/admin'
+ app.shop: '%kernel.project_dir%/public/build/app/shop'
diff --git a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml b/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml
deleted file mode 100644
index 1828fd69a2..0000000000
--- a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
- test.filesystem.public:
- alias: filesystem
- public: true
diff --git a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml b/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml
deleted file mode 100644
index c438f4b256..0000000000
--- a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-swiftmailer:
- disable_delivery: true
- logging: true
- spool:
- type: file
- path: "%kernel.cache_dir%/spool"
diff --git a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml b/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml
deleted file mode 100644
index e2310f20bf..0000000000
--- a/src/Sylius/Bundle/AdminBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sylius_mailer:
- sender_adapter: sylius.email_sender.adapter.swiftmailer
diff --git a/src/Sylius/Bundle/ApiBundle/Applicator/ArchivingShippingMethodApplicator.php b/src/Sylius/Bundle/ApiBundle/Applicator/ArchivingShippingMethodApplicator.php
index daa6354f4b..3fe1bbbe83 100644
--- a/src/Sylius/Bundle/ApiBundle/Applicator/ArchivingShippingMethodApplicator.php
+++ b/src/Sylius/Bundle/ApiBundle/Applicator/ArchivingShippingMethodApplicator.php
@@ -13,19 +13,19 @@ declare(strict_types=1);
namespace Sylius\Bundle\ApiBundle\Applicator;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\ShippingMethodInterface;
+use Symfony\Component\Clock\ClockInterface;
/** @experimental */
final class ArchivingShippingMethodApplicator implements ArchivingShippingMethodApplicatorInterface
{
- public function __construct(private DateTimeProviderInterface $calendar)
+ public function __construct(private ClockInterface $clock)
{
}
public function archive(ShippingMethodInterface $data): ShippingMethodInterface
{
- $data->setArchivedAt($this->calendar->now());
+ $data->setArchivedAt($this->clock->now());
return $data;
}
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/RequestResetPasswordTokenHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/RequestResetPasswordTokenHandler.php
index 13f01b2c08..d40569bedb 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/RequestResetPasswordTokenHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/RequestResetPasswordTokenHandler.php
@@ -15,9 +15,9 @@ namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
use Sylius\Bundle\ApiBundle\Command\Account\RequestResetPasswordToken;
use Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Sylius\Component\User\Security\Generator\GeneratorInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
@@ -29,7 +29,7 @@ final class RequestResetPasswordTokenHandler implements MessageHandlerInterface
private UserRepositoryInterface $userRepository,
private MessageBusInterface $commandBus,
private GeneratorInterface $generator,
- private DateTimeProviderInterface $calendar,
+ private ClockInterface $clock,
) {
}
@@ -41,7 +41,7 @@ final class RequestResetPasswordTokenHandler implements MessageHandlerInterface
}
$user->setPasswordResetToken($this->generator->generate());
- $user->setPasswordRequestedAt($this->calendar->now());
+ $user->setPasswordRequestedAt($this->clock->now());
$this->commandBus->dispatch(
new SendResetPasswordEmail(
diff --git a/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/VerifyCustomerAccountHandler.php b/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/VerifyCustomerAccountHandler.php
index 7daa3dc370..9c2e0ccb42 100644
--- a/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/VerifyCustomerAccountHandler.php
+++ b/src/Sylius/Bundle/ApiBundle/CommandHandler/Account/VerifyCustomerAccountHandler.php
@@ -16,9 +16,9 @@ namespace Sylius\Bundle\ApiBundle\CommandHandler\Account;
use InvalidArgumentException;
use Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail;
use Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\ShopUserInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
@@ -29,7 +29,7 @@ final class VerifyCustomerAccountHandler implements MessageHandlerInterface
{
public function __construct(
private RepositoryInterface $shopUserRepository,
- private DateTimeProviderInterface $calendar,
+ private ClockInterface $clock,
private MessageBusInterface $commandBus,
) {
}
@@ -44,7 +44,7 @@ final class VerifyCustomerAccountHandler implements MessageHandlerInterface
);
}
- $user->setVerifiedAt($this->calendar->now());
+ $user->setVerifiedAt($this->clock->now());
$user->setEmailVerificationToken(null);
$user->enable();
diff --git a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php b/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php
deleted file mode 100644
index 753c262c66..0000000000
--- a/src/Sylius/Bundle/ApiBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php
+++ /dev/null
@@ -1,73 +0,0 @@
- 'Sylius\Bundle\ApiBundle\Validator\ResourceApiInputDataPropertiesValidatorInterface',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ChannelDenormalizer' => 'Sylius\Bundle\ApiBundle\Serializer\ChannelDenormalizer',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ChannelPriceHistoryConfigDenormalizer' => 'Sylius\Bundle\ApiBundle\Serializer\ChannelPriceHistoryConfigDenormalizer',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ProductVariantNormalizer' => 'Sylius\Bundle\ApiBundle\Serializer\ProductVariantNormalizer',
- ];
-
- public function process(ContainerBuilder $container): void
- {
- foreach ($container->getDefinitions() as $serviceName => $definition) {
- if ($this->shouldHaveLegacyAlias($container, $serviceName)) {
- $this->addLegacyAlias($container, $serviceName);
- }
- }
- }
-
- private function shouldHaveLegacyAlias(ContainerBuilder $container, string $serviceName): bool
- {
- foreach (self::PLUGIN_TO_SYLIUS_PREFIXES_MAP as $legacyPrefix => $syliusPrefix) {
- $legacyServiceName = $this->getLegacyServiceName($serviceName);
-
- if (str_starts_with($serviceName, $syliusPrefix) && !$container->has($legacyServiceName)) {
- return true;
- }
- }
-
- return false;
- }
-
- private function addLegacyAlias(ContainerBuilder $container, string $serviceName): void
- {
- $legacyServiceName = $this->getLegacyServiceName($serviceName);
-
- $container
- ->setAlias($legacyServiceName, $serviceName)
- ->setPublic(true)
- ->setDeprecated(
- 'sylius/sylius',
- '1.13',
- sprintf('Alias %%alias_id%% is deprecated. Consider using the %s service.', $serviceName),
- )
- ;
- }
-
- private function getLegacyServiceName(string $name): string
- {
- return str_replace(
- array_values(self::PLUGIN_TO_SYLIUS_PREFIXES_MAP),
- array_keys(self::PLUGIN_TO_SYLIUS_PREFIXES_MAP),
- $name,
- );
- }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/applicators.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/applicators.xml
index 9ee3efa0de..a6a3ee5e82 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/applicators.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/applicators.xml
@@ -19,7 +19,7 @@
-
diff --git a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
index 0c922f0212..0c752f98a5 100644
--- a/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
+++ b/src/Sylius/Bundle/ApiBundle/Resources/config/services/command_handlers.xml
@@ -153,7 +153,7 @@
@@ -212,7 +212,7 @@
-
diff --git a/src/Sylius/Bundle/ApiBundle/Serializer/CustomerDenormalizer.php b/src/Sylius/Bundle/ApiBundle/Serializer/CustomerDenormalizer.php
index 2797f7d112..80a642aff2 100644
--- a/src/Sylius/Bundle/ApiBundle/Serializer/CustomerDenormalizer.php
+++ b/src/Sylius/Bundle/ApiBundle/Serializer/CustomerDenormalizer.php
@@ -13,8 +13,8 @@ declare(strict_types=1);
namespace Sylius\Bundle\ApiBundle\Serializer;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\CustomerInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Serializer\Normalizer\ContextAwareDenormalizerInterface;
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
@@ -26,7 +26,7 @@ final class CustomerDenormalizer implements ContextAwareDenormalizerInterface, D
private const ALREADY_CALLED = 'sylius_customer_denormalizer_already_called';
- public function __construct(private DateTimeProviderInterface $calendar)
+ public function __construct(private ClockInterface $clock)
{
}
@@ -46,7 +46,7 @@ final class CustomerDenormalizer implements ContextAwareDenormalizerInterface, D
$user = $data['user'] ?? null;
if (null !== $user && array_key_exists('verified', $user)) {
- $data['user']['verified'] = true === $user['verified'] ? $this->calendar->now()->format(\DateTimeInterface::RFC3339) : null;
+ $data['user']['verified'] = true === $user['verified'] ? $this->clock->now()->format(\DateTimeInterface::RFC3339) : null;
}
return $this->denormalizer->denormalize($data, $type, $format, $context);
diff --git a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
index 2a2e32e985..8b8f3f48ca 100644
--- a/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
+++ b/src/Sylius/Bundle/ApiBundle/SyliusApiBundle.php
@@ -17,7 +17,6 @@ use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\CommandDataTransformerP
use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\ExtractorMergingCompilerPass;
use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\FlattenExceptionNormalizerDecoratorCompilerPass;
use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\LegacyErrorHandlingCompilerPass;
-use Sylius\Bundle\ApiBundle\DependencyInjection\Compiler\SyliusPriceHistoryLegacyAliasesPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -29,7 +28,6 @@ final class SyliusApiBundle extends Bundle
$container->addCompilerPass(new CommandDataTransformerPass());
$container->addCompilerPass(new FlattenExceptionNormalizerDecoratorCompilerPass());
$container->addCompilerPass(new LegacyErrorHandlingCompilerPass());
- $container->addCompilerPass(new SyliusPriceHistoryLegacyAliasesPass());
$container->addCompilerPass(new ExtractorMergingCompilerPass());
}
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/.env.test_with_swiftmailer b/src/Sylius/Bundle/ApiBundle/Tests/Application/.env.test_with_swiftmailer
deleted file mode 100644
index 26a5ec11b1..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/.env.test_with_swiftmailer
+++ /dev/null
@@ -1 +0,0 @@
-APP_ENV=test_with_swiftmailer
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php
index f1ad14ebee..24b1e7b40d 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/bundles.php
@@ -13,11 +13,9 @@ declare(strict_types=1);
return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
- Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['test_with_swiftmailer' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
- Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
@@ -55,9 +53,9 @@ return [
Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true],
ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
- Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_with_swiftmailer' => true],
- Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_with_swiftmailer' => true],
- Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true, 'test_with_swiftmailer' => true],
+ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+ Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+ Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/config.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/config.yaml
index 016b52f50f..5946f73c63 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/config.yaml
+++ b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/config.yaml
@@ -24,7 +24,6 @@ sylius_api:
enabled: '%env(bool:SYLIUS_API_ENABLED)%'
framework:
- assets: ~
secret: "ch4mb3r0f5ecr3ts"
default_locale: "%locale%"
session:
@@ -39,6 +38,16 @@ framework:
paths: ['%kernel.project_dir%/config/serialization']
mailer:
dsn: 'null://null'
+ assets:
+ packages:
+ admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
+ shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
+ app.admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/admin/manifest.json'
+ app.shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/shop/manifest.json'
workflows: ~
doctrine_migrations:
@@ -94,3 +103,11 @@ services:
Sylius\Bundle\ApiBundle\Application\CommandHandler\FooHandler:
tags:
- { name: messenger.message_handler, bus: sylius.command_bus }
+
+webpack_encore:
+ output_path: '%kernel.project_dir%/public/build/default'
+ builds:
+ admin: '%kernel.project_dir%/public/build/admin'
+ shop: '%kernel.project_dir%/public/build/shop'
+ app.admin: '%kernel.project_dir%/public/build/app/admin'
+ app.shop: '%kernel.project_dir%/public/build/app/shop'
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/filesystem.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/filesystem.yaml
deleted file mode 100644
index 1828fd69a2..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/filesystem.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
- test.filesystem.public:
- alias: filesystem
- public: true
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/swiftmailer.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/swiftmailer.yaml
deleted file mode 100644
index c438f4b256..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/swiftmailer.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-swiftmailer:
- disable_delivery: true
- logging: true
- spool:
- type: file
- path: "%kernel.cache_dir%/spool"
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/sylius_mailer.yaml b/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/sylius_mailer.yaml
deleted file mode 100644
index e2310f20bf..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Tests/Application/config/packages/test_with_swiftmailer/sylius_mailer.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sylius_mailer:
- sender_adapter: sylius.email_sender.adapter.swiftmailer
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountRegistrationEmailHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountRegistrationEmailHandlerTest.php
index cf1e1472f3..6117d0268f 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountRegistrationEmailHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountRegistrationEmailHandlerTest.php
@@ -19,25 +19,18 @@ use Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail;
use Sylius\Bundle\ApiBundle\CommandHandler\Account\SendAccountRegistrationEmailHandler;
use Sylius\Component\Channel\Repository\ChannelRepositoryInterface;
use Sylius\Component\Core\Model\ChannelInterface;
-use Sylius\Component\Core\Test\SwiftmailerAssertionTrait;
use Sylius\Component\User\Model\UserInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Filesystem\Filesystem;
use Symfony\Contracts\Translation\TranslatorInterface;
final class SendAccountRegistrationEmailHandlerTest extends KernelTestCase
{
use ProphecyTrait;
- use SwiftmailerAssertionTrait;
/** @test */
public function it_sends_account_registration_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -82,71 +75,4 @@ final class SendAccountRegistrationEmailHandlerTest extends KernelTestCase
self::assertEmailAddressContains($email, 'To', 'user@example.com');
self::assertEmailHtmlBodyContains($email, $translator->trans('sylius.email.user_registration.start_shopping', [], null, 'en_US'));
}
-
- /** @test */
- public function it_sends_account_registration_email_with_swiftmailer(): void
- {
- if (!$this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment with swiftmailer');
- }
-
- $container = self::getContainer();
-
- self::setSpoolDirectory($container->getParameter('kernel.cache_dir') . '/spool');
-
- /** @var Filesystem $filesystem */
- $filesystem = $container->get('test.filesystem.public');
-
- /** @var TranslatorInterface $translator */
- $translator = $container->get('translator');
-
- $filesystem->remove(self::getSpoolDirectory());
-
- $emailSender = $container->get('sylius.email_sender');
-
- /** @var ChannelRepositoryInterface|ObjectProphecy $channelRepository */
- $channelRepository = $this->prophesize(ChannelRepositoryInterface::class);
- /** @var UserRepositoryInterface|ObjectProphecy $userRepository */
- $userRepository = $this->prophesize(UserRepositoryInterface::class);
- /** @var ChannelInterface|ObjectProphecy $channel */
- $channel = $this->prophesize(ChannelInterface::class);
- /** @var UserInterface|ObjectProphecy $user */
- $user = $this->prophesize(UserInterface::class);
-
- $channel->isAccountVerificationRequired()->willReturn(false);
- $channel->getHostname()->willReturn('example.com');
-
- $user->getUsername()->willReturn('username');
- $user->getEmailVerificationToken()->willReturn('token');
-
- $channelRepository->findOneByCode('CHANNEL_CODE')->willReturn($channel->reveal());
- $userRepository->findOneByEmail('user@example.com')->willReturn($user->reveal());
-
- $sendAccountRegistrationEmailHandler = new SendAccountRegistrationEmailHandler(
- $userRepository->reveal(),
- $channelRepository->reveal(),
- $emailSender,
- );
-
- $sendAccountRegistrationEmailHandler(
- new SendAccountRegistrationEmail(
- 'user@example.com',
- 'en_US',
- 'CHANNEL_CODE',
- ),
- );
-
- self::assertSpooledMessagesCountWithRecipient(1, 'user@example.com');
- self::assertSpooledMessageWithContentHasRecipient(
- $translator->trans('sylius.email.user_registration.start_shopping', [], null, 'en_US'),
- 'user@example.com',
- );
- }
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountVerificationEmailHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountVerificationEmailHandlerTest.php
index d95e900e07..afe39c0959 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountVerificationEmailHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendAccountVerificationEmailHandlerTest.php
@@ -33,10 +33,6 @@ final class SendAccountVerificationEmailHandlerTest extends KernelTestCase
/** @test */
public function it_sends_account_verification_token_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -81,11 +77,4 @@ final class SendAccountVerificationEmailHandlerTest extends KernelTestCase
$translator->trans('sylius.email.verification_token.message', [], null, 'en_US'),
);
}
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendContactRequestHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendContactRequestHandlerTest.php
index f63e347593..8f71931a63 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendContactRequestHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendContactRequestHandlerTest.php
@@ -31,10 +31,6 @@ final class SendContactRequestHandlerTest extends KernelTestCase
/** @test */
public function it_sends_contact_request(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -68,11 +64,4 @@ final class SendContactRequestHandlerTest extends KernelTestCase
self::assertEmailAddressContains($email, 'To', 'shop@example.com');
self::assertEmailHtmlBodyContains($email, $translator->trans('sylius.email.contact_request.content', [], null, 'en_US'));
}
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendOrderConfirmationEmailHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendOrderConfirmationEmailHandlerTest.php
index 224454c019..cd391103e7 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendOrderConfirmationEmailHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendOrderConfirmationEmailHandlerTest.php
@@ -32,10 +32,6 @@ final class SendOrderConfirmationEmailHandlerTest extends KernelTestCase
/** @test */
public function it_sends_order_confirmation_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::bootKernel()->getContainer();
$emailSender = $container->get('sylius.email_sender');
@@ -70,11 +66,4 @@ final class SendOrderConfirmationEmailHandlerTest extends KernelTestCase
$this->assertEmailAddressContains($email, 'To', 'johnny.bravo@email.com');
$this->assertEmailHtmlBodyContains($email, '#000001');
}
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = $this->getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendResetPasswordEmailHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendResetPasswordEmailHandlerTest.php
index 5cc8c19925..94245e9d20 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendResetPasswordEmailHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/CommandHandler/SendResetPasswordEmailHandlerTest.php
@@ -33,10 +33,6 @@ final class SendResetPasswordEmailHandlerTest extends KernelTestCase
/** @test */
public function it_sends_password_reset_token_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -79,11 +75,4 @@ final class SendResetPasswordEmailHandlerTest extends KernelTestCase
$translator->trans('sylius.email.password_reset.to_reset_your_password_token', [], null, 'en_US'),
);
}
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php b/src/Sylius/Bundle/ApiBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php
deleted file mode 100644
index 1ca92d0469..0000000000
--- a/src/Sylius/Bundle/ApiBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-register('Sylius\Bundle\ApiBundle\Serializer\ChannelDenormalizer');
- $container->register('Sylius\Bundle\ApiBundle\Validator\ResourceApiInputDataPropertiesValidatorInterface');
-
- $this->process($container);
-
- $this->assertHasAlias($container, 'Sylius\PriceHistoryPlugin\Infrastructure\Serializer\ChannelDenormalizer');
- $this->assertHasAlias($container, 'Sylius\PriceHistoryPlugin\Application\Validator\ResourceInputDataPropertiesValidatorInterface');
- }
-
- private function assertHasAlias(ContainerBuilder $container, string $alias): void
- {
- $this->assertTrue($container->hasAlias($alias), 'Expected to find alias ' . $alias);
- }
-
- private function process(ContainerBuilder $container): void
- {
- (new SyliusPriceHistoryLegacyAliasesPass())->process($container);
- }
-}
diff --git a/src/Sylius/Bundle/ApiBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php b/src/Sylius/Bundle/ApiBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
index be39846a29..bf2279f62a 100644
--- a/src/Sylius/Bundle/ApiBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
+++ b/src/Sylius/Bundle/ApiBundle/Tests/MessageHandler/Admin/SendResetPasswordEmailHandlerTest.php
@@ -29,10 +29,6 @@ final class SendResetPasswordEmailHandlerTest extends KernelTestCase
/** @test */
public function it_sends_password_reset_token_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('Test is relevant only for the environment without swiftmailer');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -66,11 +62,4 @@ final class SendResetPasswordEmailHandlerTest extends KernelTestCase
$translator->trans('sylius.email.admin_password_reset.to_reset_your_password_token', [], null, 'en_US'),
);
}
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json
index 95d6b521f1..dacdbffba9 100644
--- a/src/Sylius/Bundle/ApiBundle/composer.json
+++ b/src/Sylius/Bundle/ApiBundle/composer.json
@@ -23,13 +23,13 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/dbal": "^3.0",
"api-platform/core": "^2.7.10",
"enshrined/svg-sanitize": "^0.16",
"lexik/jwt-authentication-bundle": "^2.11",
- "sylius/core-bundle": "^1.12",
- "symfony/messenger": "^5.4.21 || ^6.0"
+ "sylius/core-bundle": "^2.0",
+ "symfony/messenger": "^6.3.4"
},
"require-dev": {
"ext-sqlite3": "*",
@@ -40,16 +40,15 @@
"phpspec/phpspec": "^7.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/debug-bundle": "^5.4.21 || ^6.0",
- "symfony/dotenv": "^5.4.21 || ^6.0",
- "symfony/webpack-encore-bundle": "^1.15",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/debug-bundle": "^6.3.2",
+ "symfony/dotenv": "^6.3.0",
+ "symfony/webpack-encore-bundle": "^1.17.1",
"theofidry/alice-data-fixtures": "^1.4"
},
"conflict": {
"doctrine/doctrine-bundle": "2.3.0",
- "lexik/jwt-authentication-bundle": "^2.18",
- "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5"
+ "lexik/jwt-authentication-bundle": "^2.18"
},
"config": {
"allow-plugins": {
@@ -58,7 +57,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/RequestResetPasswordTokenHandlerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/RequestResetPasswordTokenHandlerSpec.php
index 5f65d18538..41bda61eed 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/RequestResetPasswordTokenHandlerSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/RequestResetPasswordTokenHandlerSpec.php
@@ -17,10 +17,10 @@ use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\ApiBundle\Command\Account\RequestResetPasswordToken;
use Sylius\Bundle\ApiBundle\Command\Account\SendResetPasswordEmail;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\ShopUserInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Sylius\Component\User\Security\Generator\GeneratorInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
@@ -32,9 +32,9 @@ final class RequestResetPasswordTokenHandlerSpec extends ObjectBehavior
UserRepositoryInterface $userRepository,
MessageBusInterface $messageBus,
GeneratorInterface $generator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
): void {
- $this->beConstructedWith($userRepository, $messageBus, $generator, $dateTimeProvider);
+ $this->beConstructedWith($userRepository, $messageBus, $generator, $clock);
}
function it_is_a_message_handler(): void
@@ -46,15 +46,15 @@ final class RequestResetPasswordTokenHandlerSpec extends ObjectBehavior
UserRepositoryInterface $userRepository,
ShopUserInterface $shopUser,
GeneratorInterface $generator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
MessageBusInterface $messageBus,
): void {
$userRepository->findOneByEmail('test@email.com')->willReturn($shopUser);
- $dateTimeProvider->now()->willReturn(new \DateTime());
+ $clock->now()->willReturn(new \DateTimeImmutable());
$generator->generate()->willReturn('TOKEN');
$shopUser->setPasswordResetToken('TOKEN')->shouldBeCalled();
- $shopUser->setPasswordRequestedAt(Argument::type(\DateTime::class));
+ $shopUser->setPasswordRequestedAt(Argument::type(\DateTimeImmutable::class));
$sendResetPasswordEmail = new SendResetPasswordEmail('test@email.com', 'WEB', 'en_US');
diff --git a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/VerifyCustomerAccountHandlerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/VerifyCustomerAccountHandlerSpec.php
index f4f868d433..8c9615075e 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/VerifyCustomerAccountHandlerSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Account/VerifyCustomerAccountHandlerSpec.php
@@ -17,9 +17,9 @@ use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\ApiBundle\Command\Account\SendAccountRegistrationEmail;
use Sylius\Bundle\ApiBundle\Command\Account\VerifyCustomerAccount;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Sylius\Component\User\Model\UserInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
@@ -29,10 +29,10 @@ final class VerifyCustomerAccountHandlerSpec extends ObjectBehavior
{
function let(
RepositoryInterface $shopUserRepository,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
MessageBusInterface $commandBus,
): void {
- $this->beConstructedWith($shopUserRepository, $dateTimeProvider, $commandBus);
+ $this->beConstructedWith($shopUserRepository, $clock, $commandBus);
}
function it_is_a_message_handler(): void
@@ -42,15 +42,15 @@ final class VerifyCustomerAccountHandlerSpec extends ObjectBehavior
function it_verifies_shop_user(
RepositoryInterface $shopUserRepository,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
UserInterface $user,
MessageBusInterface $commandBus,
): void {
$shopUserRepository->findOneBy(['emailVerificationToken' => 'ToKeN'])->willReturn($user);
- $dateTimeProvider->now()->willReturn(new \DateTime());
+ $clock->now()->willReturn(new \DateTimeImmutable());
$user->getEmail()->willReturn('shop@example.com');
- $user->setVerifiedAt(Argument::type(\DateTime::class))->shouldBeCalled();
+ $user->setVerifiedAt(Argument::type(\DateTimeImmutable::class))->shouldBeCalled();
$user->setEmailVerificationToken(null)->shouldBeCalled();
$user->enable()->shouldBeCalled();
diff --git a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/ChooseShippingMethodHandlerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/ChooseShippingMethodHandlerSpec.php
index 7e2f3665d8..c36ef688ad 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/ChooseShippingMethodHandlerSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/CommandHandler/Checkout/ChooseShippingMethodHandlerSpec.php
@@ -26,7 +26,7 @@ use Sylius\Component\Core\OrderCheckoutTransitions;
use Sylius\Component\Core\Repository\OrderRepositoryInterface;
use Sylius\Component\Core\Repository\ShipmentRepositoryInterface;
use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface;
-use Sylius\Component\Shipping\Checker\ShippingMethodEligibilityCheckerInterface;
+use Sylius\Component\Shipping\Checker\Eligibility\ShippingMethodEligibilityCheckerInterface;
final class ChooseShippingMethodHandlerSpec extends ObjectBehavior
{
diff --git a/src/Sylius/Bundle/ApiBundle/spec/Serializer/CustomerDenormalizerSpec.php b/src/Sylius/Bundle/ApiBundle/spec/Serializer/CustomerDenormalizerSpec.php
index 3484d8160f..b5683724ce 100644
--- a/src/Sylius/Bundle/ApiBundle/spec/Serializer/CustomerDenormalizerSpec.php
+++ b/src/Sylius/Bundle/ApiBundle/spec/Serializer/CustomerDenormalizerSpec.php
@@ -14,17 +14,17 @@ declare(strict_types=1);
namespace spec\Sylius\Bundle\ApiBundle\Serializer;
use PhpSpec\ObjectBehavior;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Customer\Model\CustomerInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
final class CustomerDenormalizerSpec extends ObjectBehavior
{
private const ALREADY_CALLED = 'sylius_customer_denormalizer_already_called';
- function let(DateTimeProviderInterface $calendar): void
+ function let(ClockInterface $clock): void
{
- $this->beConstructedWith($calendar);
+ $this->beConstructedWith($clock);
}
function it_does_not_support_denormalization_when_the_denormalizer_has_already_been_called(): void
@@ -44,7 +44,7 @@ final class CustomerDenormalizerSpec extends ObjectBehavior
function it_does_nothing_if_user_verified_is_not_set(
DenormalizerInterface $denormalizer,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
CustomerInterface $customer,
): void {
$this->setDenormalizer($denormalizer);
@@ -52,12 +52,12 @@ final class CustomerDenormalizerSpec extends ObjectBehavior
$this->denormalize([], CustomerInterface::class)->shouldReturn($customer);
- $calendar->now()->shouldNotHaveBeenCalled();
+ $clock->now()->shouldNotHaveBeenCalled();
}
public function it_changes_user_verified_from_false_to_null(
DenormalizerInterface $denormalizer,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
CustomerInterface $customer,
): void {
$this->setDenormalizer($denormalizer);
@@ -65,18 +65,18 @@ final class CustomerDenormalizerSpec extends ObjectBehavior
$this->denormalize(['user' => ['verified' => false]], CustomerInterface::class)->shouldReturn($customer);
- $calendar->now()->shouldNotHaveBeenCalled();
+ $clock->now()->shouldNotHaveBeenCalled();
}
public function it_changes_user_verified_from_true_to_datetime(
DenormalizerInterface $denormalizer,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
CustomerInterface $customer,
): void {
$this->setDenormalizer($denormalizer);
- $dateTime = new \DateTime('2021-01-01T00:00:00+00:00');
- $calendar->now()->willReturn($dateTime);
+ $dateTime = new \DateTimeImmutable('2021-01-01T00:00:00+00:00');
+ $clock->now()->willReturn($dateTime);
$denormalizer->denormalize(['user' => ['verified' => '2021-01-01T00:00:00+00:00']], CustomerInterface::class, null, [self::ALREADY_CALLED => true])->willReturn($customer);
$this->denormalize(['user' => ['verified' => true]], CustomerInterface::class)->shouldReturn($customer);
diff --git a/src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
index b3726e4458..9ca1b94928 100644
--- a/src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
@@ -13,6 +13,9 @@ declare(strict_types=1);
namespace Sylius\Bundle\AttributeBundle\DependencyInjection;
+use Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeRepository;
+use Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeTranslationRepository;
+use Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeValueRepository;
use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
use Sylius\Component\Attribute\Model\Attribute;
@@ -64,7 +67,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Attribute::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(AttributeInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(AttributeRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->scalarNode('form')->cannotBeEmpty()->end()
->end()
@@ -79,7 +82,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(AttributeTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(AttributeTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(AttributeTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->cannotBeEmpty()->end()
->end()
@@ -99,7 +102,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->isRequired()->cannotBeEmpty()->end()
->scalarNode('interface')->isRequired()->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(AttributeValueRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->cannotBeEmpty()->end()
->end()
diff --git a/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeRepository.php b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeRepository.php
new file mode 100644
index 0000000000..777acea5f9
--- /dev/null
+++ b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class AttributeRepository extends EntityRepository implements AttributeRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeTranslationRepository.php b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeTranslationRepository.php
new file mode 100644
index 0000000000..2e5a784daa
--- /dev/null
+++ b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeTranslationRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class AttributeTranslationRepository extends EntityRepository implements AttributeTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeValueRepository.php b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeValueRepository.php
new file mode 100644
index 0000000000..9107746446
--- /dev/null
+++ b/src/Sylius/Bundle/AttributeBundle/Doctrine/ORM/AttributeValueRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class AttributeValueRepository extends EntityRepository implements AttributeValueRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/AttributeBundle/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php b/src/Sylius/Bundle/AttributeBundle/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php
index d9b7ea1a10..680444a4a2 100644
--- a/src/Sylius/Bundle/AttributeBundle/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php
+++ b/src/Sylius/Bundle/AttributeBundle/Form/Type/AttributeType/Configuration/SelectAttributeChoicesCollectionType.php
@@ -14,7 +14,6 @@ declare(strict_types=1);
namespace Sylius\Bundle\AttributeBundle\Form\Type\AttributeType\Configuration;
use Ramsey\Uuid\Uuid;
-use Sylius\Component\Resource\Translation\Provider\TranslationLocaleProviderInterface;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\CollectionType;
use Symfony\Component\Form\FormBuilderInterface;
@@ -23,23 +22,6 @@ use Symfony\Component\Form\FormEvents;
class SelectAttributeChoicesCollectionType extends AbstractType
{
- private ?string $defaultLocaleCode = null;
-
- public function __construct(?TranslationLocaleProviderInterface $localeProvider = null)
- {
- if (null !== $localeProvider) {
- trigger_deprecation(
- 'sylius/attribute-bundle',
- '1.13',
- 'Passing an instance of %s as a constructor argument for %s is deprecated and will not be possible in Sylius 2.0.',
- TranslationLocaleProviderInterface::class,
- self::class,
- );
-
- $this->defaultLocaleCode = $localeProvider->getDefaultLocaleCode();
- }
- }
-
public function buildForm(FormBuilderInterface $builder, array $options): void
{
$builder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {
@@ -55,10 +37,6 @@ class SelectAttributeChoicesCollectionType extends AbstractType
continue;
}
- if ($this->defaultLocaleCode !== null && !array_key_exists($this->defaultLocaleCode, $values)) {
- continue;
- }
-
$key = (string) $key;
$newKey = $this->getUniqueKey();
$fixedData[$newKey] = $this->resolveValues($values);
diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json
index 16dc291de9..3e452af032 100644
--- a/src/Sylius/Bundle/AttributeBundle/composer.json
+++ b/src/Sylius/Bundle/AttributeBundle/composer.json
@@ -26,12 +26,12 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"ramsey/uuid": "^4.0",
"stof/doctrine-extensions-bundle": "^1.4",
- "sylius/attribute": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "sylius/attribute": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4"
},
"require-dev": {
"doctrine/orm": "^2.13",
@@ -39,9 +39,9 @@
"phpspec/phpspec": "^7.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -54,7 +54,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json
index ee7c6ae698..503dbce7db 100644
--- a/src/Sylius/Bundle/ChannelBundle/composer.json
+++ b/src/Sylius/Bundle/ChannelBundle/composer.json
@@ -25,10 +25,10 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/channel": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/channel": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4"
},
"require-dev": {
"doctrine/orm": "^2.13",
@@ -36,9 +36,9 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
"twig/twig": "^2.12 || ^3.3"
},
"conflict": {
@@ -51,7 +51,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
deleted file mode 100644
index 4aef9e62d0..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php
+++ /dev/null
@@ -1,60 +0,0 @@
-getStartDate() > $this->dateTimeProvider->now()) {
+ if ($catalogPromotion->getStartDate() > $this->clock->now()) {
$this->eventBus->dispatch(new CatalogPromotionUpdated($catalogPromotion->getCode()), []);
}
@@ -57,7 +57,7 @@ final class CatalogPromotionAnnouncer implements CatalogPromotionAnnouncerInterf
private function calculateStartDateStamp(CatalogPromotionInterface $catalogPromotion): array
{
if ($catalogPromotion->getStartDate() !== null) {
- return [$this->delayStampCalculator->calculate($this->dateTimeProvider->now(), $catalogPromotion->getStartDate())];
+ return [$this->delayStampCalculator->calculate($this->clock->now(), $catalogPromotion->getStartDate())];
}
return [];
@@ -68,7 +68,7 @@ final class CatalogPromotionAnnouncer implements CatalogPromotionAnnouncerInterf
if ($catalogPromotion->getEndDate() !== null) {
$this->eventBus->dispatch(
new CatalogPromotionEnded($catalogPromotion->getCode()),
- [$this->delayStampCalculator->calculate($this->dateTimeProvider->now(), $catalogPromotion->getEndDate())],
+ [$this->delayStampCalculator->calculate($this->clock->now(), $catalogPromotion->getEndDate())],
);
}
}
diff --git a/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Command/RemoveInactiveCatalogPromotion.php b/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Command/RemoveInactiveCatalogPromotion.php
deleted file mode 100644
index 25882bb250..0000000000
--- a/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Command/RemoveInactiveCatalogPromotion.php
+++ /dev/null
@@ -1,29 +0,0 @@
-catalogPromotionRepository->findOneBy(['code' => $command->code]);
-
- if (null === $catalogPromotion) {
- return;
- }
-
- if ($catalogPromotion->getState() !== CatalogPromotionStates::STATE_INACTIVE) {
- throw new InvalidCatalogPromotionStateException(
- sprintf(
- 'Catalog promotion with code "%s" cannot be removed as it is not in an inactive state.',
- $catalogPromotion->getCode(),
- ),
- );
- }
-
- $this->entityManager->remove($catalogPromotion);
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Processor/CatalogPromotionRemovalProcessor.php b/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Processor/CatalogPromotionRemovalProcessor.php
index 5da2786ab0..ee324ed1cb 100644
--- a/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Processor/CatalogPromotionRemovalProcessor.php
+++ b/src/Sylius/Bundle/CoreBundle/CatalogPromotion/Processor/CatalogPromotionRemovalProcessor.php
@@ -13,44 +13,19 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\CatalogPromotion\Processor;
-use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionRemovalAnnouncer;
use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionRemovalAnnouncerInterface;
use Sylius\Component\Core\Model\CatalogPromotionInterface;
use Sylius\Component\Promotion\Exception\CatalogPromotionNotFoundException;
use Sylius\Component\Promotion\Exception\InvalidCatalogPromotionStateException;
use Sylius\Component\Promotion\Model\CatalogPromotionStates;
use Sylius\Component\Promotion\Repository\CatalogPromotionRepositoryInterface;
-use Symfony\Component\Messenger\MessageBusInterface;
final class CatalogPromotionRemovalProcessor implements CatalogPromotionRemovalProcessorInterface
{
public function __construct(
private CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- /** @var CatalogPromotionRemovalAnnouncerInterface $catalogPromotionRemovalAnnouncer */
- private CatalogPromotionRemovalAnnouncerInterface|MessageBusInterface $catalogPromotionRemovalAnnouncer,
- private ?MessageBusInterface $eventBus = null, /** @phpstan-ignore-line */
+ private CatalogPromotionRemovalAnnouncerInterface $catalogPromotionRemovalAnnouncer,
) {
- if ($catalogPromotionRemovalAnnouncer instanceof MessageBusInterface) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'Passing an instance of %s as second constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- MessageBusInterface::class,
- self::class,
- CatalogPromotionRemovalAnnouncerInterface::class,
- );
-
- $this->catalogPromotionRemovalAnnouncer = new CatalogPromotionRemovalAnnouncer($catalogPromotionRemovalAnnouncer);
- }
-
- if (null !== $eventBus) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'Passing third constructor argument for %s is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
}
public function removeCatalogPromotion(string $catalogPromotionCode): void
diff --git a/src/Sylius/Bundle/CoreBundle/Command/AbstractInstallCommand.php b/src/Sylius/Bundle/CoreBundle/Command/AbstractInstallCommand.php
index f53034d2f3..67ba870066 100644
--- a/src/Sylius/Bundle/CoreBundle/Command/AbstractInstallCommand.php
+++ b/src/Sylius/Bundle/CoreBundle/Command/AbstractInstallCommand.php
@@ -24,18 +24,6 @@ use Symfony\Component\Console\Output\OutputInterface;
abstract class AbstractInstallCommand extends ContainerAwareCommand
{
- /** @deprecated */
- public const WEB_ASSETS_DIRECTORY = 'web/assets/';
-
- /** @deprecated */
- public const WEB_BUNDLES_DIRECTORY = 'web/bundles/';
-
- /** @deprecated */
- public const WEB_MEDIA_DIRECTORY = 'web/media/';
-
- /** @deprecated */
- public const WEB_MEDIA_IMAGE_DIRECTORY = 'web/media/image/';
-
/** @var CommandExecutor|null */
protected $commandExecutor;
diff --git a/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php b/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php
index 3d35f5cd00..67235832f6 100644
--- a/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php
+++ b/src/Sylius/Bundle/CoreBundle/Controller/ProductTaxonController.php
@@ -20,7 +20,6 @@ use Sylius\Component\Core\Model\ProductTaxonInterface;
use Sylius\Component\Core\Positioner\PositionerInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Sylius\Component\Resource\ResourceActions;
-use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session;
@@ -28,39 +27,6 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
class ProductTaxonController extends ResourceController
{
- /**
- * @throws HttpException
- *
- * @deprecated This ajax action is deprecated and will be removed in Sylius 2.0 - use ProductTaxonController::updateProductTaxonsPositionsAction instead.
- */
- public function updatePositionsAction(Request $request): Response
- {
- $configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
- $this->isGrantedOr403($configuration, ResourceActions::UPDATE);
- $productTaxons = $this->getParameterFromRequest($request, 'productTaxons');
- $this->validateCsrfProtection($request, $configuration);
-
- if ($this->shouldProductsPositionsBeUpdated($request, $productTaxons)) {
- /** @var array{position: string|int, id: int} $productTaxon */
- foreach ($productTaxons as $productTaxon) {
- try {
- $id = $productTaxon['id'];
- $position = $productTaxon['position'];
-
- /** @var ProductTaxonInterface $productTaxonFromBase */
- $productTaxonFromBase = $this->repository->findOneBy(['id' => $id]);
- $productTaxonFromBase->setPosition((int) $position);
- } catch (\InvalidArgumentException $exception) {
- throw new HttpException(Response::HTTP_BAD_REQUEST, $exception->getMessage());
- }
-
- $this->manager->flush();
- }
- }
-
- return new JsonResponse();
- }
-
public function updateProductTaxonsPositionsAction(Request $request): Response
{
$configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
@@ -147,29 +113,6 @@ class ProductTaxonController extends ResourceController
;
}
- /**
- * @return mixed
- *
- * @deprecated This function will be removed in Sylius 2.0, since Symfony 5.4, use explicit input sources instead
- * based on Symfony\Component\HttpFoundation\Request::get
- */
- private function getParameterFromRequest(Request $request, string $key)
- {
- if ($request !== $result = $request->attributes->get($key, $request)) {
- return $result;
- }
-
- if ($request->query->has($key)) {
- return $request->query->all()[$key];
- }
-
- if ($request->request->has($key)) {
- return $request->request->all()[$key];
- }
-
- return null;
- }
-
private function getPositioner(): PositionerInterface
{
/** @var PositionerInterface $positioner */
diff --git a/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php b/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php
index e00cca73dc..12d8010ab0 100644
--- a/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php
+++ b/src/Sylius/Bundle/CoreBundle/Controller/ProductVariantController.php
@@ -30,13 +30,13 @@ class ProductVariantController extends ResourceController
{
$configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
$this->isGrantedOr403($configuration, ResourceActions::UPDATE);
- $productVariantsToUpdate = $this->getParameterFromRequest($request, 'productVariants');
+ $productVariantsToUpdate = $request->request->all('productVariants');
if ($configuration->isCsrfProtectionEnabled() && !$this->isCsrfTokenValid('update-product-variant-position', (string) $request->request->get('_csrf_token'))) {
throw new HttpException(Response::HTTP_FORBIDDEN, 'Invalid csrf token.');
}
- if (in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true) && null !== $productVariantsToUpdate) {
+ if (in_array($request->getMethod(), ['POST', 'PUT', 'PATCH'], true)) {
foreach ($productVariantsToUpdate as $productVariantToUpdate) {
if (!is_numeric($productVariantToUpdate['position'])) {
throw new HttpException(
@@ -54,27 +54,4 @@ class ProductVariantController extends ResourceController
return new JsonResponse();
}
-
- /**
- * @return mixed
- *
- * @deprecated This function will be removed in Sylius 2.0, since Symfony 5.4, use explicit input sources instead
- * based on Symfony\Component\HttpFoundation\Request::get
- */
- private function getParameterFromRequest(Request $request, string $key)
- {
- if ($request !== $result = $request->attributes->get($key, $request)) {
- return $result;
- }
-
- if ($request->query->has($key)) {
- return $request->query->all()[$key];
- }
-
- if ($request->request->has($key)) {
- return $request->request->all()[$key];
- }
-
- return null;
- }
}
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPass.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPass.php
deleted file mode 100644
index 3089ff789f..0000000000
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPass.php
+++ /dev/null
@@ -1,44 +0,0 @@
-hasParameter('sm.configs')) {
- return;
- }
-
- /** @var array $smConfigs */
- $smConfigs = $container->getParameter('sm.configs');
-
- if (isset($smConfigs['sylius_order']['callbacks']['after']['sylis_cancel_order'])) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.11',
- 'Callback "%s" was renamed to "%s". The old name will be removed in Sylius 2.0, use the new name to override it.',
- 'winzou_state_machine.sylius_order.callbacks.after.sylis_cancel_order',
- 'winzou_state_machine.sylius_order.callbacks.after.sylius_cancel_order',
- );
-
- $smConfigs['sylius_order']['callbacks']['after']['sylius_cancel_order'] = $smConfigs['sylius_order']['callbacks']['after']['sylis_cancel_order'];
- unset($smConfigs['sylius_order']['callbacks']['after']['sylis_cancel_order']);
- $container->setParameter('sm.configs', $smConfigs);
- }
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php
deleted file mode 100644
index 6d2e306765..0000000000
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPass.php
+++ /dev/null
@@ -1,95 +0,0 @@
- 'Sylius\Component\Core\Checker\ProductVariantLowestPriceDisplayCheckerInterface',
- 'Sylius\PriceHistoryPlugin\Application\CommandDispatcher' => 'Sylius\Bundle\CoreBundle\PriceHistory\CommandDispatcher',
- 'Sylius\PriceHistoryPlugin\Application\CommandHandler' => 'Sylius\Bundle\CoreBundle\PriceHistory\CommandHandler',
- 'Sylius\PriceHistoryPlugin\Application\Logger' => 'Sylius\Bundle\CoreBundle\PriceHistory\Logger',
- 'Sylius\PriceHistoryPlugin\Application\Processor' => 'Sylius\Bundle\CoreBundle\PriceHistory\Processor',
- 'Sylius\PriceHistoryPlugin\Application\Remover' => 'Sylius\Bundle\CoreBundle\PriceHistory\Remover',
- 'Sylius\PriceHistoryPlugin\Application\Templating\Helper\PriceHelper' => 'sylius.templating.helper.price',
- 'Sylius\PriceHistoryPlugin\Domain\Factory\ChannelFactory' => 'sylius.custom_factory.channel',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Cli\Command\ClearPriceHistoryCommand' => 'Sylius\Bundle\CoreBundle\PriceHistory\Cli\Command\ClearPriceHistoryCommand',
- 'Sylius\PriceHistoryPlugin\Infrastructure\EntityObserver' => 'Sylius\Bundle\CoreBundle\PriceHistory\EntityObserver',
- 'Sylius\PriceHistoryPlugin\Infrastructure\EventSubscriber' => 'Sylius\Bundle\CoreBundle\PriceHistory\EventSubscriber',
- 'Sylius\PriceHistoryPlugin\Infrastructure\EventListener' => 'Sylius\Bundle\CoreBundle\PriceHistory\EventListener',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Form\Extension\ChannelTypeExtension' => 'sylius.form.extension.type.channel',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Form\Type\ChannelPriceHistoryConfigType' => 'sylius.form.type.channel_price_history_config',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Provider\ProductVariantsPricesProvider' => 'sylius.provider.product_variants_prices',
- 'Sylius\PriceHistoryPlugin\Infrastructure\Twig\PriceExtension' => 'sylius.twig.extension.price',
- 'sylius_price_history.controller.channel_price_history_config' => 'sylius.controller.channel_price_history_config',
- 'sylius_price_history.controller.channel_pricing_log_entry' => 'sylius.controller.channel_pricing_log_entry',
- 'sylius_price_history.factory.channel_price_history_config' => 'sylius.factory.channel_price_history_config',
- 'sylius_price_history.factory.channel_pricing_log_entry' => 'sylius.factory.channel_pricing_log_entry',
- 'sylius_price_history.form.type.channel_price_history_config' => 'sylius.form.type.channel_price_history_config',
- 'sylius_price_history.form.type.channel_pricing_log_entry' => 'sylius.form.type.channel_pricing_log_entry',
- 'sylius_price_history.manager.channel_price_history_config' => 'sylius.manager.channel_price_history_config',
- 'sylius_price_history.manager.channel_pricing_log_entry' => 'sylius.manager.channel_pricing_log_entry',
- 'sylius_price_history.repository.channel_price_history_config' => 'sylius.repository.channel_price_history_config',
- 'sylius_price_history.repository.channel_pricing_log_entry' => 'sylius.repository.channel_pricing_log_entry',
- ];
-
- public function process(ContainerBuilder $container): void
- {
- foreach ($container->getDefinitions() as $serviceName => $definition) {
- if ($this->shouldHaveLegacyAlias($container, $serviceName)) {
- $this->addLegacyAlias($container, $serviceName);
- }
- }
- }
-
- private function shouldHaveLegacyAlias(ContainerBuilder $container, string $serviceName): bool
- {
- foreach (self::PLUGIN_TO_SYLIUS_PREFIXES_MAP as $legacyPrefix => $syliusPrefix) {
- $legacyServiceName = $this->getLegacyServiceName($serviceName);
-
- if (str_starts_with($serviceName, $syliusPrefix) && !$container->has($legacyServiceName)) {
- return true;
- }
- }
-
- return false;
- }
-
- private function addLegacyAlias(ContainerBuilder $container, string $serviceName): void
- {
- $legacyServiceName = $this->getLegacyServiceName($serviceName);
-
- $container
- ->setAlias($legacyServiceName, $serviceName)
- ->setPublic(true)
- ->setDeprecated(
- 'sylius/sylius',
- '1.13',
- sprintf('Alias %%alias_id%% is deprecated. Consider using the %s service.', $serviceName),
- )
- ;
- }
-
- private function getLegacyServiceName(string $name): string
- {
- return str_replace(
- array_values(self::PLUGIN_TO_SYLIUS_PREFIXES_MAP),
- array_keys(self::PLUGIN_TO_SYLIUS_PREFIXES_MAP),
- $name,
- );
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
index 7fe6d7db1c..55621a6c4b 100644
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
@@ -58,10 +58,6 @@ final class Configuration implements ConfigurationInterface
->booleanNode('prepend_doctrine_migrations')->defaultTrue()->end()
->booleanNode('shipping_address_based_taxation')->defaultFalse()->end()
->booleanNode('order_by_identifier')->defaultTrue()->end()
- ->booleanNode('process_shipments_before_recalculating_prices')
- ->setDeprecated('sylius/sylius', '1.10', 'The "%path%.%node%" parameter is deprecated and will be removed in 2.0.')
- ->defaultFalse()
- ->end()
->arrayNode('catalog_promotions')
->addDefaultsIfNotSet()
->children()
@@ -92,8 +88,8 @@ final class Configuration implements ConfigurationInterface
->scalarNode('adapter')
->defaultValue('default')
->validate()
- ->ifNotInArray(['default', 'flysystem', 'gaufrette'])
- ->thenInvalid('Expected adapter "default", "flysystem" or "gaufrette", but %s passed.')
+ ->ifNotInArray(['default', 'flysystem'])
+ ->thenInvalid('Expected adapter "default" or "flysystem", but %s passed.')
->end()
->end()
->end()
diff --git a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
index 3f01740907..b78a8acaaf 100644
--- a/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
+++ b/src/Sylius/Bundle/CoreBundle/DependencyInjection/SyliusCoreExtension.php
@@ -28,7 +28,6 @@ use Sylius\Component\Core\Filesystem\Adapter\FlysystemFilesystemAdapter;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ChildDefinition;
use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -81,18 +80,10 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
$loader->load('test_services.xml');
}
- if ($config['process_shipments_before_recalculating_prices']) {
- $this->switchOrderProcessorsPriorities(
- $container->getDefinition('sylius.order_processing.order_shipment_processor'),
- $container->getDefinition('sylius.order_processing.order_prices_recalculator'),
- );
- }
-
$container->setAlias(
FilesystemAdapterInterface::class,
match ($config['filesystem']['adapter']) {
'default', 'flysystem' => FlysystemFilesystemAdapter::class,
- 'gaufrette' => 'Sylius\Component\Core\Filesystem\Adapter\GaufretteFilesystemAdapter',
default => throw new InvalidArgumentException(sprintf(
'Invalid filesystem adapter "%s" provided.',
$config['filesystem']['adapter'],
@@ -192,26 +183,6 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
]);
}
- private function switchOrderProcessorsPriorities(
- Definition $firstServiceDefinition,
- Definition $secondServiceDefinition,
- ) {
- $firstServicePriority = $firstServiceDefinition->getTag('sylius.order_processor')[0]['priority'];
- $secondServicePriority = $secondServiceDefinition->getTag('sylius.order_processor')[0]['priority'];
-
- $firstServiceDefinition->clearTag('sylius.order_processor');
- $secondServiceDefinition->clearTag('sylius.order_processor');
-
- $firstServiceDefinition->addTag(
- 'sylius.order_processor',
- ['priority' => $secondServicePriority],
- );
- $secondServiceDefinition->addTag(
- 'sylius.order_processor',
- ['priority' => $firstServicePriority],
- );
- }
-
private function registerAutoconfiguration(ContainerBuilder $container): void
{
$container->registerAttributeForAutoconfiguration(
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AddressRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AddressRepository.php
index bcca8d8b37..590ec222cb 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AddressRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AddressRepository.php
@@ -13,17 +13,12 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Bundle\AddressingBundle\Doctrine\ORM\AddressRepository as BaseAddressRepository;
use Sylius\Component\Core\Model\AddressInterface;
use Sylius\Component\Core\Model\CustomerInterface;
use Sylius\Component\Core\Repository\AddressRepositoryInterface;
-/**
- * @template T of AddressInterface
- *
- * @implements AddressRepositoryInterface
- */
-class AddressRepository extends EntityRepository implements AddressRepositoryInterface
+class AddressRepository extends BaseAddressRepository implements AddressRepositoryInterface
{
public function findByCustomer(CustomerInterface $customer): array
{
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AttributeRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AttributeRepository.php
index 2c609a9d04..83b4ecde9d 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AttributeRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/AttributeRepository.php
@@ -13,20 +13,20 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Bundle\AttributeBundle\Doctrine\ORM\AttributeRepository as BaseAttributeRepository;
use Sylius\Component\Attribute\Model\AttributeInterface;
use SyliusLabs\AssociationHydrator\AssociationHydrator;
/**
* @template T of AttributeInterface
*/
-class AttributeRepository extends EntityRepository
+class AttributeRepository extends BaseAttributeRepository
{
protected AssociationHydrator $associationHydrator;
- public function __construct(EntityManager $entityManager, ClassMetadata $class)
+ public function __construct(EntityManagerInterface $entityManager, ClassMetadata $class)
{
parent::__construct($entityManager, $class);
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php
index fce4713261..4c30187b0f 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/OrderRepository.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\QueryBuilder;
use Sylius\Bundle\OrderBundle\Doctrine\ORM\OrderRepository as BaseOrderRepository;
@@ -39,7 +39,7 @@ class OrderRepository extends BaseOrderRepository implements OrderRepositoryInte
{
protected AssociationHydrator $associationHydrator;
- public function __construct(EntityManager $entityManager, ClassMetadata $class)
+ public function __construct(EntityManagerInterface $entityManager, ClassMetadata $class)
{
parent::__construct($entityManager, $class);
@@ -56,21 +56,6 @@ class OrderRepository extends BaseOrderRepository implements OrderRepositoryInte
;
}
- public function createSearchListQueryBuilder(): QueryBuilder
- {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'This method is deprecated and it will be removed in Sylius 2.0. Please use `createCriteriaAwareSearchListQueryBuilder` instead.',
- );
-
- return $this->createListQueryBuilder()
- ->leftJoin('o.items', 'item')
- ->leftJoin('item.variant', 'variant')
- ->leftJoin('variant.product', 'product')
- ;
- }
-
public function createCriteriaAwareSearchListQueryBuilder(?array $criteria): QueryBuilder
{
if ($criteria === null) {
@@ -98,20 +83,6 @@ class OrderRepository extends BaseOrderRepository implements OrderRepositoryInte
return $queryBuilder;
}
- public function createByCustomerIdQueryBuilder($customerId): QueryBuilder
- {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'This method is deprecated and it will be removed in Sylius 2.0. Please use `createByCustomerIdCriteriaAwareQueryBuilder` instead.',
- );
-
- return $this->createListQueryBuilder()
- ->andWhere('o.customer = :customerId')
- ->setParameter('customerId', $customerId)
- ;
- }
-
public function createByCustomerIdCriteriaAwareQueryBuilder(?array $criteria, string $customerId): QueryBuilder
{
$queryBuilder = $this->createCriteriaAwareSearchListQueryBuilder($criteria);
@@ -148,7 +119,7 @@ class OrderRepository extends BaseOrderRepository implements OrderRepositoryInte
public function findByCustomer(CustomerInterface $customer): array
{
- return $this->createByCustomerIdQueryBuilder($customer->getId())
+ return $this->createByCustomerIdCriteriaAwareQueryBuilder(null, (string) $customer->getId())
->getQuery()
->getResult()
;
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductAssociationRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductAssociationRepository.php
index 81524d6919..220d0a6665 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductAssociationRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductAssociationRepository.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationRepository as BaseProductAssociationRepository;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Repository\ProductAssociationRepositoryInterface;
use Sylius\Component\Product\Model\ProductAssociationInterface;
@@ -21,9 +21,10 @@ use Sylius\Component\Product\Model\ProductAssociationInterface;
/**
* @template T of ProductAssociationInterface
*
+ * @extends BaseProductAssociationRepository
* @implements ProductAssociationRepositoryInterface
*/
-class ProductAssociationRepository extends EntityRepository implements ProductAssociationRepositoryInterface
+class ProductAssociationRepository extends BaseProductAssociationRepository implements ProductAssociationRepositoryInterface
{
public function findWithProductsWithinChannel($associationId, ChannelInterface $channel): ProductAssociationInterface
{
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductOptionRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductOptionRepository.php
index 3a935386b6..a6688f6f04 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductOptionRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductOptionRepository.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionRepository as BaseProductOptionRepository;
use Sylius\Component\Product\Model\ProductOptionInterface;
@@ -28,7 +28,7 @@ class ProductOptionRepository extends BaseProductOptionRepository
{
protected AssociationHydrator $associationHydrator;
- public function __construct(EntityManager $entityManager, ClassMetadata $class)
+ public function __construct(EntityManagerInterface $entityManager, ClassMetadata $class)
{
parent::__construct($entityManager, $class);
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php
index 5403cc7981..ecd3b30392 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/ProductRepository.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\QueryBuilder;
use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductRepository as BaseProductRepository;
@@ -34,7 +34,7 @@ class ProductRepository extends BaseProductRepository implements ProductReposito
{
protected AssociationHydrator $associationHydrator;
- public function __construct(EntityManager $entityManager, ClassMetadata $class)
+ public function __construct(EntityManagerInterface $entityManager, ClassMetadata $class)
{
parent::__construct($entityManager, $class);
diff --git a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/PromotionRepository.php b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/PromotionRepository.php
index c3ada88bc2..d873afa1d1 100644
--- a/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/PromotionRepository.php
+++ b/src/Sylius/Bundle/CoreBundle/Doctrine/ORM/PromotionRepository.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Doctrine\ORM;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Mapping\ClassMetadata;
use Sylius\Bundle\PromotionBundle\Doctrine\ORM\PromotionRepository as BasePromotionRepository;
use Sylius\Component\Channel\Model\ChannelInterface;
@@ -32,7 +32,7 @@ class PromotionRepository extends BasePromotionRepository implements PromotionRe
{
private AssociationHydrator $associationHydrator;
- public function __construct(EntityManager $entityManager, ClassMetadata $class)
+ public function __construct(EntityManagerInterface $entityManager, ClassMetadata $class)
{
parent::__construct($entityManager, $class);
diff --git a/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php b/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php
index 23f10c9994..d7c3075970 100644
--- a/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php
+++ b/src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php
@@ -21,8 +21,6 @@ use Sylius\Component\Core\Promotion\Checker\TaxonInPromotionRuleCheckerInterface
use Sylius\Component\Core\Promotion\Updater\Rule\TaxonAwareRuleUpdaterInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Webmozart\Assert\Assert;
final class TaxonDeletionListener
@@ -31,23 +29,12 @@ final class TaxonDeletionListener
private array $ruleUpdaters;
public function __construct(
- private SessionInterface|RequestStack $requestStackOrSession,
+ private RequestStack $requestStack,
private ChannelRepositoryInterface $channelRepository,
private TaxonInPromotionRuleCheckerInterface $taxonInPromotionRuleChecker,
TaxonAwareRuleUpdaterInterface ...$ruleUpdaters,
) {
$this->ruleUpdaters = $ruleUpdaters;
-
- if ($requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/user-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function protectFromRemovingMenuTaxon(GenericEvent $event): void
@@ -57,8 +44,7 @@ final class TaxonDeletionListener
$channel = $this->channelRepository->findOneBy(['menuTaxon' => $taxon]);
if ($channel !== null) {
- /** @var FlashBagInterface $flashes */
- $flashes = FlashBagProvider::getFlashBag($this->requestStackOrSession);
+ $flashes = FlashBagProvider::getFlashBag($this->requestStack);
$flashes->add('error', 'sylius.taxon.menu_taxon_delete');
$event->stopPropagation();
@@ -88,7 +74,7 @@ final class TaxonDeletionListener
}
if (!empty($updatedPromotionCodes)) {
- $flashes = FlashBagProvider::getFlashBag($this->requestStackOrSession);
+ $flashes = FlashBagProvider::getFlashBag($this->requestStack);
$flashes->add('info', [
'message' => 'sylius.promotion.update_rules',
'parameters' => ['%codes%' => implode(', ', array_unique($updatedPromotionCodes))],
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/BookProductFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/BookProductFixture.php
deleted file mode 100644
index 0e57dbc5f4..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Fixture/BookProductFixture.php
+++ /dev/null
@@ -1,153 +0,0 @@
-faker = Factory::create();
- $this->optionsResolver =
- (new OptionsResolver())
- ->setRequired('amount')
- ->setAllowedTypes('amount', 'int')
- ;
- }
-
- public function getName(): string
- {
- return 'book_product';
- }
-
- public function load(array $options): void
- {
- $options = $this->optionsResolver->resolve($options);
-
- $this->taxonFixture->load(['custom' => [[
- 'code' => 'category',
- 'name' => 'Category',
- 'children' => [
- [
- 'code' => 'books',
- 'translations' => [
- 'en_US' => [
- 'name' => 'Books',
- ],
- 'fr_FR' => [
- 'name' => 'Livres',
- ],
- ],
- ],
- ],
- ]]]);
-
- $bookGenres = [
- $this->faker->uuid => [$this->baseLocaleCode => 'Science Fiction'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Romance'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Thriller'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Sports'],
- ];
- $this->productAttributeFixture->load(['custom' => [
- ['name' => 'Book author', 'code' => 'book_author', 'type' => TextAttributeType::TYPE],
- ['name' => 'Book ISBN', 'code' => 'book_isbn', 'type' => TextAttributeType::TYPE],
- ['name' => 'Book pages', 'code' => 'book_pages', 'type' => IntegerAttributeType::TYPE],
- [
- 'name' => 'Book genre',
- 'code' => 'book_genre',
- 'type' => SelectAttributeType::TYPE,
- 'configuration' => [
- 'multiple' => true,
- 'choices' => $bookGenres,
- ],
- ],
- ]]);
-
- $products = [];
- $productsNames = $this->getUniqueNames($options['amount']);
- for ($i = 0; $i < $options['amount']; ++$i) {
- $authorName = $this->faker->name;
-
- $products[] = [
- 'name' => sprintf('Book "%s" by %s', $productsNames[$i], $authorName),
- 'code' => $this->faker->uuid,
- 'main_taxon' => 'books',
- 'taxons' => ['books'],
- 'product_attributes' => [
- 'book_author' => $authorName,
- 'book_isbn' => $this->faker->isbn13(),
- 'book_pages' => $this->faker->numberBetween(42, 1024),
- 'book_genre' => $this->faker->randomElements(array_keys($bookGenres), $this->faker->numberBetween(1, count($bookGenres))),
- ],
- 'images' => [
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'books.jpg'),
- 'type' => 'main',
- ],
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'books.jpg'),
- 'type' => 'thumbnail',
- ],
- ],
- ];
- }
-
- $this->productFixture->load(['custom' => $products]);
- }
-
- protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
- {
- $optionsNode
- ->children()
- ->integerNode('amount')->isRequired()->min(0)->end()
- ;
- }
-
- private function getUniqueNames(int $amount): array
- {
- $productsNames = [];
-
- for ($i = 0; $i < $amount; ++$i) {
- $name = $this->faker->word;
- while (in_array($name, $productsNames)) {
- $name = $this->faker->word;
- }
- $productsNames[] = $name;
- }
-
- return $productsNames;
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AdminUserExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AdminUserExampleFactory.php
index 68cafa89f0..98a4671999 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AdminUserExampleFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/AdminUserExampleFactory.php
@@ -16,7 +16,6 @@ namespace Sylius\Bundle\CoreBundle\Fixture\Factory;
use Faker\Factory;
use Faker\Generator;
use Sylius\Component\Core\Model\AdminUserInterface;
-use Sylius\Component\Core\Model\AvatarImage;
use Sylius\Component\Core\Uploader\ImageUploaderInterface;
use Sylius\Component\Resource\Factory\FactoryInterface;
use Symfony\Component\Config\FileLocatorInterface;
@@ -33,32 +32,14 @@ class AdminUserExampleFactory extends AbstractExampleFactory implements ExampleF
public function __construct(
private FactoryInterface $userFactory,
private string $localeCode,
- private ?FileLocatorInterface $fileLocator = null,
- private ?ImageUploaderInterface $imageUploader = null,
- private ?FactoryInterface $avatarImageFactory = null,
+ private FileLocatorInterface $fileLocator,
+ private ImageUploaderInterface $imageUploader,
+ private FactoryInterface $avatarImageFactory,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
$this->configureOptions($this->optionsResolver);
-
- if ($this->fileLocator === null || $this->imageUploader === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.6',
- 'Not passing a $fileLocator or/and an $imageUploader to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
-
- if ($this->avatarImageFactory === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.10',
- 'Not passing an $avatarImageFactory to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
}
public function create(array $options = []): AdminUserInterface
@@ -111,20 +92,10 @@ class AdminUserExampleFactory extends AbstractExampleFactory implements ExampleF
private function createAvatar(AdminUserInterface $adminUser, array $options): void
{
- if ($this->fileLocator === null || $this->imageUploader === null) {
- throw new \RuntimeException('You must configure a $fileLocator or/and $imageUploader');
- }
-
$imagePath = $this->fileLocator->locate($options['avatar']);
$uploadedImage = new UploadedFile($imagePath, basename($imagePath));
- if ($this->avatarImageFactory === null) {
- $avatarImage = new AvatarImage();
- } else {
- /** @var AvatarImage $avatarImage */
- $avatarImage = $this->avatarImageFactory->createNew();
- }
-
+ $avatarImage = $this->avatarImageFactory->createNew();
$avatarImage->setFile($uploadedImage);
$this->imageUploader->upload($avatarImage);
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php
index 0498782a97..d4a8cf3842 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ChannelExampleFactory.php
@@ -22,7 +22,6 @@ use Sylius\Component\Channel\Factory\ChannelFactoryInterface;
use Sylius\Component\Core\Formatter\StringInflector;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\Scope;
-use Sylius\Component\Core\Model\ShopBillingData;
use Sylius\Component\Core\Model\TaxonInterface;
use Sylius\Component\Currency\Model\CurrencyInterface;
use Sylius\Component\Locale\Model\LocaleInterface;
@@ -38,36 +37,14 @@ class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFac
private OptionsResolver $optionsResolver;
- private ?TaxonRepositoryInterface $taxonRepository;
-
- private ?FactoryInterface $shopBillingDataFactory;
-
public function __construct(
private ChannelFactoryInterface $channelFactory,
private RepositoryInterface $localeRepository,
private RepositoryInterface $currencyRepository,
private RepositoryInterface $zoneRepository,
- ?TaxonRepositoryInterface $taxonRepository = null,
- ?FactoryInterface $shopBillingDataFactory = null,
+ private TaxonRepositoryInterface $taxonRepository,
+ private FactoryInterface $shopBillingDataFactory,
) {
- if (null === $taxonRepository) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.8',
- 'Passing a $taxonRepository as the fifth argument is deprecated and will be prohibited in Sylius 2.0',
- );
- }
-
- if (null === $shopBillingDataFactory) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.8',
- 'Passing a $shopBillingDataFactory as the sixth argument is deprecated and will be prohibited in Sylius 2.0',
- );
- }
- $this->taxonRepository = $taxonRepository;
- $this->shopBillingDataFactory = $shopBillingDataFactory;
-
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
@@ -93,10 +70,7 @@ class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFac
$channel->setSkippingPaymentStepAllowed($options['skipping_payment_step_allowed']);
$channel->setAccountVerificationRequired($options['account_verification_required']);
$channel->setShippingAddressInCheckoutRequired($options['shipping_address_in_checkout_required']);
-
- if (null !== $this->taxonRepository) {
- $channel->setMenuTaxon($options['menu_taxon']);
- }
+ $channel->setMenuTaxon($options['menu_taxon']);
$channel->setDefaultLocale($options['default_locale']);
foreach ($options['locales'] as $locale) {
@@ -109,7 +83,7 @@ class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFac
}
if (isset($options['shop_billing_data']) && null !== $options['shop_billing_data']) {
- $shopBillingData = $this->shopBillingDataFactory ? $this->shopBillingDataFactory->createNew() : new ShopBillingData();
+ $shopBillingData = $this->shopBillingDataFactory->createNew();
$shopBillingData->setCompany($options['shop_billing_data']['company'] ?? null);
$shopBillingData->setTaxId($options['shop_billing_data']['tax_id'] ?? null);
$shopBillingData->setCountryCode($options['shop_billing_data']['country_code'] ?? null);
@@ -174,12 +148,10 @@ class ChannelExampleFactory extends AbstractExampleFactory implements ExampleFac
->setDefault('shop_billing_data', null)
;
- if (null !== $this->taxonRepository) {
- $resolver
- ->setDefault('menu_taxon', LazyOption::randomOneOrNull($this->taxonRepository))
- ->setAllowedTypes('menu_taxon', ['null', 'string', TaxonInterface::class])
- ->setNormalizer('menu_taxon', LazyOption::findOneBy($this->taxonRepository, 'code'))
- ;
- }
+ $resolver
+ ->setDefault('menu_taxon', LazyOption::randomOneOrNull($this->taxonRepository))
+ ->setAllowedTypes('menu_taxon', ['null', 'string', TaxonInterface::class])
+ ->setNormalizer('menu_taxon', LazyOption::findOneBy($this->taxonRepository, 'code'))
+ ;
}
}
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php
index 3f9cd862b0..2e16934cd7 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ProductExampleFactory.php
@@ -62,27 +62,9 @@ class ProductExampleFactory extends AbstractExampleFactory implements ExampleFac
private RepositoryInterface $productOptionRepository,
private RepositoryInterface $channelRepository,
private RepositoryInterface $localeRepository,
- private ?RepositoryInterface $taxCategoryRepository = null,
- private ?FileLocatorInterface $fileLocator = null,
+ private RepositoryInterface $taxCategoryRepository,
+ private FileLocatorInterface $fileLocator,
) {
- if ($this->taxCategoryRepository === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.6',
- 'Not passing a $taxCategoryRepository to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
-
- if ($this->fileLocator === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'Not passing a $fileLocator to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
-
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
@@ -172,9 +154,7 @@ class ProductExampleFactory extends AbstractExampleFactory implements ExampleFac
->setAllowedTypes('tax_category', ['string', 'null', TaxCategoryInterface::class])
;
- if ($this->taxCategoryRepository !== null) {
- $resolver->setNormalizer('tax_category', LazyOption::findOneBy($this->taxCategoryRepository, 'code'));
- }
+ $resolver->setNormalizer('tax_category', LazyOption::findOneBy($this->taxCategoryRepository, 'code'));
}
private function createTranslations(ProductInterface $product, array $options): void
@@ -250,21 +230,10 @@ class ProductExampleFactory extends AbstractExampleFactory implements ExampleFac
private function createImages(ProductInterface $product, array $options): void
{
foreach ($options['images'] as $image) {
- if (!array_key_exists('path', $image)) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.3',
- 'It is deprecated to pass indexed array as an image definition. Please use associative array with "path" and "type" keys instead.',
- );
+ $imagePath = $image['path'];
+ $imageType = $image['type'] ?? null;
- $imagePath = array_shift($image);
- $imageType = array_pop($image);
- } else {
- $imagePath = $image['path'];
- $imageType = $image['type'] ?? null;
- }
-
- $imagePath = $this->fileLocator === null ? $imagePath : $this->fileLocator->locate($imagePath);
+ $imagePath = $this->fileLocator->locate($imagePath);
$uploadedImage = new UploadedFile($imagePath, basename($imagePath));
/** @var ImageInterface $productImage */
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionExampleFactory.php
index 90c17fab73..5e76c738a5 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionExampleFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/PromotionExampleFactory.php
@@ -35,39 +35,19 @@ class PromotionExampleFactory extends AbstractExampleFactory implements ExampleF
private OptionsResolver $optionsResolver;
- /**
- * @param RepositoryInterface|null $localeRepository
- */
+ /** @param RepositoryInterface $localeRepository */
public function __construct(
private FactoryInterface $promotionFactory,
private ExampleFactoryInterface $promotionRuleExampleFactory,
private ExampleFactoryInterface $promotionActionExampleFactory,
private ChannelRepositoryInterface $channelRepository,
- private ?FactoryInterface $couponFactory = null,
- private ?RepositoryInterface $localeRepository = null,
+ private FactoryInterface $couponFactory,
+ private RepositoryInterface $localeRepository,
) {
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
$this->configureOptions($this->optionsResolver);
-
- if ($this->couponFactory === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.8',
- 'Not passing a $couponFactory to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
-
- if ($this->localeRepository === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'Not passing a $localeRepository to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
public function create(array $options = []): PromotionInterface
@@ -165,13 +145,9 @@ class PromotionExampleFactory extends AbstractExampleFactory implements ExampleF
;
}
- private static function getCouponNormalizer(?FactoryInterface $couponFactory): \Closure
+ private static function getCouponNormalizer(FactoryInterface $couponFactory): \Closure
{
return function (Options $options, array $couponDefinitions) use ($couponFactory): array {
- if (null === $couponFactory) {
- throw new \RuntimeException('You must configure a $couponFactory');
- }
-
if (!$options['coupon_based'] && count($couponDefinitions) > 0) {
throw new InvalidArgumentException('Cannot define coupons for promotion that is not coupon based');
}
@@ -199,10 +175,6 @@ class PromotionExampleFactory extends AbstractExampleFactory implements ExampleF
/** @return iterable */
private function getLocales(): iterable
{
- if (null === $this->localeRepository) {
- return [];
- }
-
/** @var LocaleInterface[] $locales */
$locales = $this->localeRepository->findAll();
foreach ($locales as $locale) {
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ShippingMethodExampleFactory.php b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ShippingMethodExampleFactory.php
index d72739c202..ae151788f3 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ShippingMethodExampleFactory.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/Factory/ShippingMethodExampleFactory.php
@@ -42,17 +42,8 @@ class ShippingMethodExampleFactory extends AbstractExampleFactory implements Exa
private RepositoryInterface $shippingCategoryRepository,
private RepositoryInterface $localeRepository,
private ChannelRepositoryInterface $channelRepository,
- private ?RepositoryInterface $taxCategoryRepository = null,
+ private RepositoryInterface $taxCategoryRepository,
) {
- if ($this->taxCategoryRepository === null) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.4',
- 'Not passing a $taxCategoryRepository to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
-
$this->faker = Factory::create();
$this->optionsResolver = new OptionsResolver();
@@ -135,9 +126,7 @@ class ShippingMethodExampleFactory extends AbstractExampleFactory implements Exa
->setAllowedTypes('archived_at', ['null', \DateTimeInterface::class])
;
- if ($this->taxCategoryRepository !== null) {
- $resolver->setNormalizer('tax_category', LazyOption::findOneBy($this->taxCategoryRepository, 'code'));
- }
+ $resolver->setNormalizer('tax_category', LazyOption::findOneBy($this->taxCategoryRepository, 'code'));
}
private function getLocales(): iterable
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/MugProductFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/MugProductFixture.php
deleted file mode 100644
index 08f0129969..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Fixture/MugProductFixture.php
+++ /dev/null
@@ -1,161 +0,0 @@
-faker = Factory::create();
- $this->optionsResolver =
- (new OptionsResolver())
- ->setRequired('amount')
- ->setAllowedTypes('amount', 'int')
- ;
- }
-
- public function getName(): string
- {
- return 'mug_product';
- }
-
- public function load(array $options): void
- {
- $options = $this->optionsResolver->resolve($options);
-
- $this->taxonFixture->load(['custom' => [[
- 'code' => 'category',
- 'name' => 'Category',
- 'children' => [
- [
- 'code' => 'mugs',
- 'translations' => [
- 'en_US' => [
- 'name' => 'Mugs',
- ],
- 'fr_FR' => [
- 'name' => 'Tasses',
- ],
- ],
- ],
- ],
- ]]]);
-
- $mugMaterials = [
- $this->faker->uuid => [$this->baseLocaleCode => 'Invisible porcelain'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Banana skin'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Porcelain'],
- $this->faker->uuid => [$this->baseLocaleCode => 'Centipede'],
- ];
- $this->productAttributeFixture->load(['custom' => [
- [
- 'name' => 'Mug material',
- 'code' => 'mug_material',
- 'type' => SelectAttributeType::TYPE,
- 'configuration' => [
- 'multiple' => false,
- 'choices' => $mugMaterials,
- ],
- ],
- ]]);
-
- $this->productOptionFixture->load(['custom' => [
- [
- 'name' => 'Mug type',
- 'code' => 'mug_type',
- 'values' => [
- 'mug_type_medium' => 'Medium mug',
- 'mug_type_double' => 'Double mug',
- 'mug_type_monster' => 'Monster mug',
- ],
- ],
- ]]);
-
- $products = [];
- $productsNames = $this->getUniqueNames($options['amount']);
- for ($i = 0; $i < $options['amount']; ++$i) {
- $products[] = [
- 'name' => sprintf('Mug "%s"', $productsNames[$i]),
- 'code' => $this->faker->uuid,
- 'main_taxon' => 'mugs',
- 'taxons' => ['mugs'],
- 'product_attributes' => [
- 'mug_material' => [$this->faker->randomKey($mugMaterials)],
- ],
- 'product_options' => ['mug_type'],
- 'images' => [
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'mugs.jpg'),
- 'type' => 'main',
- ],
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'mugs.jpg'),
- 'type' => 'thumbnail',
- ],
- ],
- ];
- }
-
- $this->productFixture->load(['custom' => $products]);
- }
-
- protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
- {
- $optionsNode
- ->children()
- ->integerNode('amount')->isRequired()->min(0)->end()
- ;
- }
-
- private function getUniqueNames(int $amount): array
- {
- $productsNames = [];
-
- for ($i = 0; $i < $amount; ++$i) {
- $name = $this->faker->word;
- while (in_array($name, $productsNames)) {
- $name = $this->faker->word;
- }
- $productsNames[] = $name;
- }
-
- return $productsNames;
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php
index e3db77c6fe..c2a05c4896 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php
@@ -16,80 +16,24 @@ namespace Sylius\Bundle\CoreBundle\Fixture;
use Doctrine\Persistence\ObjectManager;
use Faker\Factory;
use Faker\Generator;
-use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
use Sylius\Bundle\CoreBundle\Fixture\Factory\OrderExampleFactory;
use Sylius\Bundle\FixturesBundle\Fixture\AbstractFixture;
-use Sylius\Component\Core\Checker\OrderPaymentMethodSelectionRequirementCheckerInterface;
-use Sylius\Component\Core\Checker\OrderShippingMethodSelectionRequirementCheckerInterface;
-use Sylius\Component\Core\Repository\PaymentMethodRepositoryInterface;
-use Sylius\Component\Core\Repository\ProductRepositoryInterface;
-use Sylius\Component\Core\Repository\ShippingMethodRepositoryInterface;
-use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
-use Sylius\Component\Resource\Factory\FactoryInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
-use Webmozart\Assert\Assert;
class OrderFixture extends AbstractFixture
{
- /** @var OrderExampleFactory */
- protected $orderExampleFactory;
-
- /** @var ObjectManager */
- protected $orderManager;
-
private Generator $faker;
public function __construct(
- FactoryInterface $orderFactory,
- FactoryInterface $orderItemFactory,
- OrderItemQuantityModifierInterface $orderItemQuantityModifier,
- ObjectManager $orderManager,
- RepositoryInterface $channelRepository,
- RepositoryInterface $customerRepository,
- RepositoryInterface $productRepository,
- RepositoryInterface $countryRepository,
- PaymentMethodRepositoryInterface $paymentMethodRepository,
- ShippingMethodRepositoryInterface $shippingMethodRepository,
- FactoryInterface $addressFactory,
- StateMachineFactoryInterface $stateMachineFactory,
- OrderShippingMethodSelectionRequirementCheckerInterface $orderShippingMethodSelectionRequirementChecker,
- OrderPaymentMethodSelectionRequirementCheckerInterface $orderPaymentMethodSelectionRequirementChecker,
- OrderExampleFactory $orderExampleFactory = null,
+ protected ObjectManager $orderManager,
+ protected OrderExampleFactory $orderExampleFactory,
) {
- if ($orderExampleFactory === null) {
- Assert::isInstanceOf($productRepository, ProductRepositoryInterface::class);
-
- $orderExampleFactory = new OrderExampleFactory(
- $orderFactory,
- $orderItemFactory,
- $orderItemQuantityModifier,
- $orderManager,
- $channelRepository,
- $customerRepository,
- $productRepository,
- $countryRepository,
- $paymentMethodRepository,
- $shippingMethodRepository,
- $addressFactory,
- $stateMachineFactory,
- $orderShippingMethodSelectionRequirementChecker,
- $orderPaymentMethodSelectionRequirementChecker,
- );
-
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.6',
- 'Use OrderExampleFactory. OrderFixture is deprecated and will be prohibited since Sylius 2.0.',
- );
- }
-
- $this->orderManager = $orderManager;
- $this->orderExampleFactory = $orderExampleFactory;
-
$this->faker = Factory::create();
}
+ /**
+ * @param array $options
+ */
public function load(array $options): void
{
$generateDates = $this->generateDates($options['amount']);
@@ -127,7 +71,10 @@ class OrderFixture extends AbstractFixture
;
}
- private function generateDates(int $amount): array
+ /**
+ * @return \DateTimeInterface[]
+ */
+ protected function generateDates(int $amount): array
{
/** @var \DateTimeInterface[] $dates */
$dates = [];
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/PaymentFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/PaymentFixture.php
index cdc3da413a..fc8db1c80b 100644
--- a/src/Sylius/Bundle/CoreBundle/Fixture/PaymentFixture.php
+++ b/src/Sylius/Bundle/CoreBundle/Fixture/PaymentFixture.php
@@ -24,16 +24,6 @@ use Sylius\Component\Payment\PaymentTransitions;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\OptionsResolver\OptionsResolver;
-class_alias(PaymentFixture::class, '\Sylius\Bundle\CoreBundle\Fixture\Factory\PaymentFixture');
-
-trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'The "%s" class is deprecated and will be removed in Sylius 2.0. Use "%s" instead.',
- '\Sylius\Bundle\CoreBundle\Fixture\Factory\PaymentFixture',
- PaymentFixture::class,
-);
-
class PaymentFixture extends AbstractFixture
{
private Generator $faker;
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/StickerProductFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/StickerProductFixture.php
deleted file mode 100644
index 76217d9288..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Fixture/StickerProductFixture.php
+++ /dev/null
@@ -1,149 +0,0 @@
-faker = Factory::create();
- $this->optionsResolver =
- (new OptionsResolver())
- ->setRequired('amount')
- ->setAllowedTypes('amount', 'int')
- ;
- }
-
- public function getName(): string
- {
- return 'sticker_product';
- }
-
- public function load(array $options): void
- {
- $options = $this->optionsResolver->resolve($options);
-
- $this->taxonFixture->load(['custom' => [[
- 'code' => 'category',
- 'name' => 'Category',
- 'children' => [
- [
- 'code' => 'stickers',
- 'translations' => [
- 'en_US' => [
- 'name' => 'Stickers',
- ],
- 'fr_FR' => [
- 'name' => 'Étiquettes',
- ],
- ],
- ],
- ],
- ]]]);
-
- $this->productAttributeFixture->load(['custom' => [
- ['name' => 'Sticker paper', 'code' => 'sticker_paper', 'type' => TextAttributeType::TYPE],
- ['name' => 'Sticker resolution', 'code' => 'sticker_resolution', 'type' => TextAttributeType::TYPE],
- ]]);
-
- $this->productOptionFixture->load(['custom' => [
- [
- 'name' => 'Sticker size',
- 'code' => 'sticker_size',
- 'values' => [
- 'sticker_size_3' => '3"',
- 'sticker_size_5' => '5"',
- 'sticker_size_7' => '7"',
- ],
- ],
- ]]);
-
- $products = [];
- $productsNames = $this->getUniqueNames($options['amount']);
- for ($i = 0; $i < $options['amount']; ++$i) {
- $products[] = [
- 'name' => sprintf('Sticker "%s"', $productsNames[$i]),
- 'code' => $this->faker->uuid,
- 'main_taxon' => 'stickers',
- 'taxons' => ['stickers'],
- 'variant_selection_method' => ProductInterface::VARIANT_SELECTION_CHOICE,
- 'product_attributes' => [
- 'sticker_paper' => sprintf('Paper from tree %s', $this->faker->randomElement(['Wung', 'Tanajno', 'Lemon-San', 'Me-Gusta'])),
- 'sticker_resolution' => $this->faker->randomElement(['JKM XD', '476DPI', 'FULL HD', '200DPI']),
- ],
- 'product_options' => ['sticker_size'],
- 'images' => [
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'stickers.jpg'),
- 'type' => 'main',
- ],
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 'stickers.jpg'),
- 'type' => 'thumbnail',
- ],
- ],
- ];
- }
-
- $this->productFixture->load(['custom' => $products]);
- }
-
- protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
- {
- $optionsNode
- ->children()
- ->integerNode('amount')->isRequired()->min(0)->end()
- ;
- }
-
- private function getUniqueNames(int $amount): array
- {
- $productsNames = [];
-
- for ($i = 0; $i < $amount; ++$i) {
- $name = $this->faker->word;
- while (in_array($name, $productsNames)) {
- $name = $this->faker->word;
- }
- $productsNames[] = $name;
- }
-
- return $productsNames;
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Fixture/TshirtProductFixture.php b/src/Sylius/Bundle/CoreBundle/Fixture/TshirtProductFixture.php
deleted file mode 100644
index d91f7dac7a..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Fixture/TshirtProductFixture.php
+++ /dev/null
@@ -1,185 +0,0 @@
-faker = Factory::create();
- $this->optionsResolver =
- (new OptionsResolver())
- ->setRequired('amount')
- ->setAllowedTypes('amount', 'int')
- ;
- }
-
- public function getName(): string
- {
- return 'tshirt_product';
- }
-
- public function load(array $options): void
- {
- $options = $this->optionsResolver->resolve($options);
-
- $this->taxonFixture->load(['custom' => [[
- 'code' => 'category',
- 'name' => 'Category',
- 'children' => [
- [
- 'code' => 't_shirts',
- 'name' => 'T-Shirts',
- 'slug' => 't-shirts',
- 'children' => [
- [
- 'code' => 'mens_t_shirts',
- 'translations' => [
- 'en_US' => [
- 'name' => 'Men',
- 'slug' => 't-shirts/men',
- ],
- 'fr_FR' => [
- 'name' => 'Hommes',
- 'slug' => 't-shirts/hommes',
- ],
- ],
- ],
- [
- 'code' => 'womens_t_shirts',
- 'translations' => [
- 'en_US' => [
- 'name' => 'Women',
- 'slug' => 't-shirts/women',
- ],
- 'fr_FR' => [
- 'name' => 'Hommes',
- 'slug' => 't-shirts/femmes',
- ],
- ],
- ],
- ],
- ],
- ],
- ]]]);
-
- $this->productAttributeFixture->load(['custom' => [
- ['name' => 'T-Shirt brand', 'code' => 't_shirt_brand', 'type' => TextAttributeType::TYPE],
- ['name' => 'T-Shirt collection', 'code' => 't_shirt_collection', 'type' => TextAttributeType::TYPE],
- ['name' => 'T-Shirt material', 'code' => 't_shirt_material', 'type' => TextAttributeType::TYPE],
- ]]);
-
- $this->productOptionFixture->load(['custom' => [
- [
- 'name' => 'T-Shirt color',
- 'code' => 't_shirt_color',
- 'values' => [
- 't_shirt_color_red' => 'Red',
- 't_shirt_color_black' => 'Black',
- 't_shirt_color_white' => 'White',
- ],
- ],
- [
- 'name' => 'T-Shirt size',
- 'code' => 't_shirt_size',
- 'values' => [
- 't_shirt_size_s' => 'S',
- 't_shirt_size_m' => 'M',
- 't_shirt_size_l' => 'L',
- 't_shirt_size_xl' => 'XL',
- 't_shirt_size_xxl' => 'XXL',
- ],
- ],
- ]]);
-
- $products = [];
- $productsNames = $this->getUniqueNames($options['amount']);
- for ($i = 0; $i < $options['amount']; ++$i) {
- $categoryTaxonCode = $this->faker->randomElement(['mens_t_shirts', 'womens_t_shirts']);
-
- $products[] = [
- 'name' => sprintf('T-Shirt "%s"', $productsNames[$i]),
- 'code' => $this->faker->uuid,
- 'main_taxon' => $categoryTaxonCode,
- 'taxons' => ['t_shirts', $categoryTaxonCode],
- 'product_attributes' => [
- 't_shirt_brand' => $this->faker->randomElement(['Nike', 'Adidas', 'JKM-476 Streetwear', 'Potato', 'Centipede Wear']),
- 't_shirt_collection' => sprintf('Sylius %s %s', $this->faker->randomElement(['Summer', 'Winter', 'Spring', 'Autumn']), random_int(1995, 2012)),
- 't_shirt_material' => $this->faker->randomElement(['Centipede', 'Wool', 'Centipede 10% / Wool 90%', 'Potato 100%']),
- ],
- 'product_options' => ['t_shirt_color', 't_shirt_size'],
- 'images' => [
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 't-shirts.jpg'),
- 'type' => 'main',
- ],
- [
- 'path' => sprintf('%s/../Resources/fixtures/%s', __DIR__, 't-shirts.jpg'),
- 'type' => 'thumbnail',
- ],
- ],
- ];
- }
-
- $this->productFixture->load(['custom' => $products]);
- }
-
- protected function configureOptionsNode(ArrayNodeDefinition $optionsNode): void
- {
- $optionsNode
- ->children()
- ->integerNode('amount')->isRequired()->min(0)->end()
- ;
- }
-
- private function getUniqueNames(int $amount): array
- {
- $productsNames = [];
-
- for ($i = 0; $i < $amount; ++$i) {
- $name = $this->faker->word;
- while (in_array($name, $productsNames)) {
- $name = $this->faker->word;
- }
- $productsNames[] = $name;
- }
-
- return $productsNames;
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
index 0704ee0fd0..1b05fdddf0 100644
--- a/src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
+++ b/src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/AddressType.php
@@ -33,22 +33,9 @@ use Webmozart\Assert\Assert;
final class AddressType extends AbstractResourceType
{
- private ?AddressComparatorInterface $addressComparator;
-
- public function __construct(string $dataClass, array $validationGroups = [], ?AddressComparatorInterface $addressComparator = null)
+ public function __construct(private readonly AddressComparatorInterface $addressComparator, string $dataClass, array $validationGroups = [])
{
parent::__construct($dataClass, $validationGroups);
-
- if (null === $addressComparator) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.8',
- 'Not passing an $addressComparator to "%s" constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
-
- $this->addressComparator = $addressComparator;
}
/**
@@ -164,7 +151,7 @@ final class AddressType extends AbstractResourceType
private function areAddressesDifferent(?AddressInterface $firstAddress, ?AddressInterface $secondAddress): bool
{
- if (null === $this->addressComparator || null === $firstAddress || null === $secondAddress) {
+ if (null === $firstAddress || null === $secondAddress) {
return false;
}
diff --git a/src/Sylius/Bundle/CoreBundle/Installer/Requirement/FilesystemRequirements.php b/src/Sylius/Bundle/CoreBundle/Installer/Requirement/FilesystemRequirements.php
index 7d5293a257..3a083d89ef 100644
--- a/src/Sylius/Bundle/CoreBundle/Installer/Requirement/FilesystemRequirements.php
+++ b/src/Sylius/Bundle/CoreBundle/Installer/Requirement/FilesystemRequirements.php
@@ -17,24 +17,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
final class FilesystemRequirements extends RequirementCollection
{
- /**
- * @param string $rootDir Deprecated.
- */
- public function __construct(TranslatorInterface $translator, string $cacheDir, string $logsDir, string $rootDir = null)
+ public function __construct(TranslatorInterface $translator, string $cacheDir, string $logsDir)
{
parent::__construct($translator->trans('sylius.installer.filesystem.header', []));
- if (func_num_args() >= 4) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.2',
- 'Passing root directory to "%s" constructor as the second argument is deprecated and this argument will be removed in Sylius 2.0.',
- self::class,
- );
-
- [$rootDir, $cacheDir, $logsDir] = [$cacheDir, $logsDir, $rootDir];
- }
-
$this
->add(new Requirement(
$translator->trans('sylius.installer.filesystem.cache.header', []),
diff --git a/src/Sylius/Bundle/CoreBundle/MessageHandler/Admin/Account/RequestResetPasswordEmailHandler.php b/src/Sylius/Bundle/CoreBundle/MessageHandler/Admin/Account/RequestResetPasswordEmailHandler.php
index d577d048f1..57a91b8370 100644
--- a/src/Sylius/Bundle/CoreBundle/MessageHandler/Admin/Account/RequestResetPasswordEmailHandler.php
+++ b/src/Sylius/Bundle/CoreBundle/MessageHandler/Admin/Account/RequestResetPasswordEmailHandler.php
@@ -15,10 +15,10 @@ namespace Sylius\Bundle\CoreBundle\MessageHandler\Admin\Account;
use Sylius\Bundle\CoreBundle\Message\Admin\Account\RequestResetPasswordEmail;
use Sylius\Bundle\CoreBundle\Message\Admin\Account\SendResetPasswordEmail;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\AdminUserInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Sylius\Component\User\Security\Generator\GeneratorInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Messenger\Stamp\DispatchAfterCurrentBusStamp;
@@ -28,7 +28,7 @@ final class RequestResetPasswordEmailHandler implements MessageHandlerInterface
public function __construct(
private UserRepositoryInterface $userRepository,
private GeneratorInterface $generator,
- private DateTimeProviderInterface $calendar,
+ private ClockInterface $clock,
private MessageBusInterface $commandBus,
) {
}
@@ -42,7 +42,7 @@ final class RequestResetPasswordEmailHandler implements MessageHandlerInterface
}
$adminUser->setPasswordResetToken($this->generator->generate());
- $adminUser->setPasswordRequestedAt($this->calendar->now());
+ $adminUser->setPasswordRequestedAt($this->clock->now());
$this->commandBus->dispatch(
new SendResetPasswordEmail($adminUser->getEmail(), $adminUser->getLocaleCode()),
diff --git a/src/Sylius/Bundle/CoreBundle/PriceHistory/Logger/PriceChangeLogger.php b/src/Sylius/Bundle/CoreBundle/PriceHistory/Logger/PriceChangeLogger.php
index 128dab9b3c..399e7bdeb3 100644
--- a/src/Sylius/Bundle/CoreBundle/PriceHistory/Logger/PriceChangeLogger.php
+++ b/src/Sylius/Bundle/CoreBundle/PriceHistory/Logger/PriceChangeLogger.php
@@ -14,9 +14,9 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\PriceHistory\Logger;
use Doctrine\Persistence\ObjectManager;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Factory\ChannelPricingLogEntryFactoryInterface;
use Sylius\Component\Core\Model\ChannelPricingInterface;
+use Symfony\Component\Clock\ClockInterface;
use Webmozart\Assert\Assert;
final class PriceChangeLogger implements PriceChangeLoggerInterface
@@ -24,7 +24,7 @@ final class PriceChangeLogger implements PriceChangeLoggerInterface
public function __construct(
private ChannelPricingLogEntryFactoryInterface $logEntryFactory,
private ObjectManager $logEntryManager,
- private DateTimeProviderInterface $dateTimeProvider,
+ private ClockInterface $clock,
) {
}
@@ -34,7 +34,7 @@ final class PriceChangeLogger implements PriceChangeLoggerInterface
$logEntry = $this->logEntryFactory->create(
$channelPricing,
- $this->dateTimeProvider->now(),
+ $this->clock->now(),
$channelPricing->getPrice(),
$channelPricing->getOriginalPrice(),
);
diff --git a/src/Sylius/Bundle/CoreBundle/PriceHistory/Remover/ChannelPricingLogEntriesRemover.php b/src/Sylius/Bundle/CoreBundle/PriceHistory/Remover/ChannelPricingLogEntriesRemover.php
index 70b148791e..64d64e5c97 100644
--- a/src/Sylius/Bundle/CoreBundle/PriceHistory/Remover/ChannelPricingLogEntriesRemover.php
+++ b/src/Sylius/Bundle/CoreBundle/PriceHistory/Remover/ChannelPricingLogEntriesRemover.php
@@ -15,18 +15,17 @@ namespace Sylius\Bundle\CoreBundle\PriceHistory\Remover;
use Doctrine\Persistence\ObjectManager;
use Sylius\Bundle\CoreBundle\PriceHistory\Event\OldChannelPricingLogEntriesEvents;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Repository\ChannelPricingLogEntryRepositoryInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
-use Webmozart\Assert\Assert;
final class ChannelPricingLogEntriesRemover implements ChannelPricingLogEntriesRemoverInterface
{
public function __construct(
private ChannelPricingLogEntryRepositoryInterface $channelPricingLogEntriesRepository,
private ObjectManager $channelPricingLogEntriesManager,
- private DateTimeProviderInterface $dateTimeProvider,
+ private ClockInterface $clock,
private EventDispatcherInterface $eventDispatcher,
private int $batchSize = 100,
) {
@@ -59,8 +58,7 @@ final class ChannelPricingLogEntriesRemover implements ChannelPricingLogEntriesR
private function getFromDate(int $fromDays): \DateTimeInterface
{
- $now = $this->dateTimeProvider->now();
- Assert::methodExists($now, 'modify');
+ $now = $this->clock->now();
return $now->modify(sprintf('-%d days', $fromDays));
}
diff --git a/src/Sylius/Bundle/CoreBundle/Provider/SessionProvider.php b/src/Sylius/Bundle/CoreBundle/Provider/SessionProvider.php
deleted file mode 100644
index e17d470159..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Provider/SessionProvider.php
+++ /dev/null
@@ -1,36 +0,0 @@
-getSession();
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
index 7a0307ee1b..378a0a9861 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/config.yml
@@ -65,12 +65,14 @@ knp_gaufrette:
adapter: "%sylius.uploader.filesystem%"
liip_imagine:
+ cache: sylius_image
+ data_loader: sylius_image
loaders:
- default:
+ sylius_image:
filesystem:
data_root: "%sylius_core.images_dir%"
resolvers:
- default:
+ sylius_image:
web_path:
web_root: "%sylius_core.public_dir%"
cache_prefix: "media/cache"
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
index 0e182f377c..98599a17e4 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/messenger.yaml
@@ -27,7 +27,6 @@ framework:
'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\ApplyCatalogPromotionsOnVariants': main
'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\DisableCatalogPromotion': main
'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveCatalogPromotion': catalog_promotion_removal
- 'Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveInactiveCatalogPromotion': catalog_promotion_removal
'Sylius\Bundle\CoreBundle\PriceHistory\Command\ApplyLowestPriceOnChannelPricings': main
'Sylius\Component\Promotion\Event\CatalogPromotionCreated': main
'Sylius\Component\Promotion\Event\CatalogPromotionEnded': main
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_product.yml b/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_product.yml
index ad643e82b8..aaa78f29a6 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_product.yml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/app/sylius/sylius_product.yml
@@ -21,6 +21,3 @@ sylius_product:
product_association:
classes:
repository: Sylius\Bundle\CoreBundle\Doctrine\ORM\ProductAssociationRepository
- product_association_type:
- classes:
- repository: Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationTypeRepository
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
index a1b784e389..f377386cc7 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services.xml
@@ -76,14 +76,6 @@
-
-
-
- %sylius.uploader.filesystem%
-
-
-
-
-
-
%sylius.channel_pricing_log_entry.old_logs_removal_batch_size%
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion.xml
index 1746779277..14224a2e3b 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/catalog_promotion.xml
@@ -39,7 +39,7 @@
>
-
-
-
+ %sylius.model.order.class%
%sylius.form.type.checkout_address.validation_groups%
-
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures.xml
index 69d95aa349..2d3ac95db1 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/fixtures.xml
@@ -154,54 +154,8 @@
-
- %locale%
-
-
-
-
-
-
- %locale%
-
-
-
-
-
-
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml
index 22c4476fdf..281e5cae54 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml
@@ -102,7 +102,6 @@
cart
%sylius.order_payment_processor.checkout.unsupported_states%
+ cart
new
%sylius.order_payment_processor.after_checkout.unsupported_states%
+ new
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/price_history/logger.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/price_history/logger.xml
index 2e1c9c0c89..f8f845a3c5 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/price_history/logger.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/price_history/logger.xml
@@ -21,7 +21,7 @@
>
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/promotion.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/promotion.xml
index f66b49d52b..aad2d09588 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/promotion.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/promotion.xml
@@ -120,14 +120,6 @@
-
-
-
-
-
-
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml
index ef51a0c40a..2222f67fb0 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/providers.xml
@@ -26,11 +26,6 @@
-
-
%locale%
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.xml
index a2b97176f8..ebf08b25c8 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.xml
+++ b/src/Sylius/Bundle/CoreBundle/Resources/config/services/templating.xml
@@ -20,11 +20,6 @@
-
-
-
- {% if use_webpack %}
- ) }})
- {% else %}
- ) }})
- {% endif %}
+
- {% else %}
-
- {% endif %}
+
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/views/Email/layout.html.twig b/src/Sylius/Bundle/CoreBundle/Resources/views/Email/layout.html.twig
index 519d8e1841..4567020d75 100644
--- a/src/Sylius/Bundle/CoreBundle/Resources/views/Email/layout.html.twig
+++ b/src/Sylius/Bundle/CoreBundle/Resources/views/Email/layout.html.twig
@@ -1,10 +1,6 @@
{% block body %}
{% autoescape false %}
- {% if use_webpack %}
- {% set logo = sylius_channel_url(asset('build/shop/images/logo.png', 'shop'), channel) %}
- {% else %}
- {% set logo = sylius_channel_url(asset('assets/shop/img/logo.png'), channel) %}
- {% endif %}
+ {% set logo = sylius_channel_url(asset('build/shop/images/logo.png', 'shop'), channel) %}
diff --git a/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php b/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php
index dc61fe7a4e..031f5ae69a 100644
--- a/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php
+++ b/src/Sylius/Bundle/CoreBundle/Security/UserImpersonator.php
@@ -13,13 +13,11 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Security;
-use Sylius\Bundle\CoreBundle\Provider\SessionProvider;
use Sylius\Bundle\UserBundle\Event\UserEvent;
use Sylius\Bundle\UserBundle\UserEvents;
use Sylius\Component\User\Model\UserInterface as SyliusUserInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
use Webmozart\Assert\Assert;
@@ -31,45 +29,23 @@ final class UserImpersonator implements UserImpersonatorInterface
private string $firewallContextName;
public function __construct(
- private RequestStack|SessionInterface $requestStackOrSession,
+ private RequestStack $requestStack,
string $firewallContextName,
private EventDispatcherInterface $eventDispatcher,
) {
$this->sessionTokenParameter = sprintf('_security_%s', $firewallContextName);
$this->firewallContextName = $firewallContextName;
-
- if ($requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function impersonate(SymfonyUserInterface $user): void
{
- /** @deprecated parameter credential was deprecated in Symfony 5.4, so in Sylius 1.11 too, in Sylius 2.0 providing 4 arguments will be prohibited. */
- if (3 === (new \ReflectionClass(UsernamePasswordToken::class))->getConstructor()->getNumberOfParameters()) {
- $token = new UsernamePasswordToken(
- $user,
- $this->firewallContextName,
- array_map(/** @param object|string $role */ static fn ($role): string => (string) $role, $user->getRoles()),
- );
- } else {
- Assert::methodExists($user, 'getPassword');
- $token = new UsernamePasswordToken(
- $user,
- $user->getPassword(),
- $this->firewallContextName, // @phpstan-ignore-line continue to support Sf < 6
- array_map(/** @param object|string $role */ static fn ($role): string => (string) $role, $user->getRoles()),
- );
- }
+ $token = new UsernamePasswordToken(
+ $user,
+ $this->firewallContextName,
+ array_map(static fn (object|string $role): string => $role, $user->getRoles()),
+ );
- $session = SessionProvider::getSession($this->requestStackOrSession);
+ $session = $this->requestStack->getSession();
$session->set($this->sessionTokenParameter, serialize($token));
$session->save();
diff --git a/src/Sylius/Bundle/CoreBundle/Storage/CartSessionStorage.php b/src/Sylius/Bundle/CoreBundle/Storage/CartSessionStorage.php
index 55308d085d..65f8f7ece4 100644
--- a/src/Sylius/Bundle/CoreBundle/Storage/CartSessionStorage.php
+++ b/src/Sylius/Bundle/CoreBundle/Storage/CartSessionStorage.php
@@ -13,39 +13,26 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Storage;
-use Sylius\Bundle\CoreBundle\Provider\SessionProvider;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Repository\OrderRepositoryInterface;
use Sylius\Component\Core\Storage\CartStorageInterface;
use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
final class CartSessionStorage implements CartStorageInterface
{
public function __construct(
- private RequestStack|SessionInterface $requestStackOrSession,
+ private RequestStack $requestStack,
private string $sessionKeyName,
private OrderRepositoryInterface $orderRepository,
) {
- if ($requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- )
- ;
- }
}
public function hasForChannel(ChannelInterface $channel): bool
{
try {
- return SessionProvider::getSession($this->requestStackOrSession)->has($this->getCartKeyName($channel));
+ return $this->requestStack->getSession()->has($this->getCartKeyName($channel));
} catch (SessionNotFoundException) {
return false;
}
@@ -54,7 +41,7 @@ final class CartSessionStorage implements CartStorageInterface
public function getForChannel(ChannelInterface $channel): ?OrderInterface
{
if ($this->hasForChannel($channel)) {
- $cartId = SessionProvider::getSession($this->requestStackOrSession)->get($this->getCartKeyName($channel));
+ $cartId = $this->requestStack->getSession()->get($this->getCartKeyName($channel));
return $this->orderRepository->findCartByChannel($cartId, $channel);
}
@@ -64,12 +51,12 @@ final class CartSessionStorage implements CartStorageInterface
public function setForChannel(ChannelInterface $channel, OrderInterface $cart): void
{
- SessionProvider::getSession($this->requestStackOrSession)->set($this->getCartKeyName($channel), $cart->getId());
+ $this->requestStack->getSession()->set($this->getCartKeyName($channel), $cart->getId());
}
public function removeForChannel(ChannelInterface $channel): void
{
- SessionProvider::getSession($this->requestStackOrSession)->remove($this->getCartKeyName($channel));
+ $this->requestStack->getSession()->remove($this->getCartKeyName($channel));
}
private function getCartKeyName(ChannelInterface $channel): string
diff --git a/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php b/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php
index c078b4d91f..39933ff9ab 100644
--- a/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php
+++ b/src/Sylius/Bundle/CoreBundle/SyliusCoreBundle.php
@@ -21,7 +21,6 @@ use Doctrine\Inflector\Rules\Substitutions;
use Doctrine\Inflector\Rules\Transformations;
use Doctrine\Inflector\Rules\Word;
use Doctrine\ORM\Query;
-use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\BackwardsCompatibility\CancelOrderStateMachineCallbackPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\BackwardsCompatibility\ResolveShopUserTargetEntityPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\BackwardsCompatibility\Symfony5AuthenticationManagerPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\BackwardsCompatibility\Symfony6PrivateServicesPass;
@@ -31,7 +30,6 @@ use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\LazyCacheWarmupPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\LiipImageFiltersPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\RegisterTaxCalculationStrategiesPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\RegisterUriBasedSectionResolverPass;
-use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\SyliusPriceHistoryLegacyAliasesPass;
use Sylius\Bundle\CoreBundle\DependencyInjection\Compiler\TranslatableEntityLocalePass;
use Sylius\Bundle\CoreBundle\Doctrine\ORM\SqlWalker\OrderByIdentifierSqlWalker;
use Sylius\Bundle\ResourceBundle\AbstractResourceBundle;
@@ -41,13 +39,13 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
final class SyliusCoreBundle extends AbstractResourceBundle
{
- public const VERSION = '1.13.0-DEV';
+ public const VERSION = '2.0.0-DEV';
- public const VERSION_ID = '11300';
+ public const VERSION_ID = '20000';
- public const MAJOR_VERSION = '1';
+ public const MAJOR_VERSION = '2';
- public const MINOR_VERSION = '13';
+ public const MINOR_VERSION = '0';
public const RELEASE_VERSION = '0';
@@ -93,8 +91,6 @@ final class SyliusCoreBundle extends AbstractResourceBundle
$container->addCompilerPass(new Symfony5AuthenticationManagerPass());
$container->addCompilerPass(new Symfony6PrivateServicesPass());
$container->addCompilerPass(new TranslatableEntityLocalePass());
- $container->addCompilerPass(new CancelOrderStateMachineCallbackPass());
- $container->addCompilerPass(new SyliusPriceHistoryLegacyAliasesPass());
}
protected function getModelNamespace(): string
diff --git a/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php b/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php
index 3c6ed77619..db4bc0ea85 100644
--- a/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php
+++ b/src/Sylius/Bundle/CoreBundle/Templating/Helper/PriceHelper.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Templating\Helper;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
use Symfony\Component\Templating\Helper\Helper;
@@ -21,7 +20,7 @@ use Webmozart\Assert\Assert;
class PriceHelper extends Helper
{
- public function __construct(private ProductVariantPriceCalculatorInterface $productVariantPriceCalculator)
+ public function __construct(private ProductVariantPricesCalculatorInterface $productVariantPricesCalculator)
{
}
@@ -33,7 +32,7 @@ class PriceHelper extends Helper
Assert::keyExists($context, 'channel');
return $this
- ->productVariantPriceCalculator
+ ->productVariantPricesCalculator
->calculate($productVariant, $context)
;
}
@@ -44,10 +43,9 @@ class PriceHelper extends Helper
public function getOriginalPrice(ProductVariantInterface $productVariant, array $context): int
{
Assert::keyExists($context, 'channel');
- Assert::isInstanceOf($this->productVariantPriceCalculator, ProductVariantPricesCalculatorInterface::class);
return $this
- ->productVariantPriceCalculator
+ ->productVariantPricesCalculator
->calculateOriginal($productVariant, $context)
;
}
@@ -55,10 +53,9 @@ class PriceHelper extends Helper
public function getLowestPriceBeforeDiscount(ProductVariantInterface $productVariant, array $context): ?int
{
Assert::keyExists($context, 'channel');
- Assert::isInstanceOf($this->productVariantPriceCalculator, ProductVariantPricesCalculatorInterface::class);
return $this
- ->productVariantPriceCalculator
+ ->productVariantPricesCalculator
->calculateLowestPriceBeforeDiscount($productVariant, $context)
;
}
@@ -76,7 +73,6 @@ class PriceHelper extends Helper
public function hasDiscount(ProductVariantInterface $productVariant, array $context): bool
{
Assert::keyExists($context, 'channel');
- Assert::isInstanceOf($this->productVariantPriceCalculator, ProductVariantPricesCalculatorInterface::class);
return $this->getOriginalPrice($productVariant, $context) > $this->getPrice($productVariant, $context);
}
diff --git a/src/Sylius/Bundle/CoreBundle/Templating/Helper/ProductVariantsPricesHelper.php b/src/Sylius/Bundle/CoreBundle/Templating/Helper/ProductVariantsPricesHelper.php
deleted file mode 100644
index 09331e9ecc..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Templating/Helper/ProductVariantsPricesHelper.php
+++ /dev/null
@@ -1,45 +0,0 @@
-productVariantsPricesProvider->provideVariantsPrices($product, $channel);
- }
-
- public function getName(): string
- {
- return 'sylius_product_variants_prices';
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPassTest.php b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPassTest.php
deleted file mode 100644
index af175c6e6d..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/BackwardsCompatibility/CancelOrderStateMachineCallbackPassTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
- [
- 'class' => 'Sylius\\Component\\Core\\Model\\Order',
- 'property_path' => 'state',
- 'graph' => 'sylius_order',
- 'state_machine_class' => 'Sylius\\Component\\Resource\\StateMachine\\StateMachine',
- 'states' => [
- 'cart',
- 'new',
- 'cancelled',
- 'fulfilled',
- ],
- 'transitions' => [
- 'create' => [
- 'from' => [
- 'cart',
- ],
- 'to' => 'new',
- ],
- 'cancel' => [
- 'from' => [
- 'new',
- ],
- 'to' => 'cancelled',
- ],
- 'fulfill' => [
- 'from' => [
- 'new',
- ],
- 'to' => 'fulfilled',
- ],
- ],
- 'callbacks' => [
- 'before' => [],
- 'after' => [
- 'sylis_cancel_order' => [
- 'on' => [
- 'cancel',
- ],
- 'do' => [
- '@sylius.inventory.order_inventory_operator',
- 'cancel',
- ],
- 'args' => [
- 'object',
- ],
- 'disabled' => false,
- 'priority' => 0,
- ],
- ],
- 'guard' => [],
- ],
- ],
- ];
-
- /** @test */
- public function it_converts_from_old_name_to_new_name(): void
- {
- $this->setParameter('sm.configs', $this->smConfigs);
- $this->compile();
-
- $smConfigs = $this->container->getParameter('sm.configs');
- $this->assertFalse(
- isset($smConfigs['sylius_order']['callbacks']['after']['sylis_cancel_order']),
- 'State machine "sylius_order" should not have "sylis_cancel_order" callback configured.',
- );
- $this->assertTrue(
- isset($smConfigs['sylius_order']['callbacks']['after']['sylius_cancel_order']),
- 'State machine "sylius_order" should have "sylius_cancel_order" callback configured.',
- );
- $this->assertEquals(
- $this->smConfigs['sylius_order']['callbacks']['after']['sylis_cancel_order'],
- $smConfigs['sylius_order']['callbacks']['after']['sylius_cancel_order'],
- 'State machine "sylius_order" should have the "sylis_cancel_order" callback moved to "sylius_cancel_order".',
- );
- }
-
- protected function registerCompilerPass(ContainerBuilder $container): void
- {
- $container->addCompilerPass(new CancelOrderStateMachineCallbackPass());
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php
deleted file mode 100644
index 22e15af03d..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/Compiler/SyliusPriceHistoryLegacyAliasesPassTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-register('Sylius\Component\Core\Checker\ProductVariantLowestPriceDisplayCheckerInterface');
- $container->register('Sylius\Bundle\CoreBundle\PriceHistory\CommandHandler\SomeService');
- $container->register('sylius.manager.channel_price_history_config');
- $container->register('sylius.factory.channel_pricing_log_entry');
-
- $this->process($container);
-
- $this->assertHasAlias($container, 'Sylius\PriceHistoryPlugin\Application\Checker\ProductVariantLowestPriceDisplayCheckerInterface');
- $this->assertHasAlias($container, 'Sylius\PriceHistoryPlugin\Application\CommandHandler\SomeService');
- $this->assertHasAlias($container, 'sylius_price_history.manager.channel_price_history_config');
- $this->assertHasAlias($container, 'sylius_price_history.factory.channel_pricing_log_entry');
- }
-
- private function assertHasAlias(ContainerBuilder $container, string $alias): void
- {
- $this->assertTrue($container->hasAlias($alias), 'Expected to find alias ' . $alias);
- }
-
- private function process(ContainerBuilder $container): void
- {
- (new SyliusPriceHistoryLegacyAliasesPass())->process($container);
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreConfigurationTest.php b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreConfigurationTest.php
index ff41da0f55..b5cba13096 100644
--- a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreConfigurationTest.php
+++ b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreConfigurationTest.php
@@ -13,48 +13,14 @@ declare(strict_types=1);
namespace Sylius\Bundle\CoreBundle\Tests\DependencyInjection;
-use Matthias\SymfonyConfigTest\Partial\PartialProcessor;
use Matthias\SymfonyConfigTest\PhpUnit\ConfigurationTestCaseTrait;
use PHPUnit\Framework\TestCase;
use Sylius\Bundle\CoreBundle\DependencyInjection\Configuration;
-use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
final class SyliusCoreConfigurationTest extends TestCase
{
use ConfigurationTestCaseTrait;
- /** @test */
- public function it_does_not_bring_back_previous_priorities_for_order_processing_by_default(): void
- {
- $this->assertProcessedConfigurationEquals(
- [[]],
- ['process_shipments_before_recalculating_prices' => false],
- 'process_shipments_before_recalculating_prices',
- );
- }
-
- /** @test */
- public function it_allows_to_define_that_previous_priorities_should_be_brought_back_for_order_processing(): void
- {
- $this->assertProcessedConfigurationEquals(
- [['process_shipments_before_recalculating_prices' => true]],
- ['process_shipments_before_recalculating_prices' => true],
- 'process_shipments_before_recalculating_prices',
- );
- }
-
- /** @test */
- public function it_does_not_allow_to_define_previous_priorities_with_values_other_then_bool(): void
- {
- $this->expectException(InvalidTypeException::class);
-
- (new PartialProcessor())->processConfiguration(
- $this->getConfiguration(),
- 'process_shipments_before_recalculating_prices',
- [['process_shipments_before_recalculating_prices' => 'yolo']],
- );
- }
-
/** @test */
public function it_sets_default_filesystem_adapter(): void
{
@@ -79,12 +45,6 @@ final class SyliusCoreConfigurationTest extends TestCase
['filesystem' => ['adapter' => 'flysystem']],
'filesystem',
);
-
- $this->assertProcessedConfigurationEquals(
- [['filesystem' => ['adapter' => 'gaufrette']]],
- ['filesystem' => ['adapter' => 'gaufrette']],
- 'filesystem',
- );
}
/** @test */
@@ -92,7 +52,7 @@ final class SyliusCoreConfigurationTest extends TestCase
{
$this->assertConfigurationIsInvalid(
[['filesystem' => ['adapter' => 'yolo']]],
- 'Expected adapter "default", "flysystem" or "gaufrette", but "yolo" passed.',
+ 'Expected adapter "default" or "flysystem", but "yolo" passed.',
);
}
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreExtensionTest.php b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreExtensionTest.php
index 98f2d055e3..df826bc453 100644
--- a/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreExtensionTest.php
+++ b/src/Sylius/Bundle/CoreBundle/Tests/DependencyInjection/SyliusCoreExtensionTest.php
@@ -15,7 +15,6 @@ namespace Sylius\Bundle\CoreBundle\Tests\DependencyInjection;
use Doctrine\Bundle\MigrationsBundle\DependencyInjection\DoctrineMigrationsExtension;
use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
-use Matthias\SymfonyDependencyInjectionTest\PhpUnit\DefinitionHasTagConstraint;
use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionApplicatorCriteria;
use Sylius\Bundle\CoreBundle\Attribute\AsCatalogPromotionPriceCalculator;
use Sylius\Bundle\CoreBundle\Attribute\AsEntityObserver;
@@ -36,40 +35,11 @@ use Sylius\Bundle\CoreBundle\Tests\Stub\UriBasedSectionResolverStub;
use Sylius\Bundle\OrderBundle\DependencyInjection\SyliusOrderExtension;
use Sylius\Component\Core\Filesystem\Adapter\FilesystemAdapterInterface;
use Sylius\Component\Core\Filesystem\Adapter\FlysystemFilesystemAdapter;
-use Sylius\Component\Core\Filesystem\Adapter\GaufretteFilesystemAdapter;
use SyliusLabs\DoctrineMigrationsExtraBundle\DependencyInjection\SyliusLabsDoctrineMigrationsExtraExtension;
use Symfony\Component\DependencyInjection\Definition;
final class SyliusCoreExtensionTest extends AbstractExtensionTestCase
{
- /** @test */
- public function it_brings_back_previous_order_processing_priorities(): void
- {
- $this->container->setParameter('kernel.environment', 'dev');
-
- $this->load(['process_shipments_before_recalculating_prices' => true]);
-
- $this->assertThat(
- $this->container->findDefinition('sylius.order_processing.order_prices_recalculator'),
- new DefinitionHasTagConstraint('sylius.order_processor', ['priority' => 40]),
- );
-
- $this->assertThat(
- $this->container->findDefinition('sylius.order_processing.order_prices_recalculator'),
- $this->logicalNot(new DefinitionHasTagConstraint('sylius.order_processor', ['priority' => 50])),
- );
-
- $this->assertThat(
- $this->container->findDefinition('sylius.order_processing.order_shipment_processor'),
- new DefinitionHasTagConstraint('sylius.order_processor', ['priority' => 50]),
- );
-
- $this->assertThat(
- $this->container->findDefinition('sylius.order_processing.order_shipment_processor'),
- $this->logicalNot(new DefinitionHasTagConstraint('sylius.order_processor', ['priority' => 40])),
- );
- }
-
/** @test */
public function it_autoconfigures_prepending_doctrine_migrations_with_proper_migrations_path_for_test_env(): void
{
@@ -196,16 +166,6 @@ final class SyliusCoreExtensionTest extends AbstractExtensionTestCase
$this->assertContainerBuilderHasAlias(FilesystemAdapterInterface::class, FlysystemFilesystemAdapter::class);
}
- /** @test */
- public function it_aliases_gaufrette_filesystem_adapter_properly(): void
- {
- $this->container->setParameter('kernel.environment', 'dev');
-
- $this->load(['filesystem' => ['adapter' => 'gaufrette']]);
-
- $this->assertContainerBuilderHasAlias(FilesystemAdapterInterface::class, GaufretteFilesystemAdapter::class);
- }
-
/** @test */
public function it_autoconfigures_catalog_promotion_applicator_criteria_with_attribute(): void
{
diff --git a/src/Sylius/Bundle/CoreBundle/Tests/Mailer/OrderEmailManagerTest.php b/src/Sylius/Bundle/CoreBundle/Tests/Mailer/OrderEmailManagerTest.php
index af9d469c87..70378b7a91 100644
--- a/src/Sylius/Bundle/CoreBundle/Tests/Mailer/OrderEmailManagerTest.php
+++ b/src/Sylius/Bundle/CoreBundle/Tests/Mailer/OrderEmailManagerTest.php
@@ -19,15 +19,12 @@ use Sylius\Bundle\CoreBundle\Mailer\OrderEmailManagerInterface;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\CustomerInterface;
use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Core\Test\SwiftmailerAssertionTrait;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Filesystem\Filesystem;
use Symfony\Contracts\Translation\TranslatorInterface;
final class OrderEmailManagerTest extends KernelTestCase
{
use ProphecyTrait;
- use SwiftmailerAssertionTrait;
private const RECIPIENT_EMAIL = 'test@example.com';
@@ -36,12 +33,8 @@ final class OrderEmailManagerTest extends KernelTestCase
private const ORDER_NUMBER = '#000001';
/** @test */
- public function it_sends_order_confirmation_email_with_symfony_mailer_if_swift_mailer_is_not_present(): void
+ public function it_sends_order_confirmation_email(): void
{
- if ($this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('This test should be executed only outside of test_with_swiftmailer environment');
- }
-
$container = self::getContainer();
/** @var TranslatorInterface $translator */
@@ -78,59 +71,4 @@ final class OrderEmailManagerTest extends KernelTestCase
preg_replace('/\s+/', ' ', strip_tags($email->getHtmlBody())),
);
}
-
- /** @test */
- public function it_sends_order_confirmation_email_with_swift_mailer_by_default_if_is_present(): void
- {
- if (!$this->isItSwiftmailerTestEnv()) {
- $this->markTestSkipped('This test should be executed only in test_with_swiftmailer environment');
- }
-
- $container = self::getContainer();
-
- self::setSpoolDirectory($container->getParameter('kernel.cache_dir') . '/spool');
-
- /** @var Filesystem $filesystem */
- $filesystem = $container->get('filesystem');
-
- /** @var TranslatorInterface $translator */
- $translator = $container->get('translator');
-
- $filesystem->remove(self::getSpoolDirectory());
-
- $orderEmailManager = static::$kernel->getContainer()->get('sylius.mailer.order_email_manager');
- /** @var OrderInterface|ObjectProphecy $order */
- $order = $this->prophesize(OrderInterface::class);
- /** @var CustomerInterface|ObjectProphecy $customer */
- $customer = $this->prophesize(CustomerInterface::class);
- $customer->getEmail()->willReturn(self::RECIPIENT_EMAIL);
- /** @var ChannelInterface|ObjectProphecy $channel */
- $channel = $this->prophesize(ChannelInterface::class);
-
- $order->getCustomer()->willReturn($customer->reveal());
- $order->getChannel()->willReturn($channel->reveal());
- $order->getLocaleCode()->willReturn(self::LOCALE_CODE);
- $order->getNumber()->willReturn(self::ORDER_NUMBER);
- $order->getTokenValue()->willReturn('ASFAFA4654AF');
-
- $orderEmailManager->sendConfirmationEmail($order->reveal());
-
- self::assertSpooledMessagesCountWithRecipient(1, self::RECIPIENT_EMAIL);
- self::assertSpooledMessageWithContentHasRecipient(
- sprintf(
- '%s %s %s',
- $translator->trans('sylius.email.order_confirmation.your_order_number', [], null, self::LOCALE_CODE),
- self::ORDER_NUMBER,
- $translator->trans('sylius.email.order_confirmation.has_been_successfully_placed', [], null, self::LOCALE_CODE),
- ),
- self::RECIPIENT_EMAIL,
- );
- }
-
- private function isItSwiftmailerTestEnv(): bool
- {
- $env = self::getContainer()->getParameter('kernel.environment');
-
- return $env === 'test_with_swiftmailer';
- }
}
diff --git a/src/Sylius/Bundle/CoreBundle/Twig/ProductVariantsPricesExtension.php b/src/Sylius/Bundle/CoreBundle/Twig/ProductVariantsPricesExtension.php
deleted file mode 100644
index defc0f09db..0000000000
--- a/src/Sylius/Bundle/CoreBundle/Twig/ProductVariantsPricesExtension.php
+++ /dev/null
@@ -1,40 +0,0 @@
-productVariantsPricesHelper, 'getPrices']),
- ];
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntityValidator.php b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntityValidator.php
index 3b69735cc0..6ea2bcdc46 100644
--- a/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntityValidator.php
+++ b/src/Sylius/Bundle/CoreBundle/Validator/Constraints/HasEnabledEntityValidator.php
@@ -15,7 +15,6 @@ namespace Sylius\Bundle\CoreBundle\Validator\Constraints;
use Doctrine\Persistence\ManagerRegistry;
use Doctrine\Persistence\ObjectManager;
-use Symfony\Component\PropertyAccess\PropertyAccess;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
@@ -26,18 +25,8 @@ final class HasEnabledEntityValidator extends ConstraintValidator
{
public function __construct(
private ManagerRegistry $registry,
- private ?PropertyAccessorInterface $accessor = null,
+ private PropertyAccessorInterface $accessor,
) {
- if (null === $this->accessor) {
- trigger_deprecation(
- 'sylius/core-bundle',
- '1.13',
- 'Not passing a PropertyAccessorInterface as the second constructor argument for %s is deprecated and will be required in Sylius 2.0.',
- self::class,
- );
-
- $this->accessor = PropertyAccess::createPropertyAccessor();
- }
}
public function validate(mixed $value, Constraint $constraint): void
diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json
index e5480d6efa..b905bfb1d1 100644
--- a/src/Sylius/Bundle/CoreBundle/composer.json
+++ b/src/Sylius/Bundle/CoreBundle/composer.json
@@ -26,7 +26,7 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/doctrine-migrations-bundle": "^3.0.1",
"egulias/email-validator": "^3.1",
"fakerphp/faker": "^1.10",
@@ -40,38 +40,39 @@
"sylius-labs/association-hydrator": "^1.1 || ^1.2",
"sylius-labs/doctrine-migrations-extra-bundle": "^0.1.4 || ^0.2",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
- "sylius/addressing-bundle": "^1.12",
- "sylius/attribute-bundle": "^1.12",
- "sylius/channel-bundle": "^1.12",
- "sylius/core": "^1.12",
- "sylius/currency-bundle": "^1.12",
- "sylius/customer-bundle": "^1.12",
- "sylius/fixtures-bundle": "^1.7",
- "sylius/grid-bundle": "^1.11",
- "sylius/inventory-bundle": "^1.12",
- "sylius/locale-bundle": "^1.12",
- "sylius/money-bundle": "^1.12",
- "sylius/order-bundle": "^1.12",
- "sylius/payment-bundle": "^1.12",
- "sylius/payum-bundle": "^1.12",
- "sylius/product-bundle": "^1.12",
- "sylius/promotion-bundle": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "sylius/review-bundle": "^1.12",
- "sylius/shipping-bundle": "^1.12",
- "sylius/taxation-bundle": "^1.12",
- "sylius/taxonomy-bundle": "^1.12",
- "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
- "sylius/theme-bundle": "^2.1.1 || ^2.3",
- "sylius/ui-bundle": "^1.12",
- "sylius/user-bundle": "^1.12",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/intl": "^5.4.21 || ^6.0",
- "symfony/mailer": "^5.4.21 || ^6.0",
- "symfony/messenger": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0",
- "symfony/webpack-encore-bundle": "^1.15",
- "symfony/workflow": "^5.4.21 || ^6.0",
+ "sylius/addressing-bundle": "^2.0",
+ "sylius/attribute-bundle": "^2.0",
+ "sylius/channel-bundle": "^2.0",
+ "sylius/core": "^2.0",
+ "sylius/currency-bundle": "^2.0",
+ "sylius/customer-bundle": "^2.0",
+ "sylius/fixtures-bundle": "^1.8",
+ "sylius/grid-bundle": "^1.12",
+ "sylius/inventory-bundle": "^2.0",
+ "sylius/locale-bundle": "^2.0",
+ "sylius/mailer-bundle": "^2.0",
+ "sylius/money-bundle": "^2.0",
+ "sylius/order-bundle": "^2.0",
+ "sylius/payment-bundle": "^2.0",
+ "sylius/payum-bundle": "^2.0",
+ "sylius/product-bundle": "^2.0",
+ "sylius/promotion-bundle": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "sylius/review-bundle": "^2.0",
+ "sylius/shipping-bundle": "^2.0",
+ "sylius/taxation-bundle": "^2.0",
+ "sylius/taxonomy-bundle": "^2.0",
+ "sylius/theme-bundle": "^2.3",
+ "sylius/ui-bundle": "^2.0",
+ "sylius/user-bundle": "^2.0",
+ "symfony/clock": "^6.3.4",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/intl": "^6.3.2",
+ "symfony/mailer": "^6.3.0",
+ "symfony/messenger": "^6.3.4",
+ "symfony/templating": "^6.3.0",
+ "symfony/webpack-encore-bundle": "^1.17.1",
+ "symfony/workflow": "^6.3.4",
"winzou/state-machine-bundle": "^0.6"
},
"require-dev": {
@@ -82,11 +83,8 @@
"phpspec/phpspec": "^7.2",
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/dotenv": "^5.4.21 || ^6.0"
- },
- "conflict": {
- "symfony/doctrine-bridge": "4.4.20 || 5.2.4 || 5.2.5"
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/dotenv": "^6.3.0"
},
"config": {
"allow-plugins": {
@@ -96,10 +94,10 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
},
"symfony": {
- "require": "^5.4.21"
+ "require": "6.3.*"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/Announcer/CatalogPromotionAnnouncerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/Announcer/CatalogPromotionAnnouncerSpec.php
index d5b521bab3..81608181a4 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/Announcer/CatalogPromotionAnnouncerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/Announcer/CatalogPromotionAnnouncerSpec.php
@@ -17,11 +17,11 @@ use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\Calculator\DelayStampCalculatorInterface;
use Sylius\Bundle\CoreBundle\CatalogPromotion\Announcer\CatalogPromotionAnnouncerInterface;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\CatalogPromotionInterface;
use Sylius\Component\Promotion\Event\CatalogPromotionCreated;
use Sylius\Component\Promotion\Event\CatalogPromotionEnded;
use Sylius\Component\Promotion\Event\CatalogPromotionUpdated;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Messenger\Stamp\DelayStamp;
@@ -31,9 +31,9 @@ final class CatalogPromotionAnnouncerSpec extends ObjectBehavior
function let(
MessageBusInterface $eventBus,
DelayStampCalculatorInterface $delayStampCalculator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
): void {
- $this->beConstructedWith($eventBus, $delayStampCalculator, $dateTimeProvider);
+ $this->beConstructedWith($eventBus, $delayStampCalculator, $clock);
}
function it_implements_catalog_promotion_announcer_interface(): void
@@ -44,13 +44,13 @@ final class CatalogPromotionAnnouncerSpec extends ObjectBehavior
function it_dispatches_catalog_promotion_created_and_catalog_promotion_ended_events(
MessageBusInterface $eventBus,
DelayStampCalculatorInterface $delayStampCalculator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
CatalogPromotionInterface $catalogPromotion,
): void {
$startDateTime = new \DateTime('2021-10-10');
$endDateTime = new \DateTime('2021-10-11');
- $dateTimeProvider->now()->willReturn(new \DateTime());
+ $clock->now()->willReturn(new \DateTimeImmutable());
$catalogPromotion->getCode()->willReturn('SALE');
$catalogPromotion->getStartDate()->willReturn($startDateTime);
@@ -74,12 +74,12 @@ final class CatalogPromotionAnnouncerSpec extends ObjectBehavior
function it_does_not_dispatch_catalog_promotion_ended_when_catalog_promotion_has_no_end_date_configured(
MessageBusInterface $eventBus,
DelayStampCalculatorInterface $delayStampCalculator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
CatalogPromotionInterface $catalogPromotion,
): void {
$startDateTime = new \DateTime('2021-10-10');
- $dateTimeProvider->now()->willReturn(new \DateTime());
+ $clock->now()->willReturn(new \DateTimeImmutable());
$catalogPromotion->getCode()->willReturn('SALE');
$catalogPromotion->getStartDate()->willReturn($startDateTime);
@@ -101,13 +101,13 @@ final class CatalogPromotionAnnouncerSpec extends ObjectBehavior
function it_dispatches_catalog_promotion_updated_and_catalog_promotion_ended_events(
MessageBusInterface $eventBus,
DelayStampCalculatorInterface $delayStampCalculator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
CatalogPromotionInterface $catalogPromotion,
): void {
$startDateTime = new \DateTime('2021-10-10');
$endDateTime = new \DateTime('2021-10-11');
- $dateTimeProvider->now()->willReturn(new \DateTime());
+ $clock->now()->willReturn(new \DateTimeImmutable());
$catalogPromotion->getCode()->willReturn('SALE');
$catalogPromotion->getStartDate()->willReturn($startDateTime);
@@ -131,13 +131,13 @@ final class CatalogPromotionAnnouncerSpec extends ObjectBehavior
function it_dispatches_catalog_promotion_updated_twice_if_catalog_promotion_is_updated_with_delayed_start(
MessageBusInterface $eventBus,
DelayStampCalculatorInterface $delayStampCalculator,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
CatalogPromotionInterface $catalogPromotion,
): void {
$startDateTime = new \DateTime('2021-10-10');
$endDateTime = new \DateTime('2021-10-11');
- $dateTimeProvider->now()->willReturn(new \DateTime('2021-10-09'));
+ $clock->now()->willReturn(new \DateTimeImmutable('2021-10-09'));
$catalogPromotion->getCode()->willReturn('SALE');
$catalogPromotion->getStartDate()->willReturn($startDateTime);
diff --git a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveCatalogPromotionHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveCatalogPromotionHandlerSpec.php
index 1cc7018bf9..ebbbadc70d 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveCatalogPromotionHandlerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveCatalogPromotionHandlerSpec.php
@@ -13,7 +13,7 @@ declare(strict_types=1);
namespace spec\Sylius\Bundle\CoreBundle\CatalogPromotion\CommandHandler;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\CatalogPromotion\Command\RemoveCatalogPromotion;
@@ -26,14 +26,14 @@ final class RemoveCatalogPromotionHandlerSpec extends ObjectBehavior
{
public function let(
CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
+ EntityManagerInterface $entityManager,
): void {
$this->beConstructedWith($catalogPromotionRepository, $entityManager);
}
public function it_removes_catalog_promotion_being_processed(
CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
+ EntityManagerInterface $entityManager,
CatalogPromotionInterface $catalogPromotion,
): void {
$catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn($catalogPromotion);
@@ -47,7 +47,7 @@ final class RemoveCatalogPromotionHandlerSpec extends ObjectBehavior
public function it_throws_an_exception_if_catalog_promotion_is_not_in_a_processing_state(
CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
+ EntityManagerInterface $entityManager,
CatalogPromotionInterface $catalogPromotion,
): void {
$catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn($catalogPromotion);
@@ -65,7 +65,7 @@ final class RemoveCatalogPromotionHandlerSpec extends ObjectBehavior
public function it_returns_if_there_is_no_catalog_promotion_with_given_code(
CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
+ EntityManagerInterface $entityManager,
): void {
$catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn(null);
diff --git a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveInactiveCatalogPromotionHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveInactiveCatalogPromotionHandlerSpec.php
deleted file mode 100644
index cb03bd4549..0000000000
--- a/src/Sylius/Bundle/CoreBundle/spec/CatalogPromotion/CommandHandler/RemoveInactiveCatalogPromotionHandlerSpec.php
+++ /dev/null
@@ -1,75 +0,0 @@
-beConstructedWith($catalogPromotionRepository, $entityManager);
- }
-
- public function it_removes_an_inactive_catalog_promotion(
- CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
- CatalogPromotionInterface $catalogPromotion,
- ): void {
- $catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn($catalogPromotion);
-
- $catalogPromotion->getState()->willReturn('inactive');
-
- $this(new RemoveInactiveCatalogPromotion('CATALOG_PROMOTION_CODE'));
-
- $entityManager->remove($catalogPromotion)->shouldBeCalled();
- }
-
- public function it_throws_an_exception_if_catalog_promotion_is_not_in_an_inactive_state(
- CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
- CatalogPromotionInterface $catalogPromotion,
- ): void {
- $catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn($catalogPromotion);
-
- $catalogPromotion->getState()->willReturn('active');
- $catalogPromotion->getCode()->willReturn('CATALOG_PROMOTION_CODE');
-
- $entityManager->remove(Argument::any())->shouldNotBeCalled();
-
- $this
- ->shouldThrow(InvalidCatalogPromotionStateException::class)
- ->during('__invoke', [new RemoveInactiveCatalogPromotion('CATALOG_PROMOTION_CODE')])
- ;
- }
-
- public function it_returns_if_there_is_no_catalog_promotion_with_given_code(
- CatalogPromotionRepositoryInterface $catalogPromotionRepository,
- EntityManager $entityManager,
- ): void {
- $catalogPromotionRepository->findOneBy(['code' => 'CATALOG_PROMOTION_CODE'])->willReturn(null);
-
- $entityManager->remove(Argument::any())->shouldNotBeCalled();
-
- $this(new RemoveInactiveCatalogPromotion('CATALOG_PROMOTION_CODE'));
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php
index 5f3d917114..ba40e6997a 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/EventListener/TaxonDeletionListenerSpec.php
@@ -32,14 +32,14 @@ final class TaxonDeletionListenerSpec extends ObjectBehavior
ChannelRepositoryInterface $channelRepository,
TaxonInPromotionRuleCheckerInterface $taxonInPromotionRuleChecker,
TaxonAwareRuleUpdaterInterface $hasTaxonRuleUpdater,
- TaxonAwareRuleUpdaterInterface $totalOfItemsFromTaxonRuleUpdater,
+ TaxonAwareRuleUpdaterInterface $taxonAwareRuleUpdater,
): void {
$this->beConstructedWith(
$requestStack,
$channelRepository,
$taxonInPromotionRuleChecker,
$hasTaxonRuleUpdater,
- $totalOfItemsFromTaxonRuleUpdater,
+ $taxonAwareRuleUpdater,
);
}
@@ -101,7 +101,7 @@ final class TaxonDeletionListenerSpec extends ObjectBehavior
RequestStack $requestStack,
SessionInterface $session,
TaxonAwareRuleUpdaterInterface $hasTaxonRuleUpdater,
- TaxonAwareRuleUpdaterInterface $totalOfItemsFromTaxonRuleUpdater,
+ TaxonAwareRuleUpdaterInterface $taxonAwareRuleUpdater,
FlashBagInterface $flashes,
GenericEvent $event,
TaxonInterface $taxon,
@@ -109,7 +109,7 @@ final class TaxonDeletionListenerSpec extends ObjectBehavior
$event->getSubject()->willReturn($taxon);
$hasTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn(['christmas', 'holiday']);
- $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn(['christmas']);
+ $taxonAwareRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn(['christmas']);
$requestStack->getSession()->willReturn($session);
$session->getBag('flashes')->willReturn($flashes);
@@ -128,14 +128,14 @@ final class TaxonDeletionListenerSpec extends ObjectBehavior
RequestStack $requestStack,
SessionInterface $session,
TaxonAwareRuleUpdaterInterface $hasTaxonRuleUpdater,
- TaxonAwareRuleUpdaterInterface $totalOfItemsFromTaxonRuleUpdater,
+ TaxonAwareRuleUpdaterInterface $taxonAwareRuleUpdater,
GenericEvent $event,
TaxonInterface $taxon,
): void {
$event->getSubject()->willReturn($taxon);
$hasTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn([]);
- $totalOfItemsFromTaxonRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn([]);
+ $taxonAwareRuleUpdater->updateAfterDeletingTaxon($taxon)->willReturn([]);
$requestStack->getSession()->willReturn($session);
$session->getBag('flashes')->shouldNotBeCalled();
diff --git a/src/Sylius/Bundle/CoreBundle/spec/MessageHandler/Admin/Account/RequestResetPasswordEmailHandlerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/MessageHandler/Admin/Account/RequestResetPasswordEmailHandlerSpec.php
index 13a7884c2f..997b901a26 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/MessageHandler/Admin/Account/RequestResetPasswordEmailHandlerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/MessageHandler/Admin/Account/RequestResetPasswordEmailHandlerSpec.php
@@ -13,15 +13,14 @@ declare(strict_types=1);
namespace spec\Sylius\Bundle\CoreBundle\MessageHandler\Admin\Account;
-use DateTime;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\Message\Admin\Account\RequestResetPasswordEmail;
use Sylius\Bundle\CoreBundle\Message\Admin\Account\SendResetPasswordEmail;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\AdminUserInterface;
use Sylius\Component\User\Repository\UserRepositoryInterface;
use Sylius\Component\User\Security\Generator\GeneratorInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\Messenger\Envelope;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;
@@ -32,10 +31,10 @@ final class RequestResetPasswordEmailHandlerSpec extends ObjectBehavior
public function let(
UserRepositoryInterface $userRepository,
GeneratorInterface $generator,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
MessageBusInterface $messageBus,
): void {
- $this->beConstructedWith($userRepository, $generator, $calendar, $messageBus);
+ $this->beConstructedWith($userRepository, $generator, $clock, $messageBus);
}
public function it_is_a_message_handler(): void
@@ -46,7 +45,7 @@ final class RequestResetPasswordEmailHandlerSpec extends ObjectBehavior
public function it_handles_request_for_password_reset_token(
UserRepositoryInterface $userRepository,
GeneratorInterface $generator,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
MessageBusInterface $messageBus,
AdminUserInterface $adminUser,
): void {
@@ -54,8 +53,8 @@ final class RequestResetPasswordEmailHandlerSpec extends ObjectBehavior
$generator->generate()->willReturn('sometoken');
- $now = new DateTime();
- $calendar->now()->willReturn($now);
+ $now = new \DateTimeImmutable();
+ $clock->now()->willReturn($now);
$adminUser->getEmail()->willReturn('admin@example.com');
$adminUser->getLocaleCode()->willReturn('en_US');
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Logger/PriceChangeLoggerSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Logger/PriceChangeLoggerSpec.php
index cbc4d4d4dd..4e760e45f1 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Logger/PriceChangeLoggerSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Logger/PriceChangeLoggerSpec.php
@@ -17,19 +17,19 @@ use Doctrine\Persistence\ObjectManager;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\PriceHistory\Logger\PriceChangeLoggerInterface;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Factory\ChannelPricingLogEntryFactoryInterface;
use Sylius\Component\Core\Model\ChannelPricingInterface;
use Sylius\Component\Core\Model\ChannelPricingLogEntryInterface;
+use Symfony\Component\Clock\ClockInterface;
final class PriceChangeLoggerSpec extends ObjectBehavior
{
function let(
ChannelPricingLogEntryFactoryInterface $logEntryFactory,
ObjectManager $logEntryManager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
): void {
- $this->beConstructedWith($logEntryFactory, $logEntryManager, $dateTimeProvider);
+ $this->beConstructedWith($logEntryFactory, $logEntryManager, $clock);
}
function it_implements_price_change_logger_interface(): void
@@ -40,12 +40,12 @@ final class PriceChangeLoggerSpec extends ObjectBehavior
function it_throws_exception_when_there_is_no_price(
ChannelPricingLogEntryFactoryInterface $logEntryFactory,
ObjectManager $logEntryManager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
ChannelPricingInterface $channelPricing,
): void {
$channelPricing->getPrice()->willReturn(null);
- $dateTimeProvider->now()->shouldNotBeCalled();
+ $clock->now()->shouldNotBeCalled();
$logEntryFactory->create(Argument::cetera())->shouldNotBeCalled();
$logEntryManager->persist(Argument::any())->shouldNotBeCalled();
@@ -55,7 +55,7 @@ final class PriceChangeLoggerSpec extends ObjectBehavior
function it_logs_price_change(
ChannelPricingLogEntryFactoryInterface $logEntryFactory,
ObjectManager $logEntryManager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
ChannelPricingInterface $channelPricing,
ChannelPricingLogEntryInterface $logEntry,
): void {
@@ -66,7 +66,7 @@ final class PriceChangeLoggerSpec extends ObjectBehavior
$channelPricing->getPrice()->willReturn($price);
$channelPricing->getOriginalPrice()->willReturn($originalPrice);
- $dateTimeProvider->now()->willReturn($date);
+ $clock->now()->willReturn($date);
$logEntryFactory
->create($channelPricing, $date, $price, $originalPrice)
diff --git a/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Remover/ChannelPricingLogEntriesRemoverSpec.php b/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Remover/ChannelPricingLogEntriesRemoverSpec.php
index 329be36a2c..a4b83d914c 100644
--- a/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Remover/ChannelPricingLogEntriesRemoverSpec.php
+++ b/src/Sylius/Bundle/CoreBundle/spec/PriceHistory/Remover/ChannelPricingLogEntriesRemoverSpec.php
@@ -18,9 +18,9 @@ use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\PriceHistory\Event\OldChannelPricingLogEntriesEvents;
use Sylius\Bundle\CoreBundle\PriceHistory\Remover\ChannelPricingLogEntriesRemover;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Core\Model\ChannelPricingLogEntryInterface;
use Sylius\Component\Core\Repository\ChannelPricingLogEntryRepositoryInterface;
+use Symfony\Component\Clock\ClockInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
@@ -31,13 +31,13 @@ final class ChannelPricingLogEntriesRemoverSpec extends ObjectBehavior
function let(
ChannelPricingLogEntryRepositoryInterface $channelPricingLogEntriesRepository,
ObjectManager $manager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
EventDispatcherInterface $eventDispatcher,
): void {
$this->beConstructedWith(
$channelPricingLogEntriesRepository,
$manager,
- $dateTimeProvider,
+ $clock,
$eventDispatcher,
self::BATCH_SIZE,
);
@@ -51,11 +51,11 @@ final class ChannelPricingLogEntriesRemoverSpec extends ObjectBehavior
function it_does_nothing_when_no_log_entries_were_found(
ChannelPricingLogEntryRepositoryInterface $channelPricingLogEntriesRepository,
ObjectManager $manager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
EventDispatcherInterface $eventDispatcher,
): void {
$date = new \DateTimeImmutable();
- $dateTimeProvider->now()->willReturn($date);
+ $clock->now()->willReturn($date);
$channelPricingLogEntriesRepository->findOlderThan($date->modify('-1 days'), self::BATCH_SIZE)->willReturn([]);
@@ -71,12 +71,12 @@ final class ChannelPricingLogEntriesRemoverSpec extends ObjectBehavior
function it_removes_a_single_batch_of_channel_pricing_log_entries_when_there_is_no_more(
ChannelPricingLogEntryRepositoryInterface $channelPricingLogEntriesRepository,
ObjectManager $manager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
EventDispatcherInterface $eventDispatcher,
ChannelPricingLogEntryInterface $channelPricingLogEntry,
): void {
$date = new \DateTimeImmutable();
- $dateTimeProvider->now()->willReturn($date);
+ $clock->now()->willReturn($date);
$channelPricingLogEntriesRepository
->findOlderThan($date->modify('-1 days'), self::BATCH_SIZE)
@@ -103,13 +103,13 @@ final class ChannelPricingLogEntriesRemoverSpec extends ObjectBehavior
function it_removes_multiple_batches_of_channel_pricing_log_entries(
ChannelPricingLogEntryRepositoryInterface $channelPricingLogEntriesRepository,
ObjectManager $manager,
- DateTimeProviderInterface $dateTimeProvider,
+ ClockInterface $clock,
EventDispatcherInterface $eventDispatcher,
ChannelPricingLogEntryInterface $firstChannelPricingLogEntry,
ChannelPricingLogEntryInterface $secondChannelPricingLogEntry,
): void {
$date = new \DateTimeImmutable();
- $dateTimeProvider->now()->willReturn($date);
+ $clock->now()->willReturn($date);
$channelPricingLogEntriesRepository
->findOlderThan($date->modify('-1 days'), self::BATCH_SIZE)
diff --git a/src/Sylius/Bundle/CoreBundle/spec/Templating/Helper/ProductVariantsPricesHelperSpec.php b/src/Sylius/Bundle/CoreBundle/spec/Templating/Helper/ProductVariantsPricesHelperSpec.php
deleted file mode 100644
index 00a4e292a5..0000000000
--- a/src/Sylius/Bundle/CoreBundle/spec/Templating/Helper/ProductVariantsPricesHelperSpec.php
+++ /dev/null
@@ -1,50 +0,0 @@
-beConstructedWith($productVariantsPricesProvider);
- }
-
- function it_is_helper(): void
- {
- $this->shouldHaveType(Helper::class);
- }
-
- function it_uses_provider_to_get_variants_prices(
- ChannelInterface $channel,
- ProductInterface $product,
- ProductVariantsPricesProviderInterface $productVariantsPricesProvider,
- ): void {
- $productVariantsPricesProvider->provideVariantsPrices($product, $channel)->willReturn([
- ['color' => 'black', 'value' => 1000],
- ]);
-
- $this->getPrices($product, $channel)->shouldReturn([['color' => 'black', 'value' => 1000]]);
- }
-
- function it_has_name(): void
- {
- $this->getName()->shouldReturn('sylius_product_variants_prices');
- }
-}
diff --git a/src/Sylius/Bundle/CoreBundle/test/config/bundles.php b/src/Sylius/Bundle/CoreBundle/test/config/bundles.php
index b8d178f6b8..4b6e93e595 100644
--- a/src/Sylius/Bundle/CoreBundle/test/config/bundles.php
+++ b/src/Sylius/Bundle/CoreBundle/test/config/bundles.php
@@ -14,11 +14,9 @@ declare(strict_types=1);
return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
- Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['test_with_swiftmailer' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
- Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
diff --git a/src/Sylius/Bundle/CoreBundle/test/config/packages/config.yaml b/src/Sylius/Bundle/CoreBundle/test/config/packages/config.yaml
index dcdbff194e..dfea3e341e 100644
--- a/src/Sylius/Bundle/CoreBundle/test/config/packages/config.yaml
+++ b/src/Sylius/Bundle/CoreBundle/test/config/packages/config.yaml
@@ -15,6 +15,16 @@ framework:
test: ~
mailer:
dsn: 'null://null'
+ assets:
+ packages:
+ admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json'
+ shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/shop/manifest.json'
+ app.admin:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/admin/manifest.json'
+ app.shop:
+ json_manifest_path: '%kernel.project_dir%/public/build/app/shop/manifest.json'
workflows: ~
security:
@@ -32,3 +42,11 @@ doctrine:
driver: "%database_driver%"
path: "%database_path%"
charset: UTF8
+
+webpack_encore:
+ output_path: '%kernel.project_dir%/public/build/default'
+ builds:
+ admin: '%kernel.project_dir%/public/build/admin'
+ shop: '%kernel.project_dir%/public/build/shop'
+ app.admin: '%kernel.project_dir%/public/build/app/admin'
+ app.shop: '%kernel.project_dir%/public/build/app/shop'
diff --git a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml b/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml
deleted file mode 100644
index 1828fd69a2..0000000000
--- a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/filesystem.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
- test.filesystem.public:
- alias: filesystem
- public: true
diff --git a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml b/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml
deleted file mode 100644
index c438f4b256..0000000000
--- a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/swiftmailer.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-swiftmailer:
- disable_delivery: true
- logging: true
- spool:
- type: file
- path: "%kernel.cache_dir%/spool"
diff --git a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml b/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml
deleted file mode 100644
index e2310f20bf..0000000000
--- a/src/Sylius/Bundle/CoreBundle/test/config/packages/test_with_swiftmailer/sylius_mailer.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sylius_mailer:
- sender_adapter: sylius.email_sender.adapter.swiftmailer
diff --git a/src/Sylius/Bundle/CoreBundle/test/src/Kernel.php b/src/Sylius/Bundle/CoreBundle/test/src/Kernel.php
index 3609f20d9c..d18df360b0 100644
--- a/src/Sylius/Bundle/CoreBundle/test/src/Kernel.php
+++ b/src/Sylius/Bundle/CoreBundle/test/src/Kernel.php
@@ -22,16 +22,6 @@ final class Kernel extends BaseKernel
private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
- public function getCacheDir(): string
- {
- return $this->getProjectDir() . '/var/cache/' . $this->environment;
- }
-
- public function getLogDir(): string
- {
- return $this->getProjectDir() . '/var/log';
- }
-
public function getProjectDir(): string
{
return parent::getProjectDir() . '/test';
diff --git a/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php
index ca60fd271a..85acde4ec8 100644
--- a/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php
@@ -13,6 +13,8 @@ declare(strict_types=1);
namespace Sylius\Bundle\CurrencyBundle\DependencyInjection;
+use Sylius\Bundle\CurrencyBundle\Doctrine\ORM\CurrencyRepository;
+use Sylius\Bundle\CurrencyBundle\Doctrine\ORM\ExchangeRateRepository;
use Sylius\Bundle\CurrencyBundle\Form\Type\CurrencyType;
use Sylius\Bundle\CurrencyBundle\Form\Type\ExchangeRateType;
use Sylius\Bundle\ResourceBundle\Controller\ResourceController;
@@ -62,7 +64,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Currency::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(CurrencyInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(CurrencyRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(CurrencyType::class)->cannotBeEmpty()->end()
->end()
@@ -79,7 +81,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ExchangeRate::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ExchangeRateInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ExchangeRateRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(ExchangeRateType::class)->cannotBeEmpty()->end()
->end()
diff --git a/src/Sylius/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php b/src/Sylius/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php
new file mode 100644
index 0000000000..90f21fe644
--- /dev/null
+++ b/src/Sylius/Bundle/CurrencyBundle/Doctrine/ORM/CurrencyRepository.php
@@ -0,0 +1,25 @@
+
+ */
+class CurrencyRepository extends EntityRepository implements CurrencyRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json
index 2f5d2c8370..50155437e9 100644
--- a/src/Sylius/Bundle/CurrencyBundle/composer.json
+++ b/src/Sylius/Bundle/CurrencyBundle/composer.json
@@ -25,12 +25,12 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/currency": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/intl": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/currency": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/intl": "^6.3.2",
+ "symfony/templating": "^6.3.0"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -42,9 +42,9 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
"twig/twig": "^2.12 || ^3.3"
},
"config": {
@@ -54,7 +54,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json
index cfe7082459..416c0d3678 100644
--- a/src/Sylius/Bundle/CustomerBundle/composer.json
+++ b/src/Sylius/Bundle/CustomerBundle/composer.json
@@ -35,12 +35,12 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/orm": "^2.13",
"egulias/email-validator": "^3.1",
- "sylius/customer": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
+ "sylius/customer": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
"webmozart/assert": "^1.9"
},
"conflict": {
@@ -51,9 +51,9 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2"
},
"config": {
"allow-plugins": {
@@ -62,7 +62,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json
index 4005a9b0be..96afa467ee 100644
--- a/src/Sylius/Bundle/InventoryBundle/composer.json
+++ b/src/Sylius/Bundle/InventoryBundle/composer.json
@@ -26,12 +26,12 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/inventory": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/inventory": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/templating": "^6.3.0",
+ "symfony/validator": "^6.3.4"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -42,8 +42,8 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
"twig/twig": "^2.12 || ^3.3"
},
"config": {
@@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json
index 78b51cb31c..810cb87526 100644
--- a/src/Sylius/Bundle/LocaleBundle/composer.json
+++ b/src/Sylius/Bundle/LocaleBundle/composer.json
@@ -26,11 +26,11 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/locale": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/locale": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/templating": "^6.3.0"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -43,8 +43,8 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
"twig/twig": "^2.12 || ^3.3"
},
"config": {
@@ -54,7 +54,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json
index 013b125d3f..49406341f7 100644
--- a/src/Sylius/Bundle/MoneyBundle/composer.json
+++ b/src/Sylius/Bundle/MoneyBundle/composer.json
@@ -25,11 +25,11 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/intl": "^5.4.21 || ^6.0",
- "symfony/templating": "^5.4.21 || ^6.0",
+ "php": "^8.2",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/intl": "^6.3.2",
+ "symfony/templating": "^6.3.0",
"webmozart/assert": "^1.9"
},
"conflict": {
@@ -41,10 +41,10 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "sylius/currency-bundle": "^1.12",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
+ "sylius/currency-bundle": "^2.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
"twig/twig": "^2.12 || ^3.3"
},
"config": {
@@ -54,7 +54,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json
index fb6906de1a..2cf8c50adc 100644
--- a/src/Sylius/Bundle/OrderBundle/composer.json
+++ b/src/Sylius/Bundle/OrderBundle/composer.json
@@ -27,15 +27,15 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"stof/doctrine-extensions-bundle": "^1.4",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
- "sylius/money-bundle": "^1.12",
- "sylius/order": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
+ "sylius/money-bundle": "^2.0",
+ "sylius/order": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4",
"symfony/service-contracts": "^2.5 || ^3.0",
- "symfony/templating": "^5.4.21 || ^6.0"
+ "symfony/templating": "^6.3.0"
},
"conflict": {
"doctrine/orm": ">= 2.16.0",
@@ -47,9 +47,9 @@
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/form": "^6.3.2",
+ "symfony/validator": "^6.3.4"
},
"config": {
"allow-plugins": {
@@ -58,7 +58,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json
index ec6e9c81ca..af3427461b 100644
--- a/src/Sylius/Bundle/PaymentBundle/composer.json
+++ b/src/Sylius/Bundle/PaymentBundle/composer.json
@@ -26,10 +26,10 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/payment": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/payment": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4"
},
"conflict": {
"doctrine/orm": "2.15.2",
@@ -41,9 +41,9 @@
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "sylius/locale-bundle": "^1.12",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0"
+ "sylius/locale-bundle": "^2.0",
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4"
},
"config": {
"allow-plugins": {
@@ -52,7 +52,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json
index d88580785e..a793b70dfa 100644
--- a/src/Sylius/Bundle/PayumBundle/composer.json
+++ b/src/Sylius/Bundle/PayumBundle/composer.json
@@ -28,19 +28,19 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"payum/offline": "^1.7.3",
"payum/payum-bundle": "^2.5",
- "sylius/core": "^1.12",
- "sylius/currency": "^1.12",
- "sylius/order-bundle": "^1.12",
- "sylius/payment-bundle": "^1.12",
- "sylius/resource-bundle": "^1.9",
+ "sylius/core": "^2.0",
+ "sylius/currency": "^2.0",
+ "sylius/order-bundle": "^2.0",
+ "sylius/payment-bundle": "^2.0",
+ "sylius/resource-bundle": "^1.10",
"php-http/httplug": "^2.4"
},
"require-dev": {
"phpspec/phpspec": "^7.2",
- "symfony/dependency-injection": "^5.4.21 || ^6.0"
+ "symfony/dependency-injection": "^6.3.4"
},
"suggest": {
"payum/paypal-express-checkout-nvp": "To use PayPal Express Chekout NVP",
@@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ProductBundle/Controller/ProductSlugController.php b/src/Sylius/Bundle/ProductBundle/Controller/ProductSlugController.php
index 752d5ba340..bf6d2aefd5 100644
--- a/src/Sylius/Bundle/ProductBundle/Controller/ProductSlugController.php
+++ b/src/Sylius/Bundle/ProductBundle/Controller/ProductSlugController.php
@@ -18,33 +18,19 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Webmozart\Assert\Assert;
class ProductSlugController extends AbstractController
{
- public function __construct(private ?SlugGeneratorInterface $slugGenerator = null)
+ public function __construct(private readonly SlugGeneratorInterface $slugGenerator)
{
- if ($this->slugGenerator === null) {
- trigger_deprecation(
- 'sylius/product-bundle',
- '1.11',
- 'Not passing a $slugGenerator to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
public function generateAction(Request $request): Response
{
$name = $request->query->get('name');
+ Assert::string($name);
- if ($this->slugGenerator !== null) {
- return new JsonResponse([
- 'slug' => $this->slugGenerator->generate((string) $name),
- ]);
- }
-
- return new JsonResponse([
- 'slug' => $this->container->get('sylius.generator.slug')->generate($name),
- ]);
+ return new JsonResponse(['slug' => $this->slugGenerator->generate($name)]);
}
}
diff --git a/src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php b/src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
index abff96e071..ef04898593 100644
--- a/src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
+++ b/src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
@@ -13,6 +13,17 @@ declare(strict_types=1);
namespace Sylius\Bundle\ProductBundle\DependencyInjection;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationTypeRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductAssociationTypeTranslationRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionTranslationRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionValueRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductOptionValueTranslationRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductTranslationRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductVariantRepository;
+use Sylius\Bundle\ProductBundle\Doctrine\ORM\ProductVariantTranslationRepository;
use Sylius\Bundle\ProductBundle\Form\Type\ProductAssociationType;
use Sylius\Bundle\ProductBundle\Form\Type\ProductAssociationTypeTranslationType;
use Sylius\Bundle\ProductBundle\Form\Type\ProductAssociationTypeType;
@@ -91,7 +102,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(Product::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->scalarNode('form')->defaultValue(ProductType::class)->cannotBeEmpty()->end()
->end()
@@ -106,7 +117,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ProductTranslationType::class)->cannotBeEmpty()->end()
->end()
@@ -125,7 +136,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductVariant::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductVariantInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductVariantRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->scalarNode('form')->defaultValue(ProductVariantType::class)->cannotBeEmpty()->end()
->end()
@@ -140,7 +151,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductVariantTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductVariantTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductVariantTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ProductVariantTranslationType::class)->cannotBeEmpty()->end()
->end()
@@ -159,7 +170,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductOption::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductOptionInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductOptionRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->scalarNode('form')->defaultValue(ProductOptionType::class)->cannotBeEmpty()->end()
->end()
@@ -174,7 +185,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductOptionTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductOptionTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductOptionTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ProductOptionTranslationType::class)->cannotBeEmpty()->end()
->end()
@@ -193,7 +204,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductOptionValue::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductOptionValueInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductOptionValueRepository::class)->cannotBeEmpty()->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(ProductOptionValueType::class)->cannotBeEmpty()->end()
->end()
@@ -210,7 +221,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductOptionValueTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductOptionValueTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductOptionValueTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(ProductOptionValueTranslationType::class)->cannotBeEmpty()->end()
->end()
@@ -230,7 +241,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('interface')->defaultValue(ProductAssociationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductAssociationRepository::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(ProductAssociationType::class)->cannotBeEmpty()->end()
->end()
->end()
@@ -247,7 +258,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('interface')->defaultValue(ProductAssociationTypeModelInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductAssociationTypeRepository::class)->cannotBeEmpty()->end()
->scalarNode('form')->defaultValue(ProductAssociationTypeType::class)->cannotBeEmpty()->end()
->end()
->end()
@@ -261,7 +272,7 @@ final class Configuration implements ConfigurationInterface
->scalarNode('model')->defaultValue(ProductAssociationTypeTranslation::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(ProductAssociationTypeTranslationInterface::class)->cannotBeEmpty()->end()
->scalarNode('controller')->defaultValue(ResourceController::class)->cannotBeEmpty()->end()
- ->scalarNode('repository')->cannotBeEmpty()->end()
+ ->scalarNode('repository')->defaultValue(ProductAssociationTypeTranslationRepository::class)->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->scalarNode('form')->defaultValue(ProductAssociationTypeTranslationType::class)->cannotBeEmpty()->end()
->end()
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationRepository.php
new file mode 100644
index 0000000000..837aef9a44
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductAssociationRepository extends EntityRepository implements ProductAssociationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationTypeTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationTypeTranslationRepository.php
new file mode 100644
index 0000000000..1a0bf83926
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAssociationTypeTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductAssociationTypeTranslationRepository extends EntityRepository implements ProductAssociationTypeTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeRepository.php
new file mode 100644
index 0000000000..6ff3de47fd
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductAttributeRepository extends EntityRepository implements ProductAttributeRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeTranslationRepository.php
new file mode 100644
index 0000000000..8bd601fbb0
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductAttributeTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductAttributeTranslationRepository extends EntityRepository implements ProductAttributeTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionTranslationRepository.php
new file mode 100644
index 0000000000..75aeeb7c78
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductOptionTranslationRepository extends EntityRepository implements ProductOptionTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueRepository.php
new file mode 100644
index 0000000000..a6b275d794
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductOptionValueRepository extends EntityRepository implements ProductOptionValueRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueTranslationRepository.php
new file mode 100644
index 0000000000..566a74a71b
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductOptionValueTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductOptionValueTranslationRepository extends EntityRepository implements ProductOptionValueTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductTranslationRepository.php
new file mode 100644
index 0000000000..325cdb269d
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductTranslationRepository extends EntityRepository implements ProductTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductVariantTranslationRepository.php b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductVariantTranslationRepository.php
new file mode 100644
index 0000000000..2d6e81d039
--- /dev/null
+++ b/src/Sylius/Bundle/ProductBundle/Doctrine/ORM/ProductVariantTranslationRepository.php
@@ -0,0 +1,27 @@
+
+ */
+class ProductVariantTranslationRepository extends EntityRepository implements ProductVariantTranslationRepositoryInterface
+{
+}
diff --git a/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php b/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php
index 17c73ec262..c5004e162b 100644
--- a/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php
+++ b/src/Sylius/Bundle/ProductBundle/Form/EventSubscriber/GenerateProductVariantsSubscriber.php
@@ -21,25 +21,14 @@ use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Webmozart\Assert\Assert;
-final class GenerateProductVariantsSubscriber implements EventSubscriberInterface
+final readonly class GenerateProductVariantsSubscriber implements EventSubscriberInterface
{
public function __construct(
private ProductVariantGeneratorInterface $generator,
- private SessionInterface|RequestStack $requestStackOrSession,
+ private RequestStack $requestStack,
) {
- if ($requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/product-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public static function getSubscribedEvents(): array
@@ -65,14 +54,7 @@ final class GenerateProductVariantsSubscriber implements EventSubscriberInterfac
private function getFlashBag(): FlashBagInterface
{
- if ($this->requestStackOrSession instanceof RequestStack) {
- $flashBag = $this->requestStackOrSession->getSession()->getBag('flashes');
- Assert::isInstanceOf($flashBag, FlashBagInterface::class);
-
- return $flashBag;
- }
-
- $flashBag = $this->requestStackOrSession->getBag('flashes');
+ $flashBag = $this->requestStack->getSession()->getBag('flashes');
Assert::isInstanceOf($flashBag, FlashBagInterface::class);
return $flashBag;
diff --git a/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionChoiceType.php b/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionChoiceType.php
deleted file mode 100644
index 00e165ec24..0000000000
--- a/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionChoiceType.php
+++ /dev/null
@@ -1,65 +0,0 @@
-addModelTransformer(new CollectionToArrayTransformer());
- }
- }
-
- public function configureOptions(OptionsResolver $resolver): void
- {
- $resolver->setDefaults([
- 'choices' => fn (Options $options): array => $this->productOptionRepository->findAll(),
- 'choice_value' => 'code',
- 'choice_label' => 'name',
- 'choice_translation_domain' => false,
- ]);
- }
-
- public function getParent(): string
- {
- return ChoiceType::class;
- }
-
- public function getBlockPrefix(): string
- {
- return 'sylius_product_option_choice';
- }
-}
diff --git a/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionValueChoiceType.php b/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionValueChoiceType.php
index 486291abe6..4c130cf784 100644
--- a/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionValueChoiceType.php
+++ b/src/Sylius/Bundle/ProductBundle/Form/Type/ProductOptionValueChoiceType.php
@@ -23,19 +23,8 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
final class ProductOptionValueChoiceType extends AbstractType
{
- private ?AvailableProductOptionValuesResolverInterface $availableProductOptionValuesResolver;
-
- public function __construct(?AvailableProductOptionValuesResolverInterface $availableProductOptionValuesResolver = null)
+ public function __construct(private readonly AvailableProductOptionValuesResolverInterface $availableProductOptionValuesResolver)
{
- if (null === $availableProductOptionValuesResolver) {
- trigger_deprecation(
- 'sylius/product-bundle',
- '1.8',
- 'Not passing an $availableProductOptionValuesResolver through constructor is deprecated and will be removed in Sylius 2.0',
- );
- }
-
- $this->availableProductOptionValuesResolver = $availableProductOptionValuesResolver;
}
public function configureOptions(OptionsResolver $resolver): void
@@ -51,17 +40,6 @@ final class ProductOptionValueChoiceType extends AbstractType
);
}
- if (null === $this->availableProductOptionValuesResolver) {
- throw new \RuntimeException(
- sprintf(
- 'Cannot provide only available values in "%s" because a "%s" is required but ' .
- 'none has been set.',
- __CLASS__,
- AvailableProductOptionValuesResolverInterface::class,
- ),
- );
- }
-
return $this->availableProductOptionValuesResolver->resolve(
$options['product'],
$productOption,
diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml
index 099428c8ef..87687c721e 100644
--- a/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml
+++ b/src/Sylius/Bundle/ProductBundle/Resources/config/services/form.xml
@@ -168,11 +168,6 @@
-
-
%sylius.model.product_option_value.class%
%sylius.form.type.product_option_value.validation_groups%
diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json
index 4d30e5fdf7..2ee497da99 100644
--- a/src/Sylius/Bundle/ProductBundle/composer.json
+++ b/src/Sylius/Bundle/ProductBundle/composer.json
@@ -26,13 +26,13 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"stof/doctrine-extensions-bundle": "^1.4",
- "sylius/attribute-bundle": "^1.12",
- "sylius/locale-bundle": "^1.12",
- "sylius/product": "^1.12",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "sylius/attribute-bundle": "^2.0",
+ "sylius/locale-bundle": "^2.0",
+ "sylius/product": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/framework-bundle": "^6.3.4"
},
"require-dev": {
"doctrine/orm": "^2.13",
@@ -40,10 +40,10 @@
"mockery/mockery": "^1.4",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
+ "symfony/validator": "^6.3.4"
},
"conflict": {
"doctrine/orm": "2.15.2",
@@ -56,7 +56,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ProductBundle/spec/Form/EventSubscriber/GenerateProductVariantsSubscriberSpec.php b/src/Sylius/Bundle/ProductBundle/spec/Form/EventSubscriber/GenerateProductVariantsSubscriberSpec.php
index 5cbf43b54e..cdc054c52e 100644
--- a/src/Sylius/Bundle/ProductBundle/spec/Form/EventSubscriber/GenerateProductVariantsSubscriberSpec.php
+++ b/src/Sylius/Bundle/ProductBundle/spec/Form/EventSubscriber/GenerateProductVariantsSubscriberSpec.php
@@ -78,22 +78,4 @@ final class GenerateProductVariantsSubscriberSpec extends ObjectBehavior
$this->preSetData($event);
}
-
- function it_can_retrieve_session_directly_for_bc_layer(
- FormEvent $event,
- ProductInterface $product,
- ProductVariantGeneratorInterface $generator,
- Session $session,
- FlashBagInterface $flashBag,
- ): void {
- $this->let($generator, $session);
-
- $event->getData()->willReturn($product);
- $generator->generate($product)->willThrow(new VariantWithNoOptionsValuesException());
- $session->getBag('flashes')->willReturn($flashBag);
-
- $flashBag->add('error', 'sylius.product_variant.cannot_generate_variants')->shouldBeCalled();
-
- $this->preSetData($event);
- }
}
diff --git a/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php b/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php
index 015ff4e5d5..f71da84c8c 100644
--- a/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php
+++ b/src/Sylius/Bundle/PromotionBundle/Criteria/DateRange.php
@@ -14,12 +14,12 @@ declare(strict_types=1);
namespace Sylius\Bundle\PromotionBundle\Criteria;
use Doctrine\ORM\QueryBuilder;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Promotion\Model\CatalogPromotionInterface;
+use Symfony\Component\Clock\ClockInterface;
final class DateRange implements CriteriaInterface
{
- public function __construct(private DateTimeProviderInterface $calendar)
+ public function __construct(private ClockInterface $clock)
{
}
@@ -30,7 +30,7 @@ final class DateRange implements CriteriaInterface
$queryBuilder
->andWhere(sprintf('%s.startDate IS NULL OR %s.startDate <= :date', $root, $root))
->andWhere(sprintf('%s.endDate IS NULL OR %s.endDate > :date', $root, $root))
- ->setParameter('date', $this->calendar->now())
+ ->setParameter('date', $this->clock->now())
;
return $queryBuilder;
@@ -38,9 +38,11 @@ final class DateRange implements CriteriaInterface
public function verify(CatalogPromotionInterface $catalogPromotion): bool
{
+ $now = $this->clock->now();
+
return
- ($catalogPromotion->getStartDate() === null || $catalogPromotion->getStartDate() <= $this->calendar->now()) &&
- ($catalogPromotion->getEndDate() === null || $catalogPromotion->getEndDate() > $this->calendar->now())
+ ($catalogPromotion->getStartDate() === null || $catalogPromotion->getStartDate() <= $now) &&
+ ($catalogPromotion->getEndDate() === null || $catalogPromotion->getEndDate() > $now)
;
}
}
diff --git a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml
index 19b413679e..a6d6402834 100644
--- a/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml
+++ b/src/Sylius/Bundle/PromotionBundle/Resources/config/services/criteria.xml
@@ -19,7 +19,7 @@
-
diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json
index fb6759cbaf..5caa0240e2 100644
--- a/src/Sylius/Bundle/PromotionBundle/composer.json
+++ b/src/Sylius/Bundle/PromotionBundle/composer.json
@@ -27,14 +27,15 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"stof/doctrine-extensions-bundle": "^1.4",
- "sylius/calendar": "^0.3 || ^0.4 || ^0.5",
- "sylius/money-bundle": "^1.12",
- "sylius/promotion": "^1.12",
- "sylius/registry": "^1.5",
- "sylius/resource-bundle": "^1.9",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "sylius/calendar": "^0.5",
+ "sylius/money-bundle": "^2.0",
+ "sylius/promotion": "^2.0",
+ "sylius/registry": "^1.6",
+ "sylius/resource-bundle": "^1.10",
+ "symfony/clock": "^6.3.4",
+ "symfony/framework-bundle": "^6.3.4"
},
"conflict": {
"doctrine/orm": "2.15.2",
@@ -48,10 +49,10 @@
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
+ "symfony/validator": "^6.3.4"
},
"config": {
"allow-plugins": {
@@ -60,7 +61,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/PromotionBundle/spec/Criteria/DateRangeSpec.php b/src/Sylius/Bundle/PromotionBundle/spec/Criteria/DateRangeSpec.php
index c27248b20b..d41ac80350 100644
--- a/src/Sylius/Bundle/PromotionBundle/spec/Criteria/DateRangeSpec.php
+++ b/src/Sylius/Bundle/PromotionBundle/spec/Criteria/DateRangeSpec.php
@@ -16,14 +16,14 @@ namespace spec\Sylius\Bundle\PromotionBundle\Criteria;
use Doctrine\ORM\QueryBuilder;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\PromotionBundle\Criteria\CriteriaInterface;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Promotion\Model\CatalogPromotionInterface;
+use Symfony\Component\Clock\ClockInterface;
final class DateRangeSpec extends ObjectBehavior
{
- function let(DateTimeProviderInterface $calendar): void
+ function let(ClockInterface $clock): void
{
- $this->beConstructedWith($calendar);
+ $this->beConstructedWith($clock);
}
function it_implements_criteria_interface(): void
@@ -31,12 +31,12 @@ final class DateRangeSpec extends ObjectBehavior
$this->shouldImplement(CriteriaInterface::class);
}
- function it_adds_filters_to_query_builder(DateTimeProviderInterface $calendar, QueryBuilder $queryBuilder): void
+ function it_adds_filters_to_query_builder(ClockInterface $clock, QueryBuilder $queryBuilder): void
{
$queryBuilder->getRootAliases()->willReturn(['o']);
- $now = new \DateTime();
- $calendar->now()->willReturn($now);
+ $now = new \DateTimeImmutable();
+ $clock->now()->willReturn($now);
$queryBuilder->andWhere('o.startDate IS NULL OR o.startDate <= :date')->willReturn($queryBuilder)->shouldBeCalled();
$queryBuilder->andWhere('o.endDate IS NULL OR o.endDate > :date')->willReturn($queryBuilder)->shouldBeCalled();
@@ -47,12 +47,12 @@ final class DateRangeSpec extends ObjectBehavior
function it_verifies_catalog_promotion(
CatalogPromotionInterface $catalogPromotion,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
): void {
- $tomorrow = new \DateTime('+1day');
- $yesterday = new \DateTime('-1day');
- $now = new \DateTime();
- $calendar->now()->willReturn($now);
+ $tomorrow = new \DateTimeImmutable('+1day');
+ $yesterday = new \DateTimeImmutable('-1day');
+ $now = new \DateTimeImmutable();
+ $clock->now()->willReturn($now);
$catalogPromotion->getStartDate()->willReturn($yesterday);
$catalogPromotion->getEndDate()->willReturn($tomorrow);
diff --git a/src/Sylius/Bundle/PromotionBundle/test/app/AppKernel.php b/src/Sylius/Bundle/PromotionBundle/test/app/AppKernel.php
index 6115441556..7b4acdf00e 100644
--- a/src/Sylius/Bundle/PromotionBundle/test/app/AppKernel.php
+++ b/src/Sylius/Bundle/PromotionBundle/test/app/AppKernel.php
@@ -25,7 +25,6 @@ class AppKernel extends Kernel
new JMS\SerializerBundle\JMSSerializerBundle(),
new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
- new Sylius\Calendar\SyliusCalendarBundle(),
new Sylius\Bundle\PromotionBundle\SyliusPromotionBundle(),
new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json
index 911618c08d..5148d37dd4 100644
--- a/src/Sylius/Bundle/ReviewBundle/composer.json
+++ b/src/Sylius/Bundle/ReviewBundle/composer.json
@@ -38,13 +38,13 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"stof/doctrine-extensions-bundle": "^1.4",
- "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
- "sylius/resource-bundle": "^1.9",
- "sylius/review": "^1.12",
- "sylius/user-bundle": "^1.12",
- "symfony/framework-bundle": "^5.4.21 || ^6.0"
+ "sylius/mailer-bundle": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "sylius/review": "^2.0",
+ "sylius/user-bundle": "^2.0",
+ "symfony/framework-bundle": "^6.3.4"
},
"conflict": {
"stof/doctrine-extensions-bundle": "1.8.0",
@@ -55,11 +55,11 @@
"phpspec/prophecy-phpunit": "^2.0",
"phpunit/phpunit": "^9.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
- "symfony/browser-kit": "^5.4.21 || ^6.0",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/security-bundle": "^5.4.21 || ^6.0",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "symfony/browser-kit": "^6.3.2",
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/form": "^6.3.2",
+ "symfony/security-bundle": "^6.3.4",
+ "symfony/validator": "^6.3.4"
},
"config": {
"allow-plugins": {
@@ -68,7 +68,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ShippingBundle/Assigner/ShippingDateAssigner.php b/src/Sylius/Bundle/ShippingBundle/Assigner/ShippingDateAssigner.php
index d333f6fbc6..92b51e19bc 100644
--- a/src/Sylius/Bundle/ShippingBundle/Assigner/ShippingDateAssigner.php
+++ b/src/Sylius/Bundle/ShippingBundle/Assigner/ShippingDateAssigner.php
@@ -13,34 +13,17 @@ declare(strict_types=1);
namespace Sylius\Bundle\ShippingBundle\Assigner;
-use Sylius\Bundle\ShippingBundle\Provider\DateTimeProvider;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Shipping\Model\ShipmentInterface;
+use Symfony\Component\Clock\ClockInterface;
final class ShippingDateAssigner implements ShippingDateAssignerInterface
{
- public function __construct(private DateTimeProvider|DateTimeProviderInterface $calendar)
+ public function __construct(private ClockInterface $clock)
{
- if ($calendar instanceof DateTimeProvider) {
- trigger_deprecation(
- 'sylius/shipping-bundle',
- '1.11',
- 'Passing a "%s" to "%s" constructor is deprecated and will be prohibited in Sylius 2.0. Use "%s" instead.',
- DateTimeProvider::class,
- self::class,
- DateTimeProviderInterface::class,
- );
- }
}
public function assign(ShipmentInterface $shipment): void
{
- if ($this->calendar instanceof DateTimeProviderInterface) {
- $shipment->setShippedAt($this->calendar->now());
-
- return;
- }
-
- $shipment->setShippedAt($this->calendar->today());
+ $shipment->setShippedAt($this->clock->now());
}
}
diff --git a/src/Sylius/Bundle/ShippingBundle/Provider/Calendar.php b/src/Sylius/Bundle/ShippingBundle/Provider/Calendar.php
index 6c53231640..d2b29df8da 100644
--- a/src/Sylius/Bundle/ShippingBundle/Provider/Calendar.php
+++ b/src/Sylius/Bundle/ShippingBundle/Provider/Calendar.php
@@ -13,12 +13,14 @@ declare(strict_types=1);
namespace Sylius\Bundle\ShippingBundle\Provider;
+use Symfony\Component\Clock\Clock;
+
trigger_deprecation(
'sylius/shipping-bundle',
'1.11',
'The "%s" class is deprecated and will be removed in Sylius 2.0. Use "%s" instead.',
Calendar::class,
- 'Symfony\Component\Clock\Clock',
+ Clock::class,
);
/**
diff --git a/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml
index 4bb270f88e..fca841a3b2 100644
--- a/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShippingBundle/Resources/config/services.xml
@@ -76,7 +76,7 @@
-
- The "%service_id%" is deprecated since Sylius 1.8 and will be removed in 2.0. Use "sylius.shipping_method_eligibility_checker" instead
-
- $data
+ * @param array $recipients
+ */
public function sendContactRequest(
array $data,
array $recipients,
- ?ChannelInterface $channel = null,
- ?string $localeCode = null,
+ ChannelInterface $channel,
+ string $localeCode,
): void;
}
diff --git a/src/Sylius/Bundle/ShopBundle/EmailManager/OrderEmailManager.php b/src/Sylius/Bundle/ShopBundle/EmailManager/OrderEmailManager.php
index 5648a05d84..f77eb805af 100644
--- a/src/Sylius/Bundle/ShopBundle/EmailManager/OrderEmailManager.php
+++ b/src/Sylius/Bundle/ShopBundle/EmailManager/OrderEmailManager.php
@@ -19,6 +19,7 @@ use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Mailer\Sender\SenderInterface;
use Webmozart\Assert\Assert;
+// This whole class needs to go
final class OrderEmailManager implements OrderEmailManagerInterface
{
public function __construct(
diff --git a/src/Sylius/Bundle/ShopBundle/EventListener/CustomerEmailUpdaterListener.php b/src/Sylius/Bundle/ShopBundle/EventListener/CustomerEmailUpdaterListener.php
index 9a6b2c2e18..95249d27ea 100644
--- a/src/Sylius/Bundle/ShopBundle/EventListener/CustomerEmailUpdaterListener.php
+++ b/src/Sylius/Bundle/ShopBundle/EventListener/CustomerEmailUpdaterListener.php
@@ -25,30 +25,19 @@ use Sylius\Component\User\Security\Generator\GeneratorInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\GenericEvent;
use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Webmozart\Assert\Assert;
-final class CustomerEmailUpdaterListener
+final readonly class CustomerEmailUpdaterListener
{
public function __construct(
private GeneratorInterface $tokenGenerator,
private ChannelContextInterface $channelContext,
private EventDispatcherInterface $eventDispatcher,
- private RequestStack|SessionInterface $requestStackOrSession,
+ private RequestStack $requestStack,
private SectionProviderInterface $uriBasedSectionContext,
private TokenStorageInterface $tokenStorage,
) {
- if ($requestStackOrSession instanceof SessionInterface) {
- trigger_deprecation(
- 'sylius/shop-bundle',
- '1.12',
- 'Passing an instance of %s as constructor argument for %s is deprecated and will be removed in Sylius 2.0. Pass an instance of %s instead.',
- SessionInterface::class,
- self::class,
- RequestStack::class,
- );
- }
}
public function eraseVerification(GenericEvent $event): void
@@ -109,7 +98,7 @@ final class CustomerEmailUpdaterListener
if (!$user->isEnabled() && !$user->isVerified() && null !== $user->getEmailVerificationToken()) {
$this->eventDispatcher->dispatch(new GenericEvent($user), UserEvents::REQUEST_VERIFICATION_TOKEN);
- $flashBag = FlashBagProvider::getFlashBag($this->requestStackOrSession);
+ $flashBag = FlashBagProvider::getFlashBag($this->requestStack);
$flashBag->add('success', 'sylius.user.verify_email_request');
}
}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/app/config.yml b/src/Sylius/Bundle/ShopBundle/Resources/config/app/config.yml
index 8bd89a2c9a..8c20c8e673 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/app/config.yml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/app/config.yml
@@ -18,7 +18,6 @@ webpack_encore:
sylius_grid:
templates:
action:
- pay: "@SyliusShop/Account/Order/Grid/Action/_pay_deprecated.html.twig"
shop_show: "@SyliusShop/Grid/Action/show.html.twig"
shop_pay: "@SyliusShop/Account/Order/Grid/Action/pay.html.twig"
filter:
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
index 5e4e2531b6..7d78b73319 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/ShopBundle/Resources/config/services.xml
@@ -44,9 +44,5 @@
-
-
-
-
-
-
-
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Account/Order/Grid/Action/_pay_deprecated.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Account/Order/Grid/Action/_pay_deprecated.html.twig
deleted file mode 100644
index 67369c78b0..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Account/Order/Grid/Action/_pay_deprecated.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% deprecated 'The "pay" grid action is deprecated, use "shop_pay" instead.' %}
-
-{% include '@SyliusShop/Account/Order/Grid/Action/pay.html.twig' %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/_header.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/_header.html.twig
index ad41295946..ae54c62861 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/_header.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/_header.html.twig
@@ -1,15 +1,9 @@
{% if order.customer.id|default(null) is not null %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Email/contactRequest.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Email/contactRequest.html.twig
index a94c0fa485..a4bee292fd 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Email/contactRequest.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Email/contactRequest.html.twig
@@ -1,10 +1 @@
-{% deprecated 'The "@SyliusShop/Email/contactRequest.html.twig" template is deprecated since Sylius 1.12 and will be removed in Sylius 2.0, use "@SyliusCore/Email/contactRequest.html.twig" instead.' %}
-{% extends '@SyliusShop/Email/layout.html.twig' %}
-
-{% block subject %}
- {% include '@SyliusCore/Email/Blocks/ContactRequest/_subject.html.twig' %}
-{% endblock %}
-
-{% block content %}
- {% include '@SyliusCore/Email/Blocks/ContactRequest/_content.html.twig' %}
-{% endblock %}
+{% extends '@SyliusCore/Email/contactRequest.html.twig' %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Email/orderConfirmation.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Email/orderConfirmation.html.twig
index f2e1b3aeb9..5599f82ec1 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Email/orderConfirmation.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Email/orderConfirmation.html.twig
@@ -1,10 +1 @@
-{% deprecated 'The "@SyliusShop/Email/orderConfirmation.html.twig" template is deprecated since Sylius 1.8 and will be removed in Sylius 2.0, use "@SyliusCore/Email/orderConfirmation.html.twig" instead.' %}
-{% extends '@SyliusShop/Email/layout.html.twig' %}
-
-{% block subject %}
- {% include '@SyliusCore/Email/Blocks/OrderConfirmation/_subject.html.twig' %}
-{% endblock %}
-
-{% block content %}
- {% include '@SyliusCore/Email/Blocks/OrderConfirmation/_content.html.twig' %}
-{% endblock %}
+{% extends '@SyliusCore/Email/orderConfirmation.html.twig' %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Homepage/_banner.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Homepage/_banner.html.twig
index 21a6bbe88f..8486493510 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Homepage/_banner.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Homepage/_banner.html.twig
@@ -1,10 +1,6 @@
 }})
- {% else %}
-  }})
- {% endif %}
+
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Header/_logo.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Header/_logo.html.twig
index 871178fc50..84b8df56ed 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Header/_logo.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Header/_logo.html.twig
@@ -1,9 +1,5 @@
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Show/_images.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Show/_images.html.twig
index e9ea345943..3a94e189c8 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Show/_images.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/Show/_images.html.twig
@@ -7,11 +7,7 @@
{% set original_path = source_path|imagine_filter('sylius_shop_product_original') %}
{% set path = source_path|imagine_filter(filter|default('sylius_shop_product_large_thumbnail')) %}
{% else %}
- {% if use_webpack %}
- {% set original_path = asset('build/shop/images/400x300.png', 'shop') %}
- {% else %}
- {% set original_path = asset('assets/shop/img/400x300.png') %}
- {% endif %}
+ {% set original_path = asset('build/shop/images/400x300.png', 'shop') %}
{% set path = original_path %}
{% endif %}
@@ -26,11 +22,7 @@
- {% if use_webpack %}
-  }})
- {% else %}
-  }})
- {% endif %}
+
- {% else %}
-
- {% endif %}
+
{{ 'sylius.homepage.banner_content'|trans }}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Footer/Grid/_plus.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Footer/Grid/_plus.html.twig
index e7a7810de1..0bf5a064c9 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Footer/Grid/_plus.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Layout/Footer/Grid/_plus.html.twig
@@ -4,10 +4,6 @@
Need even more features?
Check Sylius Plus out!
- {% if use_webpack %}
-
- {% else %}
-
- {% endif %}
+
{% for image in product.images %}
- {% if use_webpack %}
- {% set path = image.path is not null ? image.path|imagine_filter('sylius_shop_product_small_thumbnail') : asset('build/shop/images/200x200.png') %}
- {% else %}
- {% set path = image.path is not null ? image.path|imagine_filter('sylius_shop_product_small_thumbnail') : asset('assets/shop/img/200x200.png') %}
- {% endif %}
+ {% set path = image.path is not null ? image.path|imagine_filter('sylius_shop_product_small_thumbnail') : asset('build/shop/images/200x200.png') %}
{% if product.isConfigurable() and product.enabledVariants|length > 0 %}
{% include '@SyliusShop/Product/Show/_imageVariants.html.twig' %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/_mainImage.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/_mainImage.html.twig
index 5db52da20b..cb7d6a58b7 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/Product/_mainImage.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/Product/_mainImage.html.twig
@@ -3,11 +3,7 @@
{% elseif product.images.first %}
{% set path = product.images.first.path|imagine_filter(filter|default('sylius_shop_product_thumbnail')) %}
{% else %}
- {% if use_webpack %}
- {% set path = asset('build/shop/images/200x200.png', 'shop') %}
- {% else %}
- {% set path = asset('assets/shop/img/200x200.png') %}
- {% endif %}
+ {% set path = asset('build/shop/images/200x200.png', 'shop') %}
{% endif %}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/_scripts.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/_scripts.html.twig
index 775cf0261f..d1655bb9b3 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/_scripts.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/_scripts.html.twig
@@ -1,5 +1 @@
-{% if use_webpack %}
- {{ encore_entry_script_tags('shop-entry', null, 'shop') }}
-{% else %}
- {% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/shop/js/app.js'} %}
-{% endif %}
+{{ encore_entry_script_tags('shop-entry', null, 'shop') }}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/_styles.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/_styles.html.twig
index 67829396ac..fd2c7cb4ec 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/_styles.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/_styles.html.twig
@@ -1,5 +1 @@
-{% if use_webpack %}
- {{ encore_entry_link_tags('shop-entry', null, 'shop') }}
-{% else %}
- {% include '@SyliusUi/_stylesheets.html.twig' with {'path': 'assets/shop/css/style.css'} %}
-{% endif %}
+{{ encore_entry_link_tags('shop-entry', null, 'shop') }}
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/error.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/error.html.twig
index c25a0a8194..6f460bef03 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/error.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/error.html.twig
@@ -2,11 +2,7 @@
{% block content %}
- {% if use_webpack %}
-
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/error403.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/error403.html.twig
index 91093875c2..e2411e6554 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/error403.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/error403.html.twig
@@ -2,11 +2,7 @@
{% block content %}
- {% if use_webpack %}
-
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/error404.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/error404.html.twig
index fa2faac2b4..827c2c6de8 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/error404.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/error404.html.twig
@@ -2,11 +2,7 @@
{% block content %}
- {% if use_webpack %}
-
diff --git a/src/Sylius/Bundle/ShopBundle/Resources/views/error500.html.twig b/src/Sylius/Bundle/ShopBundle/Resources/views/error500.html.twig
index 31c6763949..efc32fe966 100644
--- a/src/Sylius/Bundle/ShopBundle/Resources/views/error500.html.twig
+++ b/src/Sylius/Bundle/ShopBundle/Resources/views/error500.html.twig
@@ -2,11 +2,7 @@
{% block content %}
- {% if use_webpack %}
-
diff --git a/src/Sylius/Bundle/ShopBundle/Tests/Calculator/OrderItemsSubtotalCalculatorTest.php b/src/Sylius/Bundle/ShopBundle/Tests/Calculator/OrderItemsSubtotalCalculatorTest.php
deleted file mode 100644
index b3c96466d4..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Tests/Calculator/OrderItemsSubtotalCalculatorTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-getSubtotal($this->getOrderMock([
- $this->getOrderItemMock(1000),
- $this->getOrderItemMock(1000),
- ]));
- $this->assertEquals(2000, $subTotal);
- }
-
- /**
- * @test
- *
- * @depends it_can_be_instantiated
- */
- public function it_can_calculate_a_subtotal_if_there_are_no_order_items(
- OrderItemsSubtotalCalculator $calculator,
- ): void {
- $subTotal = $calculator->getSubtotal($this->getOrderMock([]));
- $this->assertEquals(0, $subTotal);
- }
-
- private function getOrderItemMock(int $subTotal): OrderItemInterface
- {
- $orderItem = Mockery::mock(OrderItemInterface::class);
- /** @phpstan-ignore-next-line */
- $orderItem
- ->shouldReceive('getSubTotal')
- ->once()
- ->andReturn($subTotal)
- ;
-
- return $orderItem;
- }
-
- private function getOrderMock(array $orderItems): OrderInterface
- {
- $order = Mockery::mock(OrderInterface::class);
- /** @phpstan-ignore-next-line */
- $order
- ->shouldReceive('getItems->toArray')
- ->once()
- ->andReturn($orderItems)
- ;
-
- return $order;
- }
-}
diff --git a/src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php b/src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php
deleted file mode 100644
index 53150d4996..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Twig/OrderItemsSubtotalExtension.php
+++ /dev/null
@@ -1,54 +0,0 @@
- true]),
- ];
- }
-
- public function getSubtotal(OrderInterface $order): int
- {
- if (null === $this->calculator) {
- return $order->getItemsSubtotal();
- }
-
- return $this->calculator->getSubtotal($order);
- }
-}
diff --git a/src/Sylius/Bundle/ShopBundle/Twig/OrderTaxesTotalExtension.php b/src/Sylius/Bundle/ShopBundle/Twig/OrderTaxesTotalExtension.php
deleted file mode 100644
index 3e813327c7..0000000000
--- a/src/Sylius/Bundle/ShopBundle/Twig/OrderTaxesTotalExtension.php
+++ /dev/null
@@ -1,62 +0,0 @@
-getAmount($order, true);
- }
-
- public function getExcludedTax(OrderInterface $order): int
- {
- return $this->getAmount($order, false);
- }
-
- private function getAmount(OrderInterface $order, bool $isNeutral): int
- {
- return array_reduce(
- $order->getAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->toArray(),
- static fn (int $total, BaseAdjustmentInterface $adjustment) => $isNeutral === $adjustment->isNeutral() ? $total + $adjustment->getAmount() : $total,
- 0,
- );
- }
-}
diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json
index cf285ca92e..b2ca9dba15 100644
--- a/src/Sylius/Bundle/ShopBundle/composer.json
+++ b/src/Sylius/Bundle/ShopBundle/composer.json
@@ -26,12 +26,12 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/core-bundle": "^1.12",
- "sylius/ui-bundle": "^1.12",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/security-bundle": "^5.4.21 || ^6.0",
- "symfony/webpack-encore-bundle": "^1.15",
+ "php": "^8.2",
+ "sylius/core-bundle": "^2.0",
+ "sylius/ui-bundle": "^2.0",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/security-bundle": "^6.3.4",
+ "symfony/webpack-encore-bundle": "^1.17.1",
"twig/intl-extra": "^2.12 || ^3.4",
"twig/twig": "^2.12 || ^3.3"
},
@@ -41,7 +41,7 @@
"mockery/mockery": "^1.4",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4.21 || ^6.0"
+ "symfony/dependency-injection": "^6.3.4"
},
"config": {
"allow-plugins": {
@@ -50,7 +50,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js b/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js
deleted file mode 100644
index f7e206def7..0000000000
--- a/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import { rollup } from 'rollup';
-import { terser } from 'rollup-plugin-terser';
-import babel from '@rollup/plugin-babel';
-import commonjs from '@rollup/plugin-commonjs';
-import concat from 'gulp-concat';
-import dedent from 'dedent';
-import gulp from 'gulp';
-import gulpif from 'gulp-if';
-import gulpSass from 'gulp-sass';
-import inject from '@rollup/plugin-inject';
-import livereload from 'gulp-livereload';
-import merge from 'merge-stream';
-import order from 'gulp-order';
-import realSass from 'sass';
-import resolve from '@rollup/plugin-node-resolve';
-import sourcemaps from 'gulp-sourcemaps';
-import uglifycss from 'gulp-uglifycss';
-import upath from 'upath';
-import yargs from 'yargs';
-
-const sass = gulpSass(realSass);
-
-const { argv } = yargs
- .options({
- rootPath: {
- description: ' path to web assets directory',
- type: 'string',
- requiresArg: true,
- required: true,
- },
- vendorPath: {
- description: ' path to vendor directory',
- type: 'string',
- requiresArg: true,
- required: false,
- },
- nodeModulesPath: {
- description: ' path to node_modules directory',
- type: 'string',
- requiresArg: true,
- required: true,
- },
- });
-
-const env = process.env.GULP_ENV;
-const options = {
- minify: env === 'prod',
- sourcemaps: env !== 'prod',
-};
-
-const rootPath = upath.normalizeSafe(argv.rootPath);
-const shopRootPath = upath.joinSafe(rootPath, 'shop');
-const vendorPath = upath.normalizeSafe(argv.vendorPath || '.');
-const vendorShopPath = vendorPath === '.' ? '.' : upath.joinSafe(vendorPath, 'ShopBundle');
-const vendorUiPath = vendorPath === '.' ? '../UiBundle/' : upath.joinSafe(vendorPath, 'UiBundle');
-const nodeModulesPath = upath.normalizeSafe(argv.nodeModulesPath);
-
-const paths = {
- shop: {
- js: [
- upath.joinSafe(vendorUiPath, 'Resources/private/js/**'),
- upath.joinSafe(vendorShopPath, 'Resources/private/js/**'),
- ],
- sass: [
- upath.joinSafe(vendorUiPath, 'Resources/private/sass/**'),
- upath.joinSafe(vendorShopPath, 'Resources/private/sass/**'),
- ],
- css: [
- upath.joinSafe(nodeModulesPath, 'semantic-ui-css/semantic.min.css'),
- upath.joinSafe(nodeModulesPath, 'lightbox2/dist/css/lightbox.min.css'),
- upath.joinSafe(nodeModulesPath, 'slick-carousel/slick/slick.css'),
- upath.joinSafe(vendorUiPath, 'Resources/private/css/**'),
- upath.joinSafe(vendorShopPath, 'Resources/private/css/**'),
- upath.joinSafe(vendorShopPath, 'Resources/private/scss/**'),
- ],
- img: [
- upath.joinSafe(vendorUiPath, 'Resources/private/img/**'),
- upath.joinSafe(vendorShopPath, 'Resources/private/img/**'),
- ],
- },
-};
-
-const sourcePathMap = [
- {
- sourceDir: upath.relative('', upath.joinSafe(vendorShopPath, 'Resources/private')),
- destPath: '/SyliusShopBundle/',
- },
- {
- sourceDir: upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private')),
- destPath: '/SyliusUiBundle/',
- },
- {
- sourceDir: upath.relative('', nodeModulesPath),
- destPath: '/node_modules/',
- },
-];
-
-const mapSourcePath = function mapSourcePath(sourcePath) {
- const match = sourcePathMap.find(({ sourceDir }) => (
- sourcePath.substring(0, sourceDir.length) === sourceDir
- ));
-
- if (!match) {
- return sourcePath;
- }
-
- const { sourceDir, destPath } = match;
-
- return upath.joinSafe(destPath, sourcePath.substring(sourceDir.length));
-};
-
-export const buildShopJs = async function buildShopJs() {
- const bundle = await rollup({
- input: upath.joinSafe(vendorShopPath, 'Resources/private/js/app.js'),
- plugins: [
- {
- name: 'shim-app',
-
- transform(code, id) {
- if (upath.relative('', id) === upath.relative('', upath.joinSafe(vendorShopPath, 'Resources/private/js/app.js'))) {
- return {
- code: dedent`
- import './shim/shim-polyfill';
- import './shim/shim-jquery';
- import './shim/shim-semantic-ui';
- import './shim/shim-lightbox';
-
- ${code}
- `,
- map: null,
- };
- }
-
- return undefined;
- },
- },
- inject({
- include: `${nodeModulesPath}/**`,
- modules: {
- $: 'jquery',
- jQuery: 'jquery',
- },
- }),
- resolve({
- jail: upath.resolve(nodeModulesPath),
- }),
- commonjs({
- include: `${nodeModulesPath}/**`,
- }),
- babel({
- babelrc: false,
- exclude: `${nodeModulesPath}/**`,
- presets: [
- ['@babel/preset-env', {
- targets: {
- browsers: [
- 'last 2 versions',
- 'Firefox ESR',
- 'IE >= 9',
- 'Android >= 4.0',
- 'iOS >= 7',
- ],
- },
- modules: false,
- exclude: [
- 'transform-async-to-generator',
- 'transform-regenerator',
- ]
- }],
- ],
- plugins: [
- ['fast-async'],
- ['module-resolver', {
- alias: {
- 'sylius/ui': upath.relative('', upath.joinSafe(vendorUiPath, 'Resources/private/js')),
- },
- }],
- ['@babel/plugin-proposal-object-rest-spread', {
- useBuiltIns: false,
- }],
- ],
- }),
- options.minify && terser(),
- ],
- treeshake: false,
- });
-
- await bundle.write({
- file: upath.joinSafe(shopRootPath, 'js/app.js'),
- format: 'iife',
- sourcemap: options.sourcemaps,
- });
-};
-buildShopJs.description = 'Build shop js assets.';
-
-export const buildShopCss = function buildShopCss() {
- const copyStream = merge(
- gulp.src(upath.joinSafe(nodeModulesPath, 'semantic-ui-css/themes/**/*'))
- .pipe(gulp.dest(upath.joinSafe(shopRootPath, 'css/themes'))),
- );
-
- const cssStream = gulp.src(paths.shop.css, { base: './' })
- .pipe(gulpif(options.sourcemaps, sourcemaps.init()))
- .pipe(concat('css-files.css'));
-
- const sassStream = gulp.src(paths.shop.sass, { base: './' })
- .pipe(gulpif(options.sourcemaps, sourcemaps.init()))
- .pipe(sass())
- .pipe(concat('sass-files.scss'));
-
- return merge(
- copyStream,
- merge(cssStream, sassStream)
- .pipe(order(['css-files.css', 'sass-files.scss']))
- .pipe(concat('style.css'))
- .pipe(gulpif(options.minify, uglifycss()))
- .pipe(gulpif(options.sourcemaps, sourcemaps.mapSources(mapSourcePath)))
- .pipe(gulpif(options.sourcemaps, sourcemaps.write('./')))
- .pipe(gulp.dest(upath.joinSafe(shopRootPath, 'css')))
- .pipe(livereload()),
- );
-};
-buildShopCss.description = 'Build shop css assets.';
-
-export const buildShopImg = function buildShopImg() {
- const copyStream = merge(
- gulp.src(upath.joinSafe(nodeModulesPath, 'lightbox2/dist/images/*'))
- .pipe(gulp.dest(upath.joinSafe(shopRootPath, 'images'))),
- );
-
- return merge(
- copyStream,
- gulp.src(paths.shop.img)
- .pipe(gulp.dest(upath.joinSafe(shopRootPath, 'img'))),
- );
-};
-buildShopImg.description = 'Build shop img assets.';
-
-export const watchShop = function watchShop() {
- livereload.listen();
-
- gulp.watch(paths.shop.js, buildShopJs);
- gulp.watch(paths.shop.sass, buildShopCss);
- gulp.watch(paths.shop.css, buildShopCss);
- gulp.watch(paths.shop.img, buildShopImg);
-};
-watchShop.description = 'Watch shop asset sources and rebuild on changes.';
-
-export const build = gulp.parallel(buildShopJs, buildShopCss, buildShopImg);
-build.description = 'Build assets.';
-
-export const watch = gulp.parallel(build, watchShop);
-watch.description = 'Watch asset sources and rebuild on changes.';
-
-gulp.task('shop-js', buildShopJs);
-gulp.task('shop-css', buildShopCss);
-gulp.task('shop-img', buildShopImg);
-gulp.task('shop-watch', watchShop);
-
-export default build;
diff --git a/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml b/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml
index 29198e1148..10b6f9c895 100644
--- a/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml
+++ b/src/Sylius/Bundle/TaxationBundle/Resources/config/services.xml
@@ -47,7 +47,7 @@
-
-
-
-
diff --git a/src/Sylius/Bundle/UserBundle/Security/UserLogin.php b/src/Sylius/Bundle/UserBundle/Security/UserLogin.php
index da27913049..512a30b9a3 100644
--- a/src/Sylius/Bundle/UserBundle/Security/UserLogin.php
+++ b/src/Sylius/Bundle/UserBundle/Security/UserLogin.php
@@ -24,7 +24,7 @@ use Symfony\Component\Security\Core\User\UserCheckerInterface;
use Symfony\Component\Security\Core\User\UserInterface as SymfonyUserInterface;
use Webmozart\Assert\Assert;
-class UserLogin implements UserLoginInterface
+readonly class UserLogin implements UserLoginInterface
{
public function __construct(
private TokenStorageInterface $tokenStorage,
@@ -53,20 +53,11 @@ class UserLogin implements UserLoginInterface
protected function createToken(UserInterface $user, string $firewallName): UsernamePasswordToken
{
Assert::isInstanceOf($user, SymfonyUserInterface::class);
- /** @deprecated parameter credential was deprecated in Symfony 5.4, so in Sylius 1.11 too, in Sylius 2.0 providing 4 arguments will be prohibited. */
- if (3 === (new \ReflectionClass(UsernamePasswordToken::class))->getConstructor()->getNumberOfParameters()) {
- return new UsernamePasswordToken(
- $user,
- $firewallName,
- array_map(/** @param object|string $role */ static function ($role): string { return (string) $role; }, $user->getRoles()),
- );
- }
return new UsernamePasswordToken(
$user,
- null, // @phpstan-ignore-line continue to support Sf < 6
- $firewallName, // @phpstan-ignore-line continue to support Sf < 6
- array_map(/** @param object|string $role */ static fn ($role): string => (string) $role, $user->getRoles()),
+ $firewallName,
+ array_map(static fn (object|string $role): string => $role, $user->getRoles()),
);
}
}
diff --git a/src/Sylius/Bundle/UserBundle/Security/UserPasswordEncoder.php b/src/Sylius/Bundle/UserBundle/Security/UserPasswordEncoder.php
deleted file mode 100644
index c4d36fb910..0000000000
--- a/src/Sylius/Bundle/UserBundle/Security/UserPasswordEncoder.php
+++ /dev/null
@@ -1,54 +0,0 @@
-encoderOrPasswordHasherFactory instanceof EncoderFactoryInterface) {
- return;
- }
-
- throw new \InvalidArgumentException(
- sprintf(
- 'Using the "%s" class with "%s" argument is prohibited, use "%s" service instead.',
- self::class,
- PasswordHasherFactoryInterface::class,
- UserPasswordHasher::class,
- ),
- );
- }
-
- /**
- * @param CredentialsHolderInterface&LegacyPasswordAuthenticatedUserInterface $user
- */
- public function encode(CredentialsHolderInterface $user): string
- {
- $encoder = $this->encoderOrPasswordHasherFactory->getEncoder($user);
-
- return $encoder->encodePassword($user->getPlainPassword(), $user->getSalt());
- }
-}
diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json
index 818b1d883f..d291de32e9 100644
--- a/src/Sylius/Bundle/UserBundle/composer.json
+++ b/src/Sylius/Bundle/UserBundle/composer.json
@@ -37,16 +37,16 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/orm": "^2.13",
"egulias/email-validator": "^3.1",
"sylius-labs/polyfill-symfony-event-dispatcher": "^1.0.1",
"sylius-labs/polyfill-symfony-framework-bundle": "^1.0 || ^1.1",
- "sylius/mailer-bundle": "^1.8 || ^2.0@beta",
- "sylius/resource-bundle": "^1.9",
- "sylius/user": "^1.12",
- "symfony/framework-bundle": "^5.4.21 || ^6.0",
- "symfony/password-hasher": "^5.4.21 || ^6.0",
+ "sylius/mailer-bundle": "^2.0",
+ "sylius/resource-bundle": "^1.10",
+ "sylius/user": "^2.0",
+ "symfony/framework-bundle": "^6.3.4",
+ "symfony/password-hasher": "^6.3.0",
"webmozart/assert": "^1.9"
},
"conflict": {
@@ -58,9 +58,9 @@
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
- "symfony/dependency-injection": "^5.4.21 || ^6.0",
- "symfony/security-bundle": "^5.4.21 || ^6.0",
- "symfony/mailer": "^5.4.21 || ^6.0"
+ "symfony/dependency-injection": "^6.3.4",
+ "symfony/security-bundle": "^6.3.4",
+ "symfony/mailer": "^6.3.0"
},
"suggest": {
"hwi/oauth-bundle": "For OAuth integration"
@@ -73,7 +73,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordEncoderSpec.php b/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordEncoderSpec.php
deleted file mode 100644
index 78bd2b64a9..0000000000
--- a/src/Sylius/Bundle/UserBundle/spec/Security/UserPasswordEncoderSpec.php
+++ /dev/null
@@ -1,95 +0,0 @@
-beConstructedWith($encoderFactory);
- $this->shouldImplement(UserPasswordEncoderInterface::class);
- }
-
- function it_encodes_password(
- EncoderFactoryInterface $encoderFactory,
- PasswordEncoderInterface $passwordEncoder,
- CredentialsHolderInterface $user,
- ): void {
- $this->beConstructedWith($encoderFactory);
- $encoderFactory->getEncoder($user->getWrappedObject())->willReturn($passwordEncoder);
-
- $user->getPlainPassword()->willReturn('topSecretPlainPassword');
- $user->getSalt()->willReturn('typicalSalt');
-
- $passwordEncoder
- ->encodePassword('topSecretPlainPassword', 'typicalSalt')
- ->willReturn('topSecretEncodedPassword')
- ;
-
- $this->encode($user)->shouldReturn('topSecretEncodedPassword');
- }
-
- function it_throws_an_exception_during_instantiation_if_constructed_with_password_hasher_factory(
- PasswordHasherFactoryInterface $passwordHasherFactory,
- PasswordHasherInterface $passwordHasher,
- CredentialsHolderInterface $user,
- ): void {
- $this->beConstructedWith($passwordHasherFactory);
- $passwordHasherFactory->getPasswordHasher($user->getWrappedObject())->shouldNotBeCalled();
-
- $user->getPlainPassword()->shouldNotBeCalled();
- $user->getSalt()->shouldNotBeCalled();
-
- $passwordHasher->hash(Argument::any())->shouldNotBeCalled();
-
- $this->shouldThrow(\InvalidArgumentException::class)->duringInstantiation();
- }
- }
-}
-
-if (Kernel::MAJOR_VERSION === 6) {
- final class UserPasswordEncoderSpec extends ObjectBehavior
- {
- function let(PasswordHasherFactoryInterface $passwordHasherFactory): void
- {
- $this->beConstructedWith($passwordHasherFactory);
- }
-
- function it_throws_an_exception_during_instantiation(
- PasswordHasherFactoryInterface $passwordHasherFactory,
- PasswordHasherInterface $passwordHasher,
- CredentialsHolderInterface $user,
- ): void {
- $passwordHasherFactory->getPasswordHasher($user->getWrappedObject())->shouldNotBeCalled();
-
- $user->getPlainPassword()->shouldNotBeCalled();
- $user->getSalt()->shouldNotBeCalled();
-
- $passwordHasher->hash(Argument::any())->shouldNotBeCalled();
-
- $this->shouldThrow(\InvalidArgumentException::class)->duringInstantiation();
- }
- }
-}
diff --git a/src/Sylius/Component/Addressing/Repository/AddressRepositoryInterface.php b/src/Sylius/Component/Addressing/Repository/AddressRepositoryInterface.php
new file mode 100644
index 0000000000..92d8911c67
--- /dev/null
+++ b/src/Sylius/Component/Addressing/Repository/AddressRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface AddressRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Addressing/Repository/CountryRepositoryInterface.php b/src/Sylius/Component/Addressing/Repository/CountryRepositoryInterface.php
new file mode 100644
index 0000000000..f782ec9632
--- /dev/null
+++ b/src/Sylius/Component/Addressing/Repository/CountryRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface CountryRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Addressing/Repository/ProvinceRepositoryInterface.php b/src/Sylius/Component/Addressing/Repository/ProvinceRepositoryInterface.php
new file mode 100644
index 0000000000..9c9ed640fd
--- /dev/null
+++ b/src/Sylius/Component/Addressing/Repository/ProvinceRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProvinceRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Addressing/Repository/ZoneMemberRepositoryInterface.php b/src/Sylius/Component/Addressing/Repository/ZoneMemberRepositoryInterface.php
new file mode 100644
index 0000000000..6fb5afc17e
--- /dev/null
+++ b/src/Sylius/Component/Addressing/Repository/ZoneMemberRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ZoneMemberRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json
index c212414062..1e0d6691b3 100644
--- a/src/Sylius/Component/Addressing/composer.json
+++ b/src/Sylius/Component/Addressing/composer.json
@@ -26,10 +26,10 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9",
- "symfony/intl": "^5.4.21 || ^6.0"
+ "php": "^8.2",
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10",
+ "symfony/intl": "^6.3.2"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Attribute/Repository/AttributeRepositoryInterface.php b/src/Sylius/Component/Attribute/Repository/AttributeRepositoryInterface.php
new file mode 100644
index 0000000000..c3fd8c6aa7
--- /dev/null
+++ b/src/Sylius/Component/Attribute/Repository/AttributeRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface AttributeRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Attribute/Repository/AttributeTranslationRepositoryInterface.php b/src/Sylius/Component/Attribute/Repository/AttributeTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..3d2b76b728
--- /dev/null
+++ b/src/Sylius/Component/Attribute/Repository/AttributeTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface AttributeTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Attribute/Repository/AttributeValueRepositoryInterface.php b/src/Sylius/Component/Attribute/Repository/AttributeValueRepositoryInterface.php
new file mode 100644
index 0000000000..574d5c410e
--- /dev/null
+++ b/src/Sylius/Component/Attribute/Repository/AttributeValueRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface AttributeValueRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Attribute/composer.json b/src/Sylius/Component/Attribute/composer.json
index 3aaa8c5011..fe7227153b 100644
--- a/src/Sylius/Component/Attribute/composer.json
+++ b/src/Sylius/Component/Attribute/composer.json
@@ -25,11 +25,11 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/collections": "^1.6",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9",
- "symfony/validator": "^5.4.21 || ^6.0"
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10",
+ "symfony/validator": "^6.3.4"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Channel/Context/ChannelNotFoundException.php b/src/Sylius/Component/Channel/Context/ChannelNotFoundException.php
index c0de9d1510..c3dc3586e8 100644
--- a/src/Sylius/Component/Channel/Context/ChannelNotFoundException.php
+++ b/src/Sylius/Component/Channel/Context/ChannelNotFoundException.php
@@ -15,23 +15,12 @@ namespace Sylius\Component\Channel\Context;
class ChannelNotFoundException extends \RuntimeException
{
- public function __construct($messageOrPreviousException = null, ?\Throwable $previousException = null)
+ public function __construct(?string $message = null, ?\Throwable $previousException = null)
{
- $message = 'Channel could not be found! Tip: You can use the Web Debug Toolbar to switch between channels in development.';
-
- if ($messageOrPreviousException instanceof \Throwable) {
- trigger_deprecation(
- 'sylius/channel',
- '1.2',
- 'Passing previous exception as the first argument is deprecated and will be prohibited since Sylius 2.0.',
- );
- $previousException = $messageOrPreviousException;
- }
-
- if (is_string($messageOrPreviousException)) {
- $message = $messageOrPreviousException;
- }
-
- parent::__construct($message, 0, $previousException);
+ parent::__construct(
+ $message ?? 'Channel could not be found! Tip: You can use the Web Debug Toolbar to switch between channels in development.',
+ 0,
+ $previousException,
+ );
}
}
diff --git a/src/Sylius/Component/Channel/Repository/ChannelRepositoryInterface.php b/src/Sylius/Component/Channel/Repository/ChannelRepositoryInterface.php
index bfcb202367..9ed873a237 100644
--- a/src/Sylius/Component/Channel/Repository/ChannelRepositoryInterface.php
+++ b/src/Sylius/Component/Channel/Repository/ChannelRepositoryInterface.php
@@ -23,9 +23,6 @@ use Sylius\Component\Resource\Repository\RepositoryInterface;
*/
interface ChannelRepositoryInterface extends RepositoryInterface
{
- /** @deprecated since Sylius 1.11, use the `findOneEnabledByHostname` method instead */
- public function findOneByHostname(string $hostname): ?ChannelInterface;
-
public function findOneEnabledByHostname(string $hostname): ?ChannelInterface;
public function findOneByCode(string $code): ?ChannelInterface;
diff --git a/src/Sylius/Component/Channel/composer.json b/src/Sylius/Component/Channel/composer.json
index cb9ca1a08b..83ef360190 100644
--- a/src/Sylius/Component/Channel/composer.json
+++ b/src/Sylius/Component/Channel/composer.json
@@ -27,10 +27,10 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource": "^1.9",
- "symfony/form": "^5.4.21 || ^6.0",
- "symfony/http-foundation": "^5.4.21 || ^6.0",
+ "php": "^8.2",
+ "sylius/resource": "^1.10",
+ "symfony/form": "^6.3.2",
+ "symfony/http-foundation": "^6.3.4",
"laminas/laminas-stdlib": "^3.3.1"
},
"require-dev": {
@@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculator.php b/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculator.php
index 8d946c6d99..aa50077f1f 100644
--- a/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculator.php
+++ b/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculator.php
@@ -23,16 +23,8 @@ use Webmozart\Assert\Assert;
final class ProductVariantPriceCalculator implements ProductVariantPricesCalculatorInterface
{
public function __construct(
- private ?ProductVariantLowestPriceDisplayCheckerInterface $productVariantLowestPriceDisplayChecker = null,
+ private ProductVariantLowestPriceDisplayCheckerInterface $productVariantLowestPriceDisplayChecker,
) {
- if ($this->productVariantLowestPriceDisplayChecker === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing a $productVariantLowestPriceDisplayChecker to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
public function calculate(ProductVariantInterface $productVariant, array $context): int
@@ -84,10 +76,7 @@ final class ProductVariantPriceCalculator implements ProductVariantPricesCalcula
throw MissingChannelConfigurationException::createForProductVariantChannelPricing($productVariant, $channel);
}
- if (
- $this->productVariantLowestPriceDisplayChecker === null ||
- !$this->productVariantLowestPriceDisplayChecker->isLowestPriceDisplayable($productVariant, $context)
- ) {
+ if (!$this->productVariantLowestPriceDisplayChecker->isLowestPriceDisplayable($productVariant, $context)) {
return null;
}
diff --git a/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculatorInterface.php b/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculatorInterface.php
deleted file mode 100644
index efd49a7604..0000000000
--- a/src/Sylius/Component/Core/Calculator/ProductVariantPriceCalculatorInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-cartContext = $cartContext;
- $this->shopperContext = $shopperContext;
- $this->createdByGuestFlagResolver = $createdByGuestFlagResolver;
-
- if ($createdByGuestFlagResolver === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.10.9',
- 'Not passing a $createdByGuestFlagResolver through constructor is deprecated and will be prohibited in Sylius 2.0',
- );
- }
}
public function getCart(): BaseOrderInterface
@@ -107,7 +90,7 @@ final class ShopBasedCartContext implements CartContextInterface, ResetInterface
private function setCustomer(OrderInterface $cart, CustomerInterface $customer): void
{
- if ($this->createdByGuestFlagResolver !== null && !$this->createdByGuestFlagResolver->resolveFlag()) {
+ if (!$this->createdByGuestFlagResolver->resolveFlag()) {
$cart->setCustomerWithAuthorization($customer);
return;
diff --git a/src/Sylius/Component/Core/Factory/ChannelFactory.php b/src/Sylius/Component/Core/Factory/ChannelFactory.php
index 65cc58642b..f77df4bfff 100644
--- a/src/Sylius/Component/Core/Factory/ChannelFactory.php
+++ b/src/Sylius/Component/Core/Factory/ChannelFactory.php
@@ -28,21 +28,13 @@ final class ChannelFactory implements ChannelFactoryInterface
{
/**
* @param FactoryInterface $decoratedFactory
- * @param FactoryInterface|null $channelPriceHistoryConfigFactory
+ * @param FactoryInterface $channelPriceHistoryConfigFactory
*/
public function __construct(
private FactoryInterface $decoratedFactory,
private string $defaultCalculationStrategy,
- private ?FactoryInterface $channelPriceHistoryConfigFactory = null,
+ private FactoryInterface $channelPriceHistoryConfigFactory,
) {
- if (null === $this->channelPriceHistoryConfigFactory) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing a $channelPriceHistoryConfigFactory to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
/** @inheritdoc */
@@ -51,11 +43,9 @@ final class ChannelFactory implements ChannelFactoryInterface
$channel = $this->decoratedFactory->createNew();
$channel->setTaxCalculationStrategy($this->defaultCalculationStrategy);
- if (null !== $this->channelPriceHistoryConfigFactory) {
- /** @var ChannelPriceHistoryConfigInterface $channelPriceHistoryConfig */
- $channelPriceHistoryConfig = $this->channelPriceHistoryConfigFactory->createNew();
- $channel->setChannelPriceHistoryConfig($channelPriceHistoryConfig);
- }
+ /** @var ChannelPriceHistoryConfigInterface $channelPriceHistoryConfig */
+ $channelPriceHistoryConfig = $this->channelPriceHistoryConfigFactory->createNew();
+ $channel->setChannelPriceHistoryConfig($channelPriceHistoryConfig);
return $channel;
}
diff --git a/src/Sylius/Component/Core/Filesystem/Adapter/GaufretteFilesystemAdapter.php b/src/Sylius/Component/Core/Filesystem/Adapter/GaufretteFilesystemAdapter.php
deleted file mode 100644
index 099b6025f5..0000000000
--- a/src/Sylius/Component/Core/Filesystem/Adapter/GaufretteFilesystemAdapter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-filesystem->has($location);
- }
-
- public function write(string $location, string $content): void
- {
- $this->filesystem->write($location, $content);
- }
-
- public function delete(string $location): void
- {
- if (!$this->has($location)) {
- throw new FileNotFoundException($location);
- }
-
- $this->filesystem->delete($location);
- }
-}
diff --git a/src/Sylius/Component/Core/Model/Order.php b/src/Sylius/Component/Core/Model/Order.php
index 137fe0bf1e..22f5234f8f 100644
--- a/src/Sylius/Component/Core/Model/Order.php
+++ b/src/Sylius/Component/Core/Model/Order.php
@@ -507,26 +507,4 @@ class Order extends BaseOrder implements OrderInterface
{
return $this->createdByGuest;
}
-
- public function getCreatedByGuest(): bool
- {
- trigger_deprecation(
- 'sylius/core',
- '1.12',
- 'This method is deprecated and it will be removed in Sylius 2.0. Please use `isCreatedByGuest` instead.',
- );
-
- return $this->isCreatedByGuest();
- }
-
- public function setCreatedByGuest(bool $createdByGuest): void
- {
- trigger_deprecation(
- 'sylius/core',
- '1.12',
- 'This method is deprecated and it will be removed in Sylius 2.0. This flag should be changed only through `setCustomerWithAuthorization` method.',
- );
-
- $this->createdByGuest = $createdByGuest;
- }
}
diff --git a/src/Sylius/Component/Core/Model/OrderInterface.php b/src/Sylius/Component/Core/Model/OrderInterface.php
index d529cea4fc..f4cf610034 100644
--- a/src/Sylius/Component/Core/Model/OrderInterface.php
+++ b/src/Sylius/Component/Core/Model/OrderInterface.php
@@ -122,16 +122,6 @@ interface OrderInterface extends
public function isCreatedByGuest(): bool;
- /**
- * @deprecated since Sylius 1.13 and will be removed in Sylius 2.0. Use {@see isCreatedByGuest()} instead.
- */
- public function getCreatedByGuest(): bool;
-
- /**
- * @deprecated since Sylius 1.13 and will be removed in Sylius 2.0. This flag should be changed only through {@see setCustomerWithAuthorization()} method.
- */
- public function setCreatedByGuest(bool $createdByGuest): void;
-
/**
* @phpstan-ignore-next-line
*
diff --git a/src/Sylius/Component/Core/OrderProcessing/OrderAdjustmentsClearer.php b/src/Sylius/Component/Core/OrderProcessing/OrderAdjustmentsClearer.php
index 2847f24c61..7f52123e8f 100644
--- a/src/Sylius/Component/Core/OrderProcessing/OrderAdjustmentsClearer.php
+++ b/src/Sylius/Component/Core/OrderProcessing/OrderAdjustmentsClearer.php
@@ -13,33 +13,13 @@ declare(strict_types=1);
namespace Sylius\Component\Core\OrderProcessing;
-use Sylius\Component\Core\Model\AdjustmentInterface;
use Sylius\Component\Order\Model\OrderInterface;
use Sylius\Component\Order\Processor\OrderProcessorInterface;
final class OrderAdjustmentsClearer implements OrderProcessorInterface
{
- private array $adjustmentsToRemove;
-
- public function __construct(array $adjustmentsToRemove = [])
+ public function __construct(private array $adjustmentsToRemove)
{
- if (0 === func_num_args()) {
- trigger_deprecation(
- 'sylius/core',
- '1.2',
- 'Not passing $adjustmentsToRemove explicitly is deprecated and will be prohibited in Sylius 2.0',
- );
-
- $adjustmentsToRemove = [
- AdjustmentInterface::ORDER_ITEM_PROMOTION_ADJUSTMENT,
- AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT,
- AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT,
- AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT,
- AdjustmentInterface::TAX_ADJUSTMENT,
- ];
- }
-
- $this->adjustmentsToRemove = $adjustmentsToRemove;
}
public function process(OrderInterface $order): void
diff --git a/src/Sylius/Component/Core/OrderProcessing/OrderPaymentProcessor.php b/src/Sylius/Component/Core/OrderProcessing/OrderPaymentProcessor.php
index dfd3293122..9d566d8a1e 100644
--- a/src/Sylius/Component/Core/OrderProcessing/OrderPaymentProcessor.php
+++ b/src/Sylius/Component/Core/OrderProcessing/OrderPaymentProcessor.php
@@ -24,29 +24,15 @@ use Webmozart\Assert\Assert;
final class OrderPaymentProcessor implements OrderProcessorInterface
{
+ /**
+ * @param array $unprocessableOrderStates
+ */
public function __construct(
private OrderPaymentProviderInterface $orderPaymentProvider,
+ private OrderPaymentsRemoverInterface $orderPaymentsRemover,
+ private array $unprocessableOrderStates,
private string $targetState = PaymentInterface::STATE_CART,
- private ?OrderPaymentsRemoverInterface $orderPaymentsRemover = null,
- /** @var array $unprocessableOrderStates */
- private array $unprocessableOrderStates = [],
) {
- if ($this->orderPaymentsRemover === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing an $orderPaymentsRemover to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
- if ([] === $this->unprocessableOrderStates) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing an $unprocessableOrderStates to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
public function process(BaseOrderInterface $order): void
@@ -82,36 +68,16 @@ final class OrderPaymentProcessor implements OrderProcessorInterface
private function canPaymentsBeRemoved(OrderInterface $order): bool
{
- if (null !== $this->orderPaymentsRemover) {
- return $this->orderPaymentsRemover->canRemovePayments($order);
- }
-
- return 0 === $order->getTotal();
+ return $this->orderPaymentsRemover->canRemovePayments($order);
}
private function removePayments(OrderInterface $order): void
{
- if (null !== $this->orderPaymentsRemover) {
- $this->orderPaymentsRemover->removePayments($order);
-
- return;
- }
-
- $removablePayments = $order->getPayments()->filter(function (PaymentInterface $payment): bool {
- return $payment->getState() === PaymentInterface::STATE_CART;
- });
-
- foreach ($removablePayments as $payment) {
- $order->removePayment($payment);
- }
+ $this->orderPaymentsRemover->removePayments($order);
}
private function cannotBeProcessed(OrderInterface $order): bool
{
- if ([] === $this->unprocessableOrderStates) {
- return OrderInterface::STATE_CANCELLED === $order->getState();
- }
-
return in_array($order->getState(), $this->unprocessableOrderStates, true);
}
}
diff --git a/src/Sylius/Component/Core/OrderProcessing/OrderPricesRecalculator.php b/src/Sylius/Component/Core/OrderProcessing/OrderPricesRecalculator.php
index 16690f8a0c..11f1bd9da3 100644
--- a/src/Sylius/Component/Core/OrderProcessing/OrderPricesRecalculator.php
+++ b/src/Sylius/Component/Core/OrderProcessing/OrderPricesRecalculator.php
@@ -13,7 +13,6 @@ declare(strict_types=1);
namespace Sylius\Component\Core\OrderProcessing;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Order\Model\OrderInterface as BaseOrderInterface;
@@ -22,18 +21,8 @@ use Webmozart\Assert\Assert;
final class OrderPricesRecalculator implements OrderProcessorInterface
{
- public function __construct(private ProductVariantPriceCalculatorInterface|ProductVariantPricesCalculatorInterface $productVariantPriceCalculator)
+ public function __construct(private ProductVariantPricesCalculatorInterface $productVariantPricesCalculator)
{
- if ($this->productVariantPriceCalculator instanceof ProductVariantPriceCalculatorInterface) {
- trigger_deprecation(
- 'sylius/core',
- '1.11',
- 'Passing a "%s" to "%s" constructor is deprecated and will be prohibited in 2.0. Use "%s" instead.',
- ProductVariantPriceCalculatorInterface::class,
- self::class,
- ProductVariantPricesCalculatorInterface::class,
- );
- }
}
public function process(BaseOrderInterface $order): void
@@ -52,17 +41,15 @@ final class OrderPricesRecalculator implements OrderProcessorInterface
continue;
}
- $item->setUnitPrice($this->productVariantPriceCalculator->calculate(
+ $item->setUnitPrice($this->productVariantPricesCalculator->calculate(
$item->getVariant(),
['channel' => $channel],
));
- if ($this->productVariantPriceCalculator instanceof ProductVariantPricesCalculatorInterface) {
- $item->setOriginalUnitPrice($this->productVariantPriceCalculator->calculateOriginal(
- $item->getVariant(),
- ['channel' => $channel],
- ));
- }
+ $item->setOriginalUnitPrice($this->productVariantPricesCalculator->calculateOriginal(
+ $item->getVariant(),
+ ['channel' => $channel],
+ ));
}
}
}
diff --git a/src/Sylius/Component/Core/OrderProcessing/OrderShipmentProcessor.php b/src/Sylius/Component/Core/OrderProcessing/OrderShipmentProcessor.php
index cb47ca9788..b3ebd57410 100644
--- a/src/Sylius/Component/Core/OrderProcessing/OrderShipmentProcessor.php
+++ b/src/Sylius/Component/Core/OrderProcessing/OrderShipmentProcessor.php
@@ -28,15 +28,8 @@ final class OrderShipmentProcessor implements OrderProcessorInterface
public function __construct(
private DefaultShippingMethodResolverInterface $defaultShippingMethodResolver,
private FactoryInterface $shipmentFactory,
- private ?ShippingMethodsResolverInterface $shippingMethodsResolver = null,
+ private ShippingMethodsResolverInterface $shippingMethodsResolver,
) {
- if (2 === func_num_args() || null === $shippingMethodsResolver) {
- trigger_deprecation(
- 'sylius/core',
- '1.2',
- 'Not passing a $shippingMethodsResolver explicitly is deprecated and will be prohibited in Sylius 2.0',
- );
- }
}
public function process(BaseOrderInterface $order): void
@@ -105,10 +98,6 @@ final class OrderShipmentProcessor implements OrderProcessorInterface
$this->processShipmentUnits($order, $shipment);
- if (null === $this->shippingMethodsResolver) {
- return;
- }
-
if (!in_array($shipment->getMethod(), $this->shippingMethodsResolver->getSupportedMethods($shipment), true)) {
try {
$shipment->setMethod($this->defaultShippingMethodResolver->getDefaultShippingMethod($shipment));
diff --git a/src/Sylius/Component/Core/OrderProcessing/OrderTaxesProcessor.php b/src/Sylius/Component/Core/OrderProcessing/OrderTaxesProcessor.php
index 507af70fc8..6f699dc7c0 100644
--- a/src/Sylius/Component/Core/OrderProcessing/OrderTaxesProcessor.php
+++ b/src/Sylius/Component/Core/OrderProcessing/OrderTaxesProcessor.php
@@ -34,16 +34,8 @@ final class OrderTaxesProcessor implements OrderProcessorInterface
private ZoneProviderInterface $defaultTaxZoneProvider,
private ZoneMatcherInterface $zoneMatcher,
private PrioritizedServiceRegistryInterface $strategyRegistry,
- private ?TaxationAddressResolverInterface $taxationAddressResolver = null,
+ private TaxationAddressResolverInterface $taxationAddressResolver,
) {
- if ($this->taxationAddressResolver === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.11',
- 'Not passing a $taxationAddressResolver to %s constructor is deprecated and will be removed in Sylius 2.0.',
- self::class,
- );
- }
}
public function process(BaseOrderInterface $order): void
@@ -80,12 +72,7 @@ final class OrderTaxesProcessor implements OrderProcessorInterface
private function getTaxZone(OrderInterface $order): ?ZoneInterface
{
- $taxationAddress = $order->getBillingAddress();
-
- if ($this->taxationAddressResolver) {
- $taxationAddress = $this->taxationAddressResolver->getTaxationAddressFromOrder($order);
- }
-
+ $taxationAddress = $this->taxationAddressResolver->getTaxationAddressFromOrder($order);
$zone = null;
if (null !== $taxationAddress) {
diff --git a/src/Sylius/Component/Core/Promotion/Filter/PriceRangeFilter.php b/src/Sylius/Component/Core/Promotion/Filter/PriceRangeFilter.php
index 0c65237359..bd9ffefe32 100644
--- a/src/Sylius/Component/Core/Promotion/Filter/PriceRangeFilter.php
+++ b/src/Sylius/Component/Core/Promotion/Filter/PriceRangeFilter.php
@@ -13,13 +13,13 @@ declare(strict_types=1);
namespace Sylius\Component\Core\Promotion\Filter;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
+use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
use Webmozart\Assert\Assert;
final class PriceRangeFilter implements FilterInterface
{
- public function __construct(private ProductVariantPriceCalculatorInterface $productVariantPriceCalculator)
+ public function __construct(private ProductVariantPricesCalculatorInterface $productVariantPricesCalculator)
{
}
@@ -43,7 +43,7 @@ final class PriceRangeFilter implements FilterInterface
private function isItemVariantInPriceRange(ProductVariantInterface $variant, array $configuration): bool
{
- $price = $this->productVariantPriceCalculator->calculate($variant, ['channel' => $configuration['channel']]);
+ $price = $this->productVariantPricesCalculator->calculate($variant, ['channel' => $configuration['channel']]);
$priceRange = $configuration['filters']['price_range_filter'];
if (isset($priceRange['min'], $priceRange['max'])) {
diff --git a/src/Sylius/Component/Core/Promotion/Updater/Rule/ContainsProductRuleUpdater.php b/src/Sylius/Component/Core/Promotion/Updater/Rule/ContainsProductRuleUpdater.php
deleted file mode 100644
index f20d8bcefd..0000000000
--- a/src/Sylius/Component/Core/Promotion/Updater/Rule/ContainsProductRuleUpdater.php
+++ /dev/null
@@ -1,53 +0,0 @@
-promotionRuleRepository->findBy(['type' => ContainsProductRuleChecker::TYPE]);
-
- /** @var PromotionRuleInterface $promotionRule */
- foreach ($promotionRules as $promotionRule) {
- $configuration = $promotionRule->getConfiguration();
-
- if ($product->getCode() === $configuration['product_code']) {
- $this->promotionRuleRepository->remove($promotionRule);
- $updatedPromotionCodes[] = $promotionRule->getPromotion()->getCode();
- }
- }
-
- return $updatedPromotionCodes;
- }
-}
diff --git a/src/Sylius/Component/Core/Promotion/Updater/Rule/ProductAwareRuleUpdaterInterface.php b/src/Sylius/Component/Core/Promotion/Updater/Rule/ProductAwareRuleUpdaterInterface.php
deleted file mode 100644
index aa6391921d..0000000000
--- a/src/Sylius/Component/Core/Promotion/Updater/Rule/ProductAwareRuleUpdaterInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-promotionRuleRepository->findBy(['type' => TotalOfItemsFromTaxonRuleChecker::TYPE]);
-
- /** @var PromotionRuleInterface $promotionRule */
- foreach ($promotionRules as $promotionRule) {
- $promotionCode = $this->removePromotionRuleIfNecessary($promotionRule, $taxon->getCode());
-
- if (null !== $promotionCode) {
- $updatedPromotionCodes[] = $promotionRule->getPromotion()->getCode();
- }
- }
-
- return $updatedPromotionCodes;
- }
-
- private function removePromotionRuleIfNecessary(PromotionRuleInterface $promotionRule, string $taxonCode): ?string
- {
- foreach ($promotionRule->getConfiguration() as $configuration) {
- if ($taxonCode === $configuration['taxon']) {
- $this->promotionRuleRepository->remove($promotionRule);
-
- return $promotionRule->getPromotion()->getCode();
- }
- }
-
- return null;
- }
-}
diff --git a/src/Sylius/Component/Core/Provider/ProductVariantsPricesProvider.php b/src/Sylius/Component/Core/Provider/ProductVariantsPricesProvider.php
deleted file mode 100644
index 52b1ae9270..0000000000
--- a/src/Sylius/Component/Core/Provider/ProductVariantsPricesProvider.php
+++ /dev/null
@@ -1,89 +0,0 @@
-getEnabledVariants() as $variant) {
- $variantsPrices[] = $this->constructOptionsMap($variant, $channel);
- }
-
- return $variantsPrices;
- }
-
- private function constructOptionsMap(ProductVariantInterface $variant, ChannelInterface $channel): array
- {
- $optionMap = [];
-
- /** @var ProductOptionValueInterface $option */
- foreach ($variant->getOptionValues() as $option) {
- /** @var string $optionCode */
- $optionCode = $option->getOptionCode();
- $optionMap[$optionCode] = $option->getCode();
- }
-
- $price = $this->productVariantPriceCalculator->calculate($variant, ['channel' => $channel]);
- $optionMap['value'] = $price;
-
- /** @var ArrayCollection $appliedPromotions */
- $appliedPromotions = $variant->getAppliedPromotionsForChannel($channel);
- if (!$appliedPromotions->isEmpty()) {
- $optionMap['applied_promotions'] = $appliedPromotions->toArray();
- }
-
- if (!$this->productVariantPriceCalculator instanceof ProductVariantPricesCalculatorInterface) {
- return $optionMap;
- }
-
- $lowestPriceBeforeDiscount = $this->productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($variant, ['channel' => $channel]);
-
- if ($lowestPriceBeforeDiscount !== null) {
- $optionMap['lowest-price-before-discount'] = $lowestPriceBeforeDiscount;
- }
-
- $originalPrice = $this->productVariantPriceCalculator->calculateOriginal($variant, ['channel' => $channel]);
-
- if ($originalPrice > $price) {
- $optionMap['original-price'] = $originalPrice;
- }
-
- return $optionMap;
- }
-}
diff --git a/src/Sylius/Component/Core/Provider/ProductVariantsPricesProviderInterface.php b/src/Sylius/Component/Core/Provider/ProductVariantsPricesProviderInterface.php
deleted file mode 100644
index ddf8ccfbe4..0000000000
--- a/src/Sylius/Component/Core/Provider/ProductVariantsPricesProviderInterface.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
+ * @extends BaseAddressRepositoryInterface
*/
-interface AddressRepositoryInterface extends RepositoryInterface
+interface AddressRepositoryInterface extends BaseAddressRepositoryInterface
{
/**
* @return array|AddressInterface[]
diff --git a/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php b/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php
index fba8caae21..fea67b8dfe 100644
--- a/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php
+++ b/src/Sylius/Component/Core/Repository/OrderRepositoryInterface.php
@@ -30,21 +30,11 @@ interface OrderRepositoryInterface extends BaseOrderRepositoryInterface
{
public function createListQueryBuilder(): QueryBuilder;
- /**
- * @deprecated since Sylius 1.13 and will be removed in Sylius 2.0. Use {@see createCriteriaAwareSearchListQueryBuilder()} instead.
- */
- public function createSearchListQueryBuilder(): QueryBuilder;
-
/**
* @param array{product: string, variant: string}|null $criteria
*/
public function createCriteriaAwareSearchListQueryBuilder(?array $criteria): QueryBuilder;
- /**
- * @deprecated since Sylius 1.13 and will be removed in Sylius 2.0. Use {@see createByCustomerIdCriteriaAwareQueryBuilder()} instead.
- */
- public function createByCustomerIdQueryBuilder($customerId): QueryBuilder;
-
/**
* @param array{product: string, variant: string}|null $criteria
*/
diff --git a/src/Sylius/Component/Core/Resolver/DefaultShippingMethodResolver.php b/src/Sylius/Component/Core/Resolver/DefaultShippingMethodResolver.php
deleted file mode 100644
index 5bd1481cff..0000000000
--- a/src/Sylius/Component/Core/Resolver/DefaultShippingMethodResolver.php
+++ /dev/null
@@ -1,58 +0,0 @@
-getOrder();
-
- /** @var ChannelInterface $channel */
- $channel = $order->getChannel();
-
- $shippingMethods = $this->shippingMethodRepository->findEnabledForChannel($channel);
- if (empty($shippingMethods)) {
- throw new UnresolvedDefaultShippingMethodException();
- }
-
- return $shippingMethods[0];
- }
-}
diff --git a/src/Sylius/Component/Core/Taxation/Applicator/OrderItemUnitsTaxesApplicator.php b/src/Sylius/Component/Core/Taxation/Applicator/OrderItemUnitsTaxesApplicator.php
index 3068180854..9f92d338ca 100644
--- a/src/Sylius/Component/Core/Taxation/Applicator/OrderItemUnitsTaxesApplicator.php
+++ b/src/Sylius/Component/Core/Taxation/Applicator/OrderItemUnitsTaxesApplicator.php
@@ -29,26 +29,12 @@ class OrderItemUnitsTaxesApplicator implements OrderTaxesApplicatorInterface
private CalculatorInterface $calculator,
private AdjustmentFactoryInterface $adjustmentFactory,
private TaxRateResolverInterface $taxRateResolver,
- private ?ProportionalIntegerDistributorInterface $proportionalIntegerDistributor = null,
+ private ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
) {
- if ($this->proportionalIntegerDistributor === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing an $proportionalIntegerDistributor to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
public function apply(OrderInterface $order, ZoneInterface $zone): void
{
- if ($this->proportionalIntegerDistributor === null) {
- $this->applyWithoutDistributionToUnits($order, $zone);
-
- return;
- }
-
foreach ($order->getItems() as $item) {
/** @var TaxRateInterface|null $taxRate */
$taxRate = $this->taxRateResolver->resolve($item->getVariant(), ['zone' => $zone]);
@@ -80,27 +66,6 @@ class OrderItemUnitsTaxesApplicator implements OrderTaxesApplicatorInterface
}
}
- private function applyWithoutDistributionToUnits(OrderInterface $order, ZoneInterface $zone): void
- {
- foreach ($order->getItems() as $item) {
- /** @var TaxRateInterface|null $taxRate */
- $taxRate = $this->taxRateResolver->resolve($item->getVariant(), ['zone' => $zone]);
- if (null === $taxRate) {
- continue;
- }
-
- /** @var OrderItemUnitInterface $unit */
- foreach ($item->getUnits() as $unit) {
- $taxAmount = $this->calculator->calculate($unit->getTotal(), $taxRate);
- if (0.00 === $taxAmount) {
- continue;
- }
-
- $this->addAdjustment($unit, (int) $taxAmount, $taxRate);
- }
- }
- }
-
private function addAdjustment(OrderItemUnitInterface $unit, int $taxAmount, TaxRateInterface $taxRate): void
{
$unitTaxAdjustment = $this->adjustmentFactory->createWithData(
diff --git a/src/Sylius/Component/Core/Taxation/Applicator/OrderItemsTaxesApplicator.php b/src/Sylius/Component/Core/Taxation/Applicator/OrderItemsTaxesApplicator.php
index 1b685af3da..7fa241a2b1 100644
--- a/src/Sylius/Component/Core/Taxation/Applicator/OrderItemsTaxesApplicator.php
+++ b/src/Sylius/Component/Core/Taxation/Applicator/OrderItemsTaxesApplicator.php
@@ -33,16 +33,8 @@ class OrderItemsTaxesApplicator implements OrderTaxesApplicatorInterface
private AdjustmentFactoryInterface $adjustmentFactory,
private IntegerDistributorInterface $distributor,
private TaxRateResolverInterface $taxRateResolver,
- private ?ProportionalIntegerDistributorInterface $proportionalIntegerDistributor = null,
+ private ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
) {
- if ($this->proportionalIntegerDistributor === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing an $proportionalIntegerDistributor to %s constructor is deprecated and will be prohibited in Sylius 2.0.',
- self::class,
- );
- }
}
/** @throws \InvalidArgumentException */
@@ -50,12 +42,6 @@ class OrderItemsTaxesApplicator implements OrderTaxesApplicatorInterface
{
$this->checkItemsQuantities($order);
- if ($this->proportionalIntegerDistributor === null) {
- $this->applyWithoutDistributionToItems($order, $zone);
-
- return;
- }
-
$items = $order->getItems()->getValues();
$itemTaxFloatAmounts = [];
$itemTaxRates = [];
@@ -86,21 +72,6 @@ class OrderItemsTaxesApplicator implements OrderTaxesApplicatorInterface
}
}
- private function applyWithoutDistributionToItems(OrderInterface $order, ZoneInterface $zone): void
- {
- foreach ($order->getItems() as $item) {
- /** @var TaxRateInterface|null $taxRate */
- $taxRate = $this->taxRateResolver->resolve($item->getVariant(), ['zone' => $zone]);
- if (null === $taxRate) {
- continue;
- }
-
- $totalTaxAmount = $this->calculator->calculate($item->getTotal(), $taxRate);
-
- $this->distributeTaxesToUnits($totalTaxAmount, $item->getQuantity(), $item, $taxRate);
- }
- }
-
private function addAdjustment(OrderItemUnitInterface $unit, int $taxAmount, TaxRateInterface $taxRate): void
{
$unitTaxAdjustment = $this->adjustmentFactory->createWithData(
diff --git a/src/Sylius/Component/Core/Test/SwiftmailerAssertionTrait.php b/src/Sylius/Component/Core/Test/SwiftmailerAssertionTrait.php
deleted file mode 100644
index 71c25fbb74..0000000000
--- a/src/Sylius/Component/Core/Test/SwiftmailerAssertionTrait.php
+++ /dev/null
@@ -1,127 +0,0 @@
-getBody());
- $body = str_replace("\n", ' ', $body);
- $body = preg_replace('/ {2,}/', ' ', $body);
-
- if (str_contains($body, $message)) {
- return;
- }
- }
- }
-
- throw new ExpectationFailedException(sprintf(
- 'No message spooled with recipient "%s" and content "%s"',
- $recipient,
- $message,
- ));
- }
-
- public static function assertSpooledMessagesCountWithRecipient(int $expectedCount, string $recipient): void
- {
- self::assertRecipientIsValid($recipient);
-
- $messagesCount = 0;
-
- $messages = self::getMessages(self::getSpoolDirectory());
- foreach ($messages as $message) {
- if (self::isMessageTo($message, $recipient)) {
- ++$messagesCount;
- }
- }
-
- self::assertEquals($expectedCount, $messagesCount);
- }
-
- public static function getSpoolDirectory(): string
- {
- Assert::notNull(
- self::$spoolDirectory,
- 'Spool directory needs to be configured. Use the `setSpoolDirectory` method.',
- );
-
- return self::$spoolDirectory;
- }
-
- protected static function setSpoolDirectory(string $spoolDirectory): void
- {
- self::$spoolDirectory = $spoolDirectory;
- }
-
- private static function isMessageTo(object $message, string $recipient): bool
- {
- return array_key_exists($recipient, $message->getTo());
- }
-
- private static function assertRecipientIsValid(string $recipient): void
- {
- Assert::notEmpty($recipient, 'The recipient cannot be empty.');
- Assert::notEq(
- false,
- filter_var($recipient, \FILTER_VALIDATE_EMAIL),
- 'Given recipient is not a valid email address.',
- );
- }
-
- private static function getMessages(string $directory): array
- {
- $finder = new Finder();
- $finder->files()->name('*.message')->in($directory);
- Assert::notEq($finder->count(), 0, sprintf('No message files found in %s.', $directory));
- $messages = [];
-
- /** @var SplFileInfo $file */
- foreach ($finder as $file) {
- $messages[] = unserialize($file->getContents());
- }
-
- return $messages;
- }
-}
diff --git a/src/Sylius/Component/Core/Translation/TranslatableEntityLocaleAssigner.php b/src/Sylius/Component/Core/Translation/TranslatableEntityLocaleAssigner.php
index fc4ba95b3e..e22d0d7e96 100644
--- a/src/Sylius/Component/Core/Translation/TranslatableEntityLocaleAssigner.php
+++ b/src/Sylius/Component/Core/Translation/TranslatableEntityLocaleAssigner.php
@@ -25,15 +25,8 @@ final class TranslatableEntityLocaleAssigner implements TranslatableEntityLocale
public function __construct(
private LocaleContextInterface $localeContext,
private TranslationLocaleProviderInterface $translationLocaleProvider,
- private ?CLIContextCheckerInterface $commandBasedChecker = null,
+ private CLIContextCheckerInterface $commandBasedChecker,
) {
- if ($this->commandBasedChecker === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.11',
- 'Not passing a $commandBasedChecker explicitly as the third argument is deprecated and will be prohibited in Sylius 2.0.',
- );
- }
}
public function assignLocale(TranslatableInterface $translatableEntity): void
@@ -41,7 +34,7 @@ final class TranslatableEntityLocaleAssigner implements TranslatableEntityLocale
$fallbackLocale = $this->translationLocaleProvider->getDefaultLocaleCode();
$translatableEntity->setFallbackLocale($fallbackLocale);
- if ($this->commandBasedChecker !== null && $this->commandBasedChecker->isExecutedFromCLI()) {
+ if ($this->commandBasedChecker->isExecutedFromCLI()) {
$translatableEntity->setCurrentLocale($fallbackLocale);
return;
diff --git a/src/Sylius/Component/Core/Updater/UnpaidOrdersStateUpdater.php b/src/Sylius/Component/Core/Updater/UnpaidOrdersStateUpdater.php
index c780203ebd..1bbafab874 100644
--- a/src/Sylius/Component/Core/Updater/UnpaidOrdersStateUpdater.php
+++ b/src/Sylius/Component/Core/Updater/UnpaidOrdersStateUpdater.php
@@ -27,48 +27,25 @@ final class UnpaidOrdersStateUpdater implements UnpaidOrdersStateUpdaterInterfac
private OrderRepositoryInterface $orderRepository,
private Factory $stateMachineFactory,
private string $expirationPeriod,
- private ?LoggerInterface $logger = null,
- private ?ObjectManager $orderManager = null,
+ private LoggerInterface $logger,
+ private ObjectManager $orderManager,
private int $batchSize = 100,
) {
- if (null === $logger) {
- trigger_deprecation(
- 'sylius/core',
- '1.7',
- 'Not passing a $logger is deprecated and will be prohibited in Sylius 2.0.',
- );
- }
-
- if (null === $orderManager) {
- trigger_deprecation(
- 'sylius/core',
- '1.13',
- 'Not passing the $orderManager is deprecated as it makes $batchSize useless.',
- );
- }
-
- $this->logger = $logger;
}
public function cancel(): void
{
- $batchSize = null === $this->orderManager ? null : $this->batchSize;
-
- while ([] !== $expiredUnpaidOrders = $this->findExpiredUnpaidOrders($batchSize)) {
+ while ([] !== $expiredUnpaidOrders = $this->findExpiredUnpaidOrders($this->batchSize)) {
foreach ($expiredUnpaidOrders as $expiredUnpaidOrder) {
$this->cancelOrder($expiredUnpaidOrder);
}
- if (null === $this->orderManager) {
- return;
- }
-
$this->orderManager->flush();
$this->orderManager->clear();
}
}
- private function findExpiredUnpaidOrders(?int $batchSize): array
+ private function findExpiredUnpaidOrders(int $batchSize): array
{
return $this->orderRepository->findOrdersUnpaidSince(
new \DateTime('-' . $this->expirationPeriod),
@@ -82,7 +59,7 @@ final class UnpaidOrdersStateUpdater implements UnpaidOrdersStateUpdaterInterfac
$stateMachine = $this->stateMachineFactory->get($expiredUnpaidOrder, OrderTransitions::GRAPH);
$stateMachine->apply(OrderTransitions::TRANSITION_CANCEL);
} catch (SMException $e) {
- $this->logger?->error(
+ $this->logger->error(
sprintf('An error occurred while cancelling unpaid order #%s', $expiredUnpaidOrder->getId()),
['exception' => $e, 'message' => $e->getMessage()],
);
diff --git a/src/Sylius/Component/Core/Uploader/ImageUploader.php b/src/Sylius/Component/Core/Uploader/ImageUploader.php
index e7b584994b..9a37661983 100644
--- a/src/Sylius/Component/Core/Uploader/ImageUploader.php
+++ b/src/Sylius/Component/Core/Uploader/ImageUploader.php
@@ -14,12 +14,9 @@ declare(strict_types=1);
namespace Sylius\Component\Core\Uploader;
use enshrined\svgSanitize\Sanitizer;
-use Gaufrette\FilesystemInterface;
use Sylius\Component\Core\Filesystem\Adapter\FilesystemAdapterInterface;
-use Sylius\Component\Core\Filesystem\Adapter\GaufretteFilesystemAdapter;
use Sylius\Component\Core\Filesystem\Exception\FileNotFoundException;
use Sylius\Component\Core\Generator\ImagePathGeneratorInterface;
-use Sylius\Component\Core\Generator\UploadedImagePathGenerator;
use Sylius\Component\Core\Model\ImageInterface;
use Symfony\Component\HttpFoundation\File\File;
use Webmozart\Assert\Assert;
@@ -34,31 +31,9 @@ class ImageUploader implements ImageUploaderInterface
protected $sanitizer;
public function __construct(
- /** @var FilesystemAdapterInterface $filesystem */
- protected FilesystemAdapterInterface|FilesystemInterface $filesystem,
- protected ?ImagePathGeneratorInterface $imagePathGenerator = null,
+ protected FilesystemAdapterInterface $filesystem,
+ protected ImagePathGeneratorInterface $imagePathGenerator,
) {
- if ($this->filesystem instanceof FilesystemInterface) {
- trigger_deprecation(
- 'sylius/core',
- '1.12',
- 'Passing Gaufrette\FilesystemInterface as a first argument in %s constructor is deprecated and will be not possible in Sylius 2.0.',
- self::class,
- );
-
- $this->filesystem = new GaufretteFilesystemAdapter($this->filesystem);
- }
-
- if ($imagePathGenerator === null) {
- trigger_deprecation(
- 'sylius/core',
- '1.6',
- 'Not passing an $imagePathGenerator to %s constructor is deprecated and will be not possible in Sylius 2.0.',
- self::class,
- );
- }
-
- $this->imagePathGenerator = $imagePathGenerator ?? new UploadedImagePathGenerator();
$this->sanitizer = new Sanitizer();
}
diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json
index b433be5487..fa88812dfc 100644
--- a/src/Sylius/Component/Core/composer.json
+++ b/src/Sylius/Component/Core/composer.json
@@ -26,7 +26,7 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"enshrined/svg-sanitize": "^0.16",
"guzzlehttp/guzzle": "^6.5 || ^7.0",
"knplabs/gaufrette": "^0.10 || ^0.11",
@@ -34,36 +34,36 @@
"payum/core": "^1.7.3",
"psr/http-client": "^1.0",
"psr/http-message": "^1.0",
- "sylius/addressing": "^1.12",
- "sylius/attribute": "^1.12",
- "sylius/channel": "^1.12",
- "sylius/currency": "^1.12",
- "sylius/customer": "^1.12",
- "sylius/inventory": "^1.12",
- "sylius/locale": "^1.12",
- "sylius/order": "^1.12",
- "sylius/payment": "^1.12",
- "sylius/product": "^1.12",
- "sylius/promotion": "^1.12",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9",
- "sylius/review": "^1.12",
- "sylius/shipping": "^1.12",
- "sylius/taxation": "^1.12",
- "sylius/taxonomy": "^1.12",
- "sylius/user": "^1.12",
- "symfony/http-client": "^5.4.21 || ^6.0",
- "symfony/http-foundation": "^5.4.21 || ^6.0",
- "symfony/mime": "^5.4.21 || ^6.0",
+ "sylius/addressing": "^2.0",
+ "sylius/attribute": "^2.0",
+ "sylius/channel": "^2.0",
+ "sylius/currency": "^2.0",
+ "sylius/customer": "^2.0",
+ "sylius/inventory": "^2.0",
+ "sylius/locale": "^2.0",
+ "sylius/order": "^2.0",
+ "sylius/payment": "^2.0",
+ "sylius/product": "^2.0",
+ "sylius/promotion": "^2.0",
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10",
+ "sylius/review": "^2.0",
+ "sylius/shipping": "^2.0",
+ "sylius/taxation": "^2.0",
+ "sylius/taxonomy": "^2.0",
+ "sylius/user": "^2.0",
+ "symfony/http-client": "^6.3.2",
+ "symfony/http-foundation": "^6.3.4",
+ "symfony/mime": "^6.3.3",
"symfony/service-contracts": "^2.5 || ^3.0",
- "symfony/string": "^5.4.21 || ^6.0",
+ "symfony/string": "^6.3.2",
"webmozart/assert": "^1.9",
"laminas/laminas-stdlib": "^3.3.1"
},
"require-dev": {
"phpspec/phpspec": "^7.2",
"phpunit/phpunit": "^9.5",
- "symfony/property-access": "^5.4.21 || ^6.0"
+ "symfony/property-access": "^6.3.2"
},
"config": {
"allow-plugins": {
@@ -72,7 +72,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php b/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php
index 7220a4458b..3c5508932d 100644
--- a/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php
+++ b/src/Sylius/Component/Core/spec/Calculator/ProductVariantPriceCalculatorSpec.php
@@ -23,6 +23,11 @@ use Sylius\Component\Core\Model\ProductVariantInterface;
final class ProductVariantPriceCalculatorSpec extends ObjectBehavior
{
+ function let(ProductVariantLowestPriceDisplayCheckerInterface $productVariantLowestPriceDisplayChecker): void
+ {
+ $this->beConstructedWith($productVariantLowestPriceDisplayChecker);
+ }
+
function it_implements_product_variant_price_calculator_interface(): void
{
$this->shouldImplement(ProductVariantPricesCalculatorInterface::class);
@@ -149,8 +154,6 @@ final class ProductVariantPriceCalculatorSpec extends ObjectBehavior
ChannelPricingInterface $channelPricing,
ProductVariantInterface $productVariant,
): void {
- $this->beConstructedWith($productVariantLowestPriceDisplayChecker);
-
$productVariant->getChannelPricingForChannel($channel)->willReturn($channelPricing);
$productVariantLowestPriceDisplayChecker->isLowestPriceDisplayable($productVariant, ['channel' => $channel])->willReturn(true);
@@ -165,8 +168,6 @@ final class ProductVariantPriceCalculatorSpec extends ObjectBehavior
ChannelPricingInterface $channelPricing,
ProductVariantInterface $productVariant,
): void {
- $this->beConstructedWith($productVariantLowestPriceDisplayChecker);
-
$productVariant->getChannelPricingForChannel($channel)->willReturn($channelPricing);
$productVariantLowestPriceDisplayChecker->isLowestPriceDisplayable($productVariant, ['channel' => $channel])->willReturn(false);
@@ -175,30 +176,11 @@ final class ProductVariantPriceCalculatorSpec extends ObjectBehavior
$this->calculateLowestPriceBeforeDiscount($productVariant, ['channel' => $channel])->shouldReturn(null);
}
- function it_returns_null_when_is_not_constructed_with_product_variant_lowest_price_display_checker(
- ProductVariantLowestPriceDisplayCheckerInterface $productVariantLowestPriceDisplayChecker,
- ChannelInterface $channel,
- ChannelPricingInterface $channelPricing,
- ProductVariantInterface $productVariant,
- ): void {
- $productVariant->getChannelPricingForChannel($channel)->willReturn($channelPricing);
- $productVariantLowestPriceDisplayChecker
- ->isLowestPriceDisplayable($productVariant, ['channel' => $channel])
- ->shouldNotBeCalled()
- ;
-
- $channelPricing->getLowestPriceBeforeDiscount()->shouldNotBeCalled();
-
- $this->calculateLowestPriceBeforeDiscount($productVariant, ['channel' => $channel])->shouldReturn(null);
- }
-
function it_throws_a_channel_not_defined_exception_if_there_is_no_channel_pricing_when_providing_lowest_price_before_discount(
ProductVariantLowestPriceDisplayCheckerInterface $productVariantLowestPriceDisplayChecker,
ChannelInterface $channel,
ProductVariantInterface $productVariant,
): void {
- $this->beConstructedWith($productVariantLowestPriceDisplayChecker);
-
$productVariant->getChannelPricingForChannel($channel)->willReturn(null);
$productVariant->getDescriptor()->willReturn('Red variant (RED_VARIANT)');
$channel->getName()->shouldBeCalled();
diff --git a/src/Sylius/Component/Core/spec/Cart/Context/ShopBasedCartContextSpec.php b/src/Sylius/Component/Core/spec/Cart/Context/ShopBasedCartContextSpec.php
index 932ab6e13f..4e451dccd4 100644
--- a/src/Sylius/Component/Core/spec/Cart/Context/ShopBasedCartContextSpec.php
+++ b/src/Sylius/Component/Core/spec/Cart/Context/ShopBasedCartContextSpec.php
@@ -30,9 +30,12 @@ use Symfony\Contracts\Service\ResetInterface;
final class ShopBasedCartContextSpec extends ObjectBehavior
{
- function let(CartContextInterface $cartContext, ShopperContextInterface $shopperContext): void
- {
- $this->beConstructedWith($cartContext, $shopperContext);
+ function let(
+ CartContextInterface $cartContext,
+ ShopperContextInterface $shopperContext,
+ CreatedByGuestFlagResolverInterface $createdByGuestFlagResolver,
+ ): void {
+ $this->beConstructedWith($cartContext, $shopperContext, $createdByGuestFlagResolver);
}
function it_implements_a_cart_context_interface(): void
@@ -48,6 +51,7 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
function it_creates_a_cart_if_does_not_exist_with_shop_basic_configuration(
CartContextInterface $cartContext,
ShopperContextInterface $shopperContext,
+ CreatedByGuestFlagResolverInterface $createdByGuestFlagResolver,
OrderInterface $cart,
ChannelInterface $channel,
CurrencyInterface $currency,
@@ -63,6 +67,8 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
$channel->getBaseCurrency()->willReturn($currency);
$currency->getCode()->willReturn('PLN');
+ $createdByGuestFlagResolver->resolveFlag()->willReturn(true);
+
$cart->setChannel($channel)->shouldBeCalled();
$cart->setCurrencyCode('PLN')->shouldBeCalled();
$cart->setLocaleCode('pl')->shouldBeCalled();
@@ -74,6 +80,7 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
function it_creates_a_cart_if_does_not_exist_with_shop_basic_configuration_and_customer_default_address_if_is_not_null(
CartContextInterface $cartContext,
ShopperContextInterface $shopperContext,
+ CreatedByGuestFlagResolverInterface $createdByGuestFlagResolver,
AddressInterface $defaultAddress,
OrderInterface $cart,
ChannelInterface $channel,
@@ -90,6 +97,8 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
$channel->getBaseCurrency()->willReturn($currency);
$currency->getCode()->willReturn('PLN');
+ $createdByGuestFlagResolver->resolveFlag()->willReturn(true);
+
$cart->setChannel($channel)->shouldBeCalled();
$cart->setCurrencyCode('PLN')->shouldBeCalled();
$cart->setLocaleCode('pl')->shouldBeCalled();
@@ -137,6 +146,7 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
function it_caches_a_cart(
CartContextInterface $cartContext,
ShopperContextInterface $shopperContext,
+ CreatedByGuestFlagResolverInterface $createdByGuestFlagResolver,
OrderInterface $cart,
ChannelInterface $channel,
CurrencyInterface $currency,
@@ -152,6 +162,8 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
$channel->getBaseCurrency()->shouldBeCalledTimes(1)->willReturn($currency);
$currency->getCode()->shouldBeCalledTimes(1)->willReturn('PLN');
+ $createdByGuestFlagResolver->resolveFlag()->willReturn(true);
+
$cart->setChannel($channel)->shouldBeCalledTimes(1);
$cart->setCurrencyCode('PLN')->shouldBeCalledTimes(1);
$cart->setLocaleCode('pl')->shouldBeCalledTimes(1);
@@ -164,6 +176,7 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
function it_recreates_a_cart_after_it_is_reset(
CartContextInterface $cartContext,
ShopperContextInterface $shopperContext,
+ CreatedByGuestFlagResolverInterface $createdByGuestFlagResolver,
OrderInterface $firstCart,
OrderInterface $secondCart,
ChannelInterface $channel,
@@ -180,6 +193,8 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
$channel->getBaseCurrency()->shouldBeCalledTimes(2)->willReturn($currency);
$currency->getCode()->shouldBeCalledTimes(2)->willReturn('PLN');
+ $createdByGuestFlagResolver->resolveFlag()->willReturn(true, true);
+
$firstCart->setChannel($channel)->shouldBeCalledTimes(1);
$firstCart->setCurrencyCode('PLN')->shouldBeCalledTimes(1);
$firstCart->setLocaleCode('pl')->shouldBeCalledTimes(1);
@@ -204,8 +219,6 @@ final class ShopBasedCartContextSpec extends ObjectBehavior
CurrencyInterface $currency,
CustomerInterface $customer,
): void {
- $this->beConstructedWith($cartContext, $shopperContext, $createdByGuestFlagResolver);
-
$createdByGuestFlagResolver->resolveFlag()->willReturn(false);
$cartContext->getCart()->shouldBeCalledTimes(1)->willReturn($cart);
diff --git a/src/Sylius/Component/Core/spec/Filesystem/Adapter/GaufretteFilesystemAdapterSpec.php b/src/Sylius/Component/Core/spec/Filesystem/Adapter/GaufretteFilesystemAdapterSpec.php
deleted file mode 100644
index 32d52949d3..0000000000
--- a/src/Sylius/Component/Core/spec/Filesystem/Adapter/GaufretteFilesystemAdapterSpec.php
+++ /dev/null
@@ -1,72 +0,0 @@
-beConstructedWith($filesystem);
- }
-
- function it_is_a_filesystem_adapter(): void
- {
- $this->shouldImplement(FilesystemAdapterInterface::class);
- }
-
- function it_returns_true_if_the_file_exists(FilesystemInterface $filesystem): void
- {
- $filesystem->has('/path/to/some-file')->willReturn(true);
-
- $this->has('/path/to/some-file')->shouldReturn(true);
- }
-
- function it_returns_false_if_the_file_exists(FilesystemInterface $filesystem): void
- {
- $filesystem->has('/path/to/some-file')->willReturn(false);
-
- $this->has('/path/to/some-file')->shouldReturn(false);
- }
-
- function it_writes_the_given_content_into_the_file(FilesystemInterface $filesystem): void
- {
- $filesystem->write('/path/to/some-file', 'content')->shouldBeCalled();
-
- $this->write('/path/to/some-file', 'content');
- }
-
- function it_deletes_the_given_file(FilesystemInterface $filesystem): void
- {
- $filesystem->has('/path/to/some-file')->willReturn(true);
- $filesystem->delete('/path/to/some-file')->willReturn(true)->shouldBeCalled();
-
- $this->delete('/path/to/some-file');
- }
-
- function it_throws_exception_if_file_does_not_exist_while_deleting(FilesystemInterface $filesystem): void
- {
- $filesystem->has('/path/to/some-file')->willReturn(false);
- $filesystem->delete('/path/to/some-file')->shouldNotBeCalled();
-
- $this
- ->shouldThrow(FileNotFoundException::class)
- ->during('delete', ['/path/to/some-file'])
- ;
- }
-}
diff --git a/src/Sylius/Component/Core/spec/Model/OrderSpec.php b/src/Sylius/Component/Core/spec/Model/OrderSpec.php
index f6c4fbc062..3a414d020d 100644
--- a/src/Sylius/Component/Core/spec/Model/OrderSpec.php
+++ b/src/Sylius/Component/Core/spec/Model/OrderSpec.php
@@ -69,12 +69,6 @@ final class OrderSpec extends ObjectBehavior
$this->isCreatedByGuest()->shouldReturn(true);
}
- function it_allows_to_mutate_create_by_guest_field(): void
- {
- $this->setCreatedByGuest(false);
- $this->isCreatedByGuest()->shouldReturn(false);
- }
-
function its_customer_can_be_nullable(): void
{
$this->setCustomer(null);
diff --git a/src/Sylius/Component/Core/spec/OrderProcessing/OrderAdjustmentsClearerSpec.php b/src/Sylius/Component/Core/spec/OrderProcessing/OrderAdjustmentsClearerSpec.php
index ec59eebbb1..4443391e81 100644
--- a/src/Sylius/Component/Core/spec/OrderProcessing/OrderAdjustmentsClearerSpec.php
+++ b/src/Sylius/Component/Core/spec/OrderProcessing/OrderAdjustmentsClearerSpec.php
@@ -21,31 +21,21 @@ use Sylius\Component\Order\Processor\OrderProcessorInterface;
final class OrderAdjustmentsClearerSpec extends ObjectBehavior
{
- function it_is_an_order_processor(): void
- {
- $this->shouldImplement(OrderProcessorInterface::class);
- }
-
- function it_removes_adjustments_with_default_types_from_order_recursively(OrderInterface $order): void
- {
- $order->canBeProcessed()->willReturn(true);
-
- $order->removeAdjustmentsRecursively(AdjustmentInterface::ORDER_ITEM_PROMOTION_ADJUSTMENT)->shouldBeCalled();
- $order->removeAdjustmentsRecursively(AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT)->shouldBeCalled();
- $order->removeAdjustmentsRecursively(AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT)->shouldBeCalled();
- $order->removeAdjustmentsRecursively(AdjustmentInterface::ORDER_UNIT_PROMOTION_ADJUSTMENT)->shouldBeCalled();
- $order->removeAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
-
- $this->process($order);
- }
-
- function it_removes_adjustments_with_specified_types_from_order_recursively(OrderInterface $order): void
+ function let(): void
{
$this->beConstructedWith([
AdjustmentInterface::ORDER_ITEM_PROMOTION_ADJUSTMENT,
AdjustmentInterface::ORDER_PROMOTION_ADJUSTMENT,
]);
+ }
+ function it_is_an_order_processor(): void
+ {
+ $this->shouldImplement(OrderProcessorInterface::class);
+ }
+
+ function it_removes_adjustments_with_specified_types_from_order_recursively(OrderInterface $order): void
+ {
$order->canBeProcessed()->willReturn(true);
$order->removeAdjustmentsRecursively(AdjustmentInterface::ORDER_ITEM_PROMOTION_ADJUSTMENT)->shouldBeCalled();
diff --git a/src/Sylius/Component/Core/spec/OrderProcessing/OrderPaymentProcessorSpec.php b/src/Sylius/Component/Core/spec/OrderProcessing/OrderPaymentProcessorSpec.php
index d2f879368c..b7319ab3d5 100644
--- a/src/Sylius/Component/Core/spec/OrderProcessing/OrderPaymentProcessorSpec.php
+++ b/src/Sylius/Component/Core/spec/OrderProcessing/OrderPaymentProcessorSpec.php
@@ -13,12 +13,10 @@ declare(strict_types=1);
namespace spec\Sylius\Component\Core\OrderProcessing;
-use Doctrine\Common\Collections\Collection;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Model\PaymentInterface;
-use Sylius\Component\Core\OrderPaymentStates;
use Sylius\Component\Core\Payment\Exception\NotProvidedOrderPaymentException;
use Sylius\Component\Core\Payment\Provider\OrderPaymentProviderInterface;
use Sylius\Component\Core\Payment\Remover\OrderPaymentsRemoverInterface;
@@ -27,9 +25,18 @@ use Sylius\Component\Order\Processor\OrderProcessorInterface;
final class OrderPaymentProcessorSpec extends ObjectBehavior
{
- function let(OrderPaymentProviderInterface $orderPaymentProvider): void
- {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART);
+ function let(
+ OrderPaymentProviderInterface $orderPaymentProvider,
+ OrderPaymentsRemoverInterface $orderPaymentsRemover,
+ ): void {
+ $this->beConstructedWith(
+ $orderPaymentProvider,
+ $orderPaymentsRemover,
+ [
+ OrderInterface::STATE_FULFILLED,
+ ],
+ PaymentInterface::STATE_CART,
+ );
}
function it_is_an_order_processor(): void
@@ -45,23 +52,10 @@ final class OrderPaymentProcessorSpec extends ObjectBehavior
;
}
- function it_does_nothing_if_the_order_is_cancelled_when_no_unsupported_states_were_passed(
- OrderInterface $order,
- ): void {
- $order->getState()->willReturn(OrderInterface::STATE_CANCELLED);
- $order->getLastPayment(Argument::any())->shouldNotBeCalled();
-
- $this->process($order);
- }
-
function it_does_nothing_if_the_order_state_is_in_unsupported_states(
OrderPaymentProviderInterface $orderPaymentProvider,
OrderInterface $order,
): void {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART, null, [
- OrderInterface::STATE_FULFILLED,
- ]);
-
$order->getState()->willReturn(OrderInterface::STATE_FULFILLED);
$order->getLastPayment(Argument::any())->shouldNotBeCalled();
@@ -70,99 +64,28 @@ final class OrderPaymentProcessorSpec extends ObjectBehavior
$this->process($order);
}
- function it_removes_cart_payments_from_order_if_its_total_is_zero(
- OrderInterface $order,
- PaymentInterface $cartPayment,
- PaymentInterface $cancelledPayment,
- Collection $payments,
- ): void {
- $order->getState()->willReturn(OrderInterface::STATE_CART);
- $order->getTotal()->willReturn(0);
-
- $cartPayment->getState()->willReturn(OrderPaymentStates::STATE_CART);
- $cancelledPayment->getState()->willReturn(OrderPaymentStates::STATE_CANCELLED);
-
- $payments->filter(Argument::type(\Closure::class))->willReturn([$cartPayment]);
-
- $order->getPayments()->willReturn($payments);
- $order->removePayment($cartPayment)->shouldBeCalledTimes(1);
- $order->removePayment($cancelledPayment)->shouldNotBeCalled();
-
- $this->process($order);
- }
-
- function it_sets_last_order_currency_with_target_state_currency_code_and_amount(
- OrderInterface $order,
- PaymentInterface $payment,
- ): void {
- $order->getState()->willReturn(OrderInterface::STATE_CART);
- $order->getLastPayment(PaymentInterface::STATE_CART)->willReturn($payment);
-
- $order->getCurrencyCode()->willReturn('PLN');
- $order->getTotal()->willReturn(1000);
-
- $payment->setCurrencyCode('PLN')->shouldBeCalled();
- $payment->setAmount(1000)->shouldBeCalled();
-
- $this->process($order);
- }
-
- function it_sets_provided_order_payment_if_it_is_not_null(
- OrderInterface $order,
- OrderPaymentProviderInterface $orderPaymentProvider,
- PaymentInterface $payment,
- ): void {
- $order->getTotal()->willReturn(10);
- $order->getState()->willReturn(OrderInterface::STATE_CART);
- $order->getLastPayment(PaymentInterface::STATE_CART)->willReturn(null);
-
- $orderPaymentProvider->provideOrderPayment($order, PaymentInterface::STATE_CART)->willReturn($payment);
- $order->addPayment($payment)->shouldBeCalled();
-
- $this->process($order);
- }
-
- function it_does_not_set_order_payment_if_it_cannot_be_provided(
- OrderInterface $order,
- OrderPaymentProviderInterface $orderPaymentProvider,
- ): void {
- $order->getTotal()->willReturn(10);
- $order->getState()->willReturn(OrderInterface::STATE_CART);
- $order->getLastPayment(PaymentInterface::STATE_CART)->willReturn(null);
-
- $orderPaymentProvider
- ->provideOrderPayment($order, PaymentInterface::STATE_CART)
- ->willThrow(NotProvidedOrderPaymentException::class)
- ;
- $order->addPayment(Argument::any())->shouldNotBeCalled();
-
- $this->process($order);
- }
-
function it_removes_cart_payments_from_order_when_using_payments_remover(
OrderPaymentProviderInterface $orderPaymentProvider,
OrderPaymentsRemoverInterface $orderPaymentsRemover,
OrderInterface $order,
): void {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART, $orderPaymentsRemover);
-
$order->getState()->willReturn(OrderInterface::STATE_CART);
- $order->getTotal()->shouldNotBeCalled();
$orderPaymentsRemover->canRemovePayments($order)->willReturn(true);
$orderPaymentsRemover->removePayments($order)->shouldBeCalled();
+ $order->addPayment(Argument::any())->shouldNotBeCalled();
+ $order->getLastPayment(Argument::any())->shouldNotBeCalled();
+
$this->process($order);
}
- function it_sets_last_order_currency_with_target_state_currency_code_and_amount_when_using_payments_remover(
+ function it_sets_last_order_currency_with_target_state_currency_code_and_amount(
OrderPaymentProviderInterface $orderPaymentProvider,
OrderPaymentsRemoverInterface $orderPaymentsRemover,
OrderInterface $order,
PaymentInterface $payment,
): void {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART, $orderPaymentsRemover);
-
$order->getState()->willReturn(OrderInterface::STATE_CART);
$order->getLastPayment(PaymentInterface::STATE_CART)->willReturn($payment);
@@ -174,18 +97,17 @@ final class OrderPaymentProcessorSpec extends ObjectBehavior
$payment->setCurrencyCode('PLN')->shouldBeCalled();
$payment->setAmount(1000)->shouldBeCalled();
+ $orderPaymentProvider->provideOrderPayment($order, PaymentInterface::STATE_CART)->shouldNotBeCalled();
+
$this->process($order);
}
- function it_sets_provided_order_payment_if_it_is_not_null_when_using_payments_remover(
+ function it_sets_provided_order_payment_if_it_is_not_null(
OrderPaymentProviderInterface $orderPaymentProvider,
OrderPaymentsRemoverInterface $orderPaymentsRemover,
OrderInterface $order,
PaymentInterface $payment,
): void {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART, $orderPaymentsRemover);
-
- $order->getTotal()->willReturn(10);
$order->getState()->willReturn(OrderInterface::STATE_CART);
$order->getLastPayment(PaymentInterface::STATE_CART)->willReturn(null);
@@ -197,14 +119,11 @@ final class OrderPaymentProcessorSpec extends ObjectBehavior
$this->process($order);
}
- function it_does_not_set_order_payment_if_it_cannot_be_provided_when_using_payments_remover(
+ function it_does_not_set_order_payment_if_it_cannot_be_provided(
OrderPaymentProviderInterface $orderPaymentProvider,
OrderPaymentsRemoverInterface $orderPaymentsRemover,
OrderInterface $order,
): void {
- $this->beConstructedWith($orderPaymentProvider, PaymentInterface::STATE_CART, $orderPaymentsRemover);
-
- $order->getTotal()->willReturn(10);
$order->getState()->willReturn(OrderInterface::STATE_CART);
$order->getLastPayment(PaymentInterface::STATE_CART)->willReturn(null);
diff --git a/src/Sylius/Component/Core/spec/OrderProcessing/OrderShipmentProcessorSpec.php b/src/Sylius/Component/Core/spec/OrderProcessing/OrderShipmentProcessorSpec.php
index e68f1f1b5a..987e3ac67e 100644
--- a/src/Sylius/Component/Core/spec/OrderProcessing/OrderShipmentProcessorSpec.php
+++ b/src/Sylius/Component/Core/spec/OrderProcessing/OrderShipmentProcessorSpec.php
@@ -184,43 +184,6 @@ final class OrderShipmentProcessorSpec extends ObjectBehavior
$this->process($order);
}
- function it_adds_new_item_units_to_existing_shipment_without_checking_methods_if_shipping_methods_resolver_is_not_used(
- DefaultShippingMethodResolverInterface $defaultShippingMethodResolver,
- FactoryInterface $shipmentFactory,
- OrderInterface $order,
- ShipmentInterface $shipment,
- Collection $shipments,
- OrderItemUnitInterface $itemUnit,
- OrderItemUnitInterface $itemUnitWithoutShipment,
- OrderItemInterface $orderItem,
- ProductVariantInterface $productVariant,
- ): void {
- $this->beConstructedWith($defaultShippingMethodResolver, $shipmentFactory);
-
- $order->canBeProcessed()->willReturn(true);
-
- $shipments->first()->willReturn($shipment);
-
- $orderItem->getVariant()->willReturn($productVariant);
-
- $order->isShippingRequired()->willReturn(true);
-
- $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
-
- $order->isEmpty()->willReturn(false);
- $order->hasShipments()->willReturn(true);
- $order->getItemUnits()->willReturn(new ArrayCollection([$itemUnit->getWrappedObject(), $itemUnitWithoutShipment->getWrappedObject()]));
- $order->getShipments()->willReturn($shipments);
-
- $itemUnit->getShipment()->willReturn($shipment);
-
- $shipment->getUnits()->willReturn(new ArrayCollection([]));
- $shipment->addUnit($itemUnitWithoutShipment)->shouldBeCalled();
- $shipment->addUnit($itemUnit)->shouldNotBeCalled();
-
- $this->process($order);
- }
-
function it_removes_units_before_adding_new_ones(
ShippingMethodsResolverInterface $shippingMethodsResolver,
OrderInterface $order,
diff --git a/src/Sylius/Component/Core/spec/OrderProcessing/OrderTaxesProcessorSpec.php b/src/Sylius/Component/Core/spec/OrderProcessing/OrderTaxesProcessorSpec.php
index d9a6601a7e..7cabf8a64b 100644
--- a/src/Sylius/Component/Core/spec/OrderProcessing/OrderTaxesProcessorSpec.php
+++ b/src/Sylius/Component/Core/spec/OrderProcessing/OrderTaxesProcessorSpec.php
@@ -24,6 +24,7 @@ use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Core\Model\Scope;
use Sylius\Component\Core\Model\ShipmentInterface;
use Sylius\Component\Core\Provider\ZoneProviderInterface;
+use Sylius\Component\Core\Resolver\TaxationAddressResolverInterface;
use Sylius\Component\Core\Taxation\Exception\UnsupportedTaxCalculationStrategyException;
use Sylius\Component\Core\Taxation\Strategy\TaxCalculationStrategyInterface;
use Sylius\Component\Order\Processor\OrderProcessorInterface;
@@ -35,8 +36,9 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
ZoneProviderInterface $defaultTaxZoneProvider,
ZoneMatcherInterface $zoneMatcher,
PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
): void {
- $this->beConstructedWith($defaultTaxZoneProvider, $zoneMatcher, $strategyRegistry);
+ $this->beConstructedWith($defaultTaxZoneProvider, $zoneMatcher, $strategyRegistry, $taxationAddressResolver);
}
function it_is_an_order_processor(): void
@@ -47,6 +49,7 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
function it_processes_taxes_using_a_supported_tax_calculation_strategy(
ZoneMatcherInterface $zoneMatcher,
PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
OrderInterface $order,
OrderItemInterface $orderItem,
ShipmentInterface $shipment,
@@ -59,13 +62,13 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
$order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
$order->getShipments()->willReturn(new ArrayCollection([$shipment->getWrappedObject()]));
$order->isEmpty()->willReturn(false);
- $order->getBillingAddress()->willReturn($address);
$order->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
$orderItem->removeAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
$shipment->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
$strategyRegistry->all()->willReturn([$strategyOne, $strategyTwo]);
+ $taxationAddressResolver->getTaxationAddressFromOrder($order)->willReturn($address);
$zoneMatcher->match($address, Scope::TAX)->willReturn($zone);
$strategyOne->supports($order, $zone)->willReturn(false);
@@ -77,9 +80,42 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
$this->process($order);
}
+ function it_processes_taxes_for_the_default_tax_zone(
+ ZoneProviderInterface $defaultTaxZoneProvider,
+ ZoneMatcherInterface $zoneMatcher,
+ PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
+ OrderInterface $order,
+ OrderItemInterface $orderItem,
+ ShipmentInterface $shipment,
+ AddressInterface $address,
+ ZoneInterface $zone,
+ TaxCalculationStrategyInterface $strategyOne,
+ ): void {
+ $order->canBeProcessed()->willReturn(true);
+ $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
+ $order->getShipments()->willReturn(new ArrayCollection([$shipment->getWrappedObject()]));
+ $order->isEmpty()->willReturn(false);
+
+ $order->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
+ $orderItem->removeAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
+ $shipment->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
+
+ $strategyRegistry->all()->willReturn([$strategyOne]);
+ $taxationAddressResolver->getTaxationAddressFromOrder($order)->willReturn(null);
+ $zoneMatcher->match($address, Scope::TAX)->shouldNotBeCalled();
+ $defaultTaxZoneProvider->getZone($order)->willReturn($zone);
+
+ $strategyOne->supports($order, $zone)->willReturn(true);
+ $strategyOne->applyTaxes($order, $zone)->shouldBeCalled();
+
+ $this->process($order);
+ }
+
function it_throws_an_exception_if_there_are_no_supported_tax_calculation_strategies(
ZoneMatcherInterface $zoneMatcher,
PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
OrderInterface $order,
OrderItemInterface $orderItem,
AddressInterface $address,
@@ -90,11 +126,11 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
$order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
$order->getShipments()->willReturn(new ArrayCollection([]));
$order->isEmpty()->willReturn(false);
- $order->getBillingAddress()->willReturn($address);
$order->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
$orderItem->removeAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
+ $taxationAddressResolver->getTaxationAddressFromOrder($order)->willReturn($address);
$zoneMatcher->match($address, Scope::TAX)->willReturn($zone);
$strategyRegistry->all()->willReturn([$strategy]);
@@ -122,6 +158,7 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
ZoneProviderInterface $defaultTaxZoneProvider,
ZoneMatcherInterface $zoneMatcher,
PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
OrderInterface $order,
OrderItemInterface $orderItem,
AddressInterface $address,
@@ -134,8 +171,7 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
$order->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
$orderItem->removeAdjustmentsRecursively(AdjustmentInterface::TAX_ADJUSTMENT)->shouldBeCalled();
- $order->getBillingAddress()->willReturn($address);
-
+ $taxationAddressResolver->getTaxationAddressFromOrder($order)->willReturn($address);
$zoneMatcher->match($address, Scope::TAX)->willReturn(null);
$defaultTaxZoneProvider->getZone($order)->willReturn(null);
@@ -148,6 +184,7 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
function it_does_nothing_if_the_order_cannot_be_processed(
ZoneProviderInterface $defaultTaxZoneProvider,
PrioritizedServiceRegistryInterface $strategyRegistry,
+ TaxationAddressResolverInterface $taxationAddressResolver,
OrderInterface $order,
): void {
$order->canBeProcessed()->willReturn(false);
@@ -157,6 +194,7 @@ final class OrderTaxesProcessorSpec extends ObjectBehavior
$order->isEmpty()->shouldNotBeCalled();
$order->removeAdjustments(AdjustmentInterface::TAX_ADJUSTMENT)->shouldNotBeCalled();
+ $taxationAddressResolver->getTaxationAddressFromOrder($order)->shouldNotBeCalled();
$defaultTaxZoneProvider->getZone($order)->shouldNotBeCalled();
$strategyRegistry->all()->shouldNotBeCalled();
diff --git a/src/Sylius/Component/Core/spec/Promotion/Filter/PriceRangeFilterSpec.php b/src/Sylius/Component/Core/spec/Promotion/Filter/PriceRangeFilterSpec.php
index 3cffaa3a80..14ca8cc694 100644
--- a/src/Sylius/Component/Core/spec/Promotion/Filter/PriceRangeFilterSpec.php
+++ b/src/Sylius/Component/Core/spec/Promotion/Filter/PriceRangeFilterSpec.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
namespace spec\Sylius\Component\Core\Promotion\Filter;
use PhpSpec\ObjectBehavior;
-use Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface;
+use Sylius\Component\Core\Calculator\ProductVariantPricesCalculatorInterface;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;
@@ -22,9 +22,9 @@ use Sylius\Component\Core\Promotion\Filter\FilterInterface;
final class PriceRangeFilterSpec extends ObjectBehavior
{
- function let(ProductVariantPriceCalculatorInterface $productVariantPriceCalculator): void
+ function let(ProductVariantPricesCalculatorInterface $productVariantPricesCalculator): void
{
- $this->beConstructedWith($productVariantPriceCalculator);
+ $this->beConstructedWith($productVariantPricesCalculator);
}
function it_implements_a_filter_interface(): void
@@ -40,15 +40,15 @@ final class PriceRangeFilterSpec extends ObjectBehavior
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
ProductVariantInterface $item3Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
$item3->getVariant()->willReturn($item3Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
- $productVariantPriceCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(15000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
+ $productVariantPricesCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(15000);
$this
->filter([$item1, $item2, $item3], [
@@ -65,13 +65,13 @@ final class PriceRangeFilterSpec extends ObjectBehavior
OrderItemInterface $item2,
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(1000);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(15000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(1000);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(15000);
$this
->filter([$item1, $item2], [
@@ -88,13 +88,13 @@ final class PriceRangeFilterSpec extends ObjectBehavior
OrderItemInterface $item2,
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(10000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(10000);
$this
->filter([$item1, $item2], [
@@ -113,15 +113,15 @@ final class PriceRangeFilterSpec extends ObjectBehavior
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
ProductVariantInterface $item3Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
$item3->getVariant()->willReturn($item3Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
- $productVariantPriceCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(10000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
+ $productVariantPricesCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(10000);
$this
->filter([$item1, $item2, $item3], [
@@ -138,13 +138,13 @@ final class PriceRangeFilterSpec extends ObjectBehavior
OrderItemInterface $item2,
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(1000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(1000);
$this
->filter([$item1, $item2], [
@@ -163,15 +163,15 @@ final class PriceRangeFilterSpec extends ObjectBehavior
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
ProductVariantInterface $item3Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
$item3->getVariant()->willReturn($item3Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
- $productVariantPriceCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(10000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(5000);
+ $productVariantPricesCalculator->calculate($item3Variant, ['channel' => $channel])->willReturn(10000);
$this
->filter([$item1, $item2, $item3], [
@@ -188,13 +188,13 @@ final class PriceRangeFilterSpec extends ObjectBehavior
OrderItemInterface $item2,
ProductVariantInterface $item1Variant,
ProductVariantInterface $item2Variant,
- ProductVariantPriceCalculatorInterface $productVariantPriceCalculator,
+ ProductVariantPricesCalculatorInterface $productVariantPricesCalculator,
): void {
$item1->getVariant()->willReturn($item1Variant);
$item2->getVariant()->willReturn($item2Variant);
- $productVariantPriceCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(1000);
+ $productVariantPricesCalculator->calculate($item1Variant, ['channel' => $channel])->willReturn(500);
+ $productVariantPricesCalculator->calculate($item2Variant, ['channel' => $channel])->willReturn(1000);
$this
->filter([$item1, $item2], [
diff --git a/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/ContainsProductRuleUpdaterSpec.php b/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/ContainsProductRuleUpdaterSpec.php
deleted file mode 100644
index 75986c7e0c..0000000000
--- a/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/ContainsProductRuleUpdaterSpec.php
+++ /dev/null
@@ -1,86 +0,0 @@
-beConstructedWith($repository);
- }
-
- function it_implements_product_aware_rule_updater_interface(): void
- {
- $this->shouldImplement(ProductAwareRuleUpdaterInterface::class);
- }
-
- function it_does_nothing_when_no_promotion_rules_of_contains_product_type_were_found(
- RepositoryInterface $repository,
- ProductInterface $product,
- ): void {
- $repository->findBy(['type' => ContainsProductRuleChecker::TYPE])->willReturn([]);
- $repository->remove(Argument::any())->shouldNotBeCalled();
-
- $this->updateAfterProductDeletion($product)->shouldReturn([]);
- }
-
- function it_does_nothing_when_product_was_not_used_in_any_contains_product_rules(
- RepositoryInterface $repository,
- ProductInterface $product,
- PromotionRuleInterface $promotionRule,
- ): void {
- $product->getCode()->willReturn('code');
-
- $repository->findBy(['type' => ContainsProductRuleChecker::TYPE])->willReturn([$promotionRule]);
-
- $promotionRule->getConfiguration()->willReturn([
- 'product_code' => 'different_code',
- ]);
-
- $repository->remove(Argument::any())->shouldNotBeCalled();
-
- $this->updateAfterProductDeletion($product)->shouldReturn([]);
- }
-
- function it_removes_promotion_rule_and_returns_its_promotion_code_when_product_was_used_in_contains_product_rule(
- RepositoryInterface $repository,
- ProductInterface $product,
- PromotionRuleInterface $promotionRule,
- PromotionInterface $promotion,
- ): void {
- $product->getCode()->willReturn('code');
-
- $repository->findBy(['type' => ContainsProductRuleChecker::TYPE])->willReturn([$promotionRule]);
-
- $promotionRule->getConfiguration()->willReturn([
- 'product_code' => 'code',
- ]);
-
- $promotionRule->getPromotion()->willReturn($promotion);
- $promotion->getCode()->willReturn('promotion_code');
-
- $repository->remove($promotionRule)->shouldBeCalled();
-
- $this->updateAfterProductDeletion($product)->shouldReturn(['promotion_code']);
- }
-}
diff --git a/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdaterSpec.php b/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdaterSpec.php
deleted file mode 100644
index 4d8fed919e..0000000000
--- a/src/Sylius/Component/Core/spec/Promotion/Updater/Rule/TotalOfItemsFromTaxonRuleUpdaterSpec.php
+++ /dev/null
@@ -1,53 +0,0 @@
-beConstructedWith($promotionRuleRepository);
- }
-
- function it_removes_rules_that_using_deleted_taxon(
- RepositoryInterface $promotionRuleRepository,
- PromotionRuleInterface $firstPromotionRule,
- PromotionRuleInterface $secondPromotionRule,
- PromotionInterface $promotion,
- TaxonInterface $taxon,
- ): void {
- $taxon->getCode()->willReturn('toys');
-
- $promotionRuleRepository
- ->findBy(['type' => 'total_of_items_from_taxon'])
- ->willReturn([$firstPromotionRule, $secondPromotionRule])
- ;
- $firstPromotionRule->getConfiguration()->willReturn(['web' => ['taxon' => 'mugs', 'amount' => 500]]);
- $secondPromotionRule->getConfiguration()->willReturn(['web' => ['taxon' => 'toys', 'amount' => 300]]);
-
- $secondPromotionRule->getPromotion()->willReturn($promotion);
- $promotion->getCode()->willReturn('christmas');
-
- $promotionRuleRepository->remove($firstPromotionRule)->shouldNotBeCalled();
- $promotionRuleRepository->remove($secondPromotionRule)->shouldBeCalled();
-
- $this->updateAfterDeletingTaxon($taxon)->shouldReturn(['christmas']);
- }
-}
diff --git a/src/Sylius/Component/Core/spec/Provider/ProductVariantsPricesProviderSpec.php b/src/Sylius/Component/Core/spec/Provider/ProductVariantsPricesProviderSpec.php
deleted file mode 100644
index 0e5cc3cdb5..0000000000
--- a/src/Sylius/Component/Core/spec/Provider/ProductVariantsPricesProviderSpec.php
+++ /dev/null
@@ -1,228 +0,0 @@
-beConstructedWith($productVariantPriceCalculator);
- }
-
- function it_implements_a_variants_prices_provider_interface(): void
- {
- $this->shouldImplement(ProductVariantsPricesProviderInterface::class);
- }
-
- function it_provides_array_containing_product_variant_options_map_with_corresponding_price(
- ProductVariantPricesCalculatorInterface $productVariantPriceCalculator,
- ChannelInterface $channel,
- ProductInterface $tShirt,
- ProductOptionValueInterface $black,
- ProductOptionValueInterface $large,
- ProductOptionValueInterface $small,
- ProductOptionValueInterface $white,
- ProductVariantInterface $blackLargeTShirt,
- ProductVariantInterface $blackSmallTShirt,
- ProductVariantInterface $whiteLargeTShirt,
- ProductVariantInterface $whiteSmallTShirt,
- ): void {
- $tShirt->getEnabledVariants()->willReturn(new ArrayCollection([
- $blackSmallTShirt->getWrappedObject(),
- $whiteSmallTShirt->getWrappedObject(),
- $blackLargeTShirt->getWrappedObject(),
- $whiteLargeTShirt->getWrappedObject(),
- ]));
-
- $blackSmallTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
- $whiteSmallTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
- $blackLargeTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
- $whiteLargeTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
-
- $blackSmallTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$black->getWrappedObject(), $small->getWrappedObject()]),
- );
- $whiteSmallTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$white->getWrappedObject(), $small->getWrappedObject()]),
- );
- $blackLargeTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$black->getWrappedObject(), $large->getWrappedObject()]),
- );
- $whiteLargeTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$white->getWrappedObject(), $large->getWrappedObject()]),
- );
-
- $productVariantPriceCalculator->calculate($blackSmallTShirt, ['channel' => $channel])->willReturn(1000);
- $productVariantPriceCalculator->calculateOriginal($blackSmallTShirt, ['channel' => $channel])->willReturn(1000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($blackSmallTShirt, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($whiteSmallTShirt, ['channel' => $channel])->willReturn(1500);
- $productVariantPriceCalculator->calculateOriginal($whiteSmallTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($whiteSmallTShirt, ['channel' => $channel])->willReturn(400);
- $productVariantPriceCalculator->calculate($blackLargeTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateOriginal($blackLargeTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($blackLargeTShirt, ['channel' => $channel])->willReturn(300);
- $productVariantPriceCalculator->calculate($whiteLargeTShirt, ['channel' => $channel])->willReturn(2500);
- $productVariantPriceCalculator->calculateOriginal($whiteLargeTShirt, ['channel' => $channel])->willReturn(3000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($whiteLargeTShirt, ['channel' => $channel])->willReturn(200);
-
- $black->getOptionCode()->willReturn('t_shirt_color');
- $white->getOptionCode()->willReturn('t_shirt_color');
- $small->getOptionCode()->willReturn('t_shirt_size');
- $large->getOptionCode()->willReturn('t_shirt_size');
-
- $black->getCode()->willReturn('black');
- $white->getCode()->willReturn('white');
- $small->getCode()->willReturn('small');
- $large->getCode()->willReturn('large');
-
- $this->provideVariantsPrices($tShirt, $channel)->shouldReturn([
- [
- 't_shirt_color' => 'black',
- 't_shirt_size' => 'small',
- 'value' => 1000,
- 'lowest-price-before-discount' => 500,
- ],
- [
- 't_shirt_color' => 'white',
- 't_shirt_size' => 'small',
- 'value' => 1500,
- 'lowest-price-before-discount' => 400,
- 'original-price' => 2000,
- ],
- [
- 't_shirt_color' => 'black',
- 't_shirt_size' => 'large',
- 'value' => 2000,
- 'lowest-price-before-discount' => 300,
- ],
- [
- 't_shirt_color' => 'white',
- 't_shirt_size' => 'large',
- 'value' => 2500,
- 'lowest-price-before-discount' => 200,
- 'original-price' => 3000,
- ],
- ]);
- }
-
- function it_provides_array_containing_product_variant_options_map_with_corresponding_price_and_applied_promotions(
- ProductVariantPricesCalculatorInterface $productVariantPriceCalculator,
- ChannelInterface $channel,
- ProductInterface $tShirt,
- ProductOptionValueInterface $black,
- ProductOptionValueInterface $large,
- ProductOptionValueInterface $small,
- ProductOptionValueInterface $white,
- ProductVariantInterface $blackLargeTShirt,
- ProductVariantInterface $blackSmallTShirt,
- ProductVariantInterface $whiteLargeTShirt,
- ProductVariantInterface $whiteSmallTShirt,
- CatalogPromotionInterface $winterCatalogPromotion,
- CatalogPromotionInterface $summerCatalogPromotion,
- ): void {
- $tShirt->getEnabledVariants()->willReturn(new ArrayCollection([
- $blackSmallTShirt->getWrappedObject(),
- $whiteSmallTShirt->getWrappedObject(),
- $blackLargeTShirt->getWrappedObject(),
- $whiteLargeTShirt->getWrappedObject(),
- ]));
-
- $blackSmallTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection([
- $winterCatalogPromotion->getWrappedObject(),
- ]));
- $whiteSmallTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
- $blackLargeTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection(
- [
- $summerCatalogPromotion->getWrappedObject(), ],
- ));
- $whiteLargeTShirt->getAppliedPromotionsForChannel($channel)->willReturn(new ArrayCollection());
-
- $blackSmallTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$black->getWrappedObject(), $small->getWrappedObject()]),
- );
- $whiteSmallTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$white->getWrappedObject(), $small->getWrappedObject()]),
- );
- $blackLargeTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$black->getWrappedObject(), $large->getWrappedObject()]),
- );
- $whiteLargeTShirt->getOptionValues()->willReturn(
- new ArrayCollection([$white->getWrappedObject(), $large->getWrappedObject()]),
- );
-
- $productVariantPriceCalculator->calculate($blackSmallTShirt, ['channel' => $channel])->willReturn(1000);
- $productVariantPriceCalculator->calculateOriginal($blackSmallTShirt, ['channel' => $channel])->willReturn(1000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($blackSmallTShirt, ['channel' => $channel])->willReturn(500);
- $productVariantPriceCalculator->calculate($whiteSmallTShirt, ['channel' => $channel])->willReturn(1500);
- $productVariantPriceCalculator->calculateOriginal($whiteSmallTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($whiteSmallTShirt, ['channel' => $channel])->willReturn(400);
- $productVariantPriceCalculator->calculate($blackLargeTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateOriginal($blackLargeTShirt, ['channel' => $channel])->willReturn(2000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($blackLargeTShirt, ['channel' => $channel])->willReturn(300);
- $productVariantPriceCalculator->calculate($whiteLargeTShirt, ['channel' => $channel])->willReturn(2500);
- $productVariantPriceCalculator->calculateOriginal($whiteLargeTShirt, ['channel' => $channel])->willReturn(3000);
- $productVariantPriceCalculator->calculateLowestPriceBeforeDiscount($whiteLargeTShirt, ['channel' => $channel])->willReturn(200);
-
- $black->getOptionCode()->willReturn('t_shirt_color');
- $white->getOptionCode()->willReturn('t_shirt_color');
- $small->getOptionCode()->willReturn('t_shirt_size');
- $large->getOptionCode()->willReturn('t_shirt_size');
-
- $black->getCode()->willReturn('black');
- $white->getCode()->willReturn('white');
- $small->getCode()->willReturn('small');
- $large->getCode()->willReturn('large');
-
- $this->provideVariantsPrices($tShirt, $channel)->shouldReturn([
- [
- 't_shirt_color' => 'black',
- 't_shirt_size' => 'small',
- 'value' => 1000,
- 'applied_promotions' => [$winterCatalogPromotion],
- 'lowest-price-before-discount' => 500,
- ],
- [
- 't_shirt_color' => 'white',
- 't_shirt_size' => 'small',
- 'value' => 1500,
- 'lowest-price-before-discount' => 400,
- 'original-price' => 2000,
- ],
- [
- 't_shirt_color' => 'black',
- 't_shirt_size' => 'large',
- 'value' => 2000,
- 'applied_promotions' => [$summerCatalogPromotion],
- 'lowest-price-before-discount' => 300,
- ],
- [
- 't_shirt_color' => 'white',
- 't_shirt_size' => 'large',
- 'value' => 2500,
- 'lowest-price-before-discount' => 200,
- 'original-price' => 3000,
- ],
- ]);
- }
-}
diff --git a/src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpec.php b/src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpec.php
deleted file mode 100644
index ec636c125e..0000000000
--- a/src/Sylius/Component/Core/spec/Resolver/DefaultShippingMethodResolverSpec.php
+++ /dev/null
@@ -1,78 +0,0 @@
-beConstructedWith($shippingMethodRepository);
- }
-
- function it_implements_a_default_shipping_method_resolver_interface(): void
- {
- $this->shouldImplement(DefaultShippingMethodResolverInterface::class);
- }
-
- function it_returns_first_enabled_shipping_method_from_shipment_order_channel(
- ChannelInterface $channel,
- OrderInterface $order,
- ShipmentInterface $shipment,
- ShippingMethodInterface $firstShippingMethod,
- ShippingMethodInterface $secondShippingMethod,
- ShippingMethodRepositoryInterface $shippingMethodRepository,
- ): void {
- $shipment->getOrder()->willReturn($order);
- $order->getChannel()->willReturn($channel);
-
- $shippingMethodRepository
- ->findEnabledForChannel($channel)
- ->willReturn([$firstShippingMethod, $secondShippingMethod])
- ;
-
- $this->getDefaultShippingMethod($shipment)->shouldReturn($firstShippingMethod);
- }
-
- function it_throws_an_exception_if_there_is_no_enabled_shipping_methods_for_order_channel_and_zones(
- ChannelInterface $channel,
- OrderInterface $order,
- ShipmentInterface $shipment,
- ShippingMethodRepositoryInterface $shippingMethodRepository,
- ): void {
- $shipment->getOrder()->willReturn($order);
- $order->getChannel()->willReturn($channel);
-
- $shippingMethodRepository->findEnabledForChannel($channel)->willReturn([]);
-
- $this
- ->shouldThrow(UnresolvedDefaultShippingMethodException::class)
- ->during('getDefaultShippingMethod', [$shipment])
- ;
- }
-
- function it_throws_an_exception_if_passed_shipment_is_not_core_shipment_object(BaseShipmentInterface $shipment): void
- {
- $this->shouldThrow(\InvalidArgumentException::class)->during('getDefaultShippingMethod', [$shipment]);
- }
-}
diff --git a/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemUnitsTaxesApplicatorSpec.php b/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemUnitsTaxesApplicatorSpec.php
index a88c9652c2..a168df324f 100644
--- a/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemUnitsTaxesApplicatorSpec.php
+++ b/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemUnitsTaxesApplicatorSpec.php
@@ -35,8 +35,9 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
CalculatorInterface $calculator,
AdjustmentFactoryInterface $adjustmentsFactory,
TaxRateResolverInterface $taxRateResolver,
+ ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $taxRateResolver);
+ $this->beConstructedWith($calculator, $adjustmentsFactory, $taxRateResolver, $proportionalIntegerDistributor);
}
function it_implements_an_order_shipment_taxes_applicator_interface(): void
@@ -44,78 +45,11 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
$this->shouldImplement(OrderTaxesApplicatorInterface::class);
}
- function it_applies_taxes_on_units_based_on_item_total_and_rate(
- CalculatorInterface $calculator,
- AdjustmentFactoryInterface $adjustmentsFactory,
- TaxRateResolverInterface $taxRateResolver,
- AdjustmentInterface $taxAdjustment1,
- AdjustmentInterface $taxAdjustment2,
- OrderInterface $order,
- OrderItemInterface $orderItem,
- OrderItemUnitInterface $unit1,
- OrderItemUnitInterface $unit2,
- ProductVariantInterface $productVariant,
- TaxRateInterface $taxRate,
- ZoneInterface $zone,
- ): void {
- $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
-
- $orderItem->getVariant()->willReturn($productVariant);
- $taxRateResolver->resolve($productVariant, ['zone' => $zone])->willReturn($taxRate);
-
- $taxRate->getLabel()->willReturn('Simple tax (10%)');
- $taxRate->getCode()->willReturn('simple_tax');
- $taxRate->getName()->willReturn('Simple tax');
- $taxRate->getAmount()->willReturn(0.1);
- $taxRate->isIncludedInPrice()->willReturn(false);
-
- $orderItem->getUnits()->willReturn(new ArrayCollection([$unit1->getWrappedObject(), $unit2->getWrappedObject()]));
-
- $unit1->getTotal()->willReturn(1000);
- $calculator->calculate(1000, $taxRate)->willReturn(100);
-
- $unit2->getTotal()->willReturn(900);
- $calculator->calculate(900, $taxRate)->willReturn(90);
-
- $adjustmentsFactory
- ->createWithData(
- AdjustmentInterface::TAX_ADJUSTMENT,
- 'Simple tax (10%)',
- 100,
- false,
- [
- 'taxRateCode' => 'simple_tax',
- 'taxRateName' => 'Simple tax',
- 'taxRateAmount' => 0.1,
- ],
- )
- ->willReturn($taxAdjustment1)
- ;
- $adjustmentsFactory
- ->createWithData(
- AdjustmentInterface::TAX_ADJUSTMENT,
- 'Simple tax (10%)',
- 90,
- false,
- [
- 'taxRateCode' => 'simple_tax',
- 'taxRateName' => 'Simple tax',
- 'taxRateAmount' => 0.1,
- ],
- )
- ->willReturn($taxAdjustment2)
- ;
-
- $unit1->addAdjustment($taxAdjustment1)->shouldBeCalled();
- $unit2->addAdjustment($taxAdjustment2)->shouldBeCalled();
-
- $this->apply($order, $zone);
- }
-
function it_does_nothing_if_order_item_has_no_units(
CalculatorInterface $calculator,
AdjustmentFactoryInterface $adjustmentsFactory,
TaxRateResolverInterface $taxRateResolver,
+ ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
OrderInterface $order,
OrderItemInterface $orderItem,
ProductVariantInterface $productVariant,
@@ -129,6 +63,8 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
$orderItem->getUnits()->willReturn(new ArrayCollection());
$taxRateResolver->resolve(Argument::cetera())->willReturn($taxRate);
+ $proportionalIntegerDistributor->distribute([], 0)->willReturn([]);
+
$calculator->calculate(Argument::cetera())->shouldNotBeCalled();
$adjustmentsFactory->createWithData(Argument::cetera())->shouldNotBeCalled();
@@ -160,6 +96,7 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
CalculatorInterface $calculator,
AdjustmentFactoryInterface $adjustmentsFactory,
TaxRateResolverInterface $taxRateResolver,
+ ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
OrderInterface $order,
OrderItemInterface $orderItem,
OrderItemUnitInterface $unit1,
@@ -183,6 +120,8 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
$unit2->getTotal()->willReturn(900);
$calculator->calculate(900, $taxRate)->willReturn(0.00);
+ $proportionalIntegerDistributor->distribute([0, 0], 0)->willReturn([0, 0]);
+
$adjustmentsFactory->createWithData(AdjustmentInterface::TAX_ADJUSTMENT, Argument::cetera())->shouldNotBeCalled();
$unit1->addAdjustment(Argument::any())->shouldNotBeCalled();
$unit2->addAdjustment(Argument::any())->shouldNotBeCalled();
@@ -205,8 +144,6 @@ final class OrderItemUnitsTaxesApplicatorSpec extends ObjectBehavior
TaxRateInterface $taxRate,
ZoneInterface $zone,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $taxRateResolver, $proportionalIntegerDistributor);
-
$order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
$orderItem->getVariant()->willReturn($productVariant);
diff --git a/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemsTaxesApplicatorSpec.php b/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemsTaxesApplicatorSpec.php
index 00c2beb258..2de74cee52 100644
--- a/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemsTaxesApplicatorSpec.php
+++ b/src/Sylius/Component/Core/spec/Taxation/Applicator/OrderItemsTaxesApplicatorSpec.php
@@ -37,8 +37,9 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
AdjustmentFactoryInterface $adjustmentsFactory,
IntegerDistributorInterface $distributor,
TaxRateResolverInterface $taxRateResolver,
+ ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $distributor, $taxRateResolver);
+ $this->beConstructedWith($calculator, $adjustmentsFactory, $distributor, $taxRateResolver, $proportionalIntegerDistributor);
}
function it_implements_an_order_shipment_taxes_applicator_interface(): void
@@ -46,62 +47,6 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
$this->shouldImplement(OrderTaxesApplicatorInterface::class);
}
- function it_applies_taxes_on_units_based_on_item_total_and_rate_without_distribution_on_items(
- CalculatorInterface $calculator,
- AdjustmentFactoryInterface $adjustmentsFactory,
- IntegerDistributorInterface $distributor,
- TaxRateResolverInterface $taxRateResolver,
- AdjustmentInterface $taxAdjustment1,
- AdjustmentInterface $taxAdjustment2,
- OrderInterface $order,
- OrderItemInterface $orderItem,
- OrderItemUnitInterface $unit1,
- OrderItemUnitInterface $unit2,
- ProductVariantInterface $productVariant,
- TaxRateInterface $taxRate,
- ZoneInterface $zone,
- ): void {
- $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
-
- $orderItem->getQuantity()->willReturn(2);
-
- $orderItem->getVariant()->willReturn($productVariant);
- $taxRateResolver->resolve($productVariant, ['zone' => $zone])->willReturn($taxRate);
-
- $orderItem->getTotal()->willReturn(1000);
- $calculator->calculate(1000, $taxRate)->willReturn(100);
-
- $taxRate->getLabel()->willReturn('Simple tax (10%)');
- $taxRate->getCode()->willReturn('simple_tax');
- $taxRate->getName()->willReturn('Simple tax');
- $taxRate->getAmount()->willReturn(0.1);
- $taxRate->isIncludedInPrice()->willReturn(false);
-
- $orderItem->getUnits()->willReturn(new ArrayCollection([$unit1->getWrappedObject(), $unit2->getWrappedObject()]));
-
- $distributor->distribute(100, 2)->willReturn([50, 50]);
-
- $adjustmentsFactory
- ->createWithData(
- AdjustmentInterface::TAX_ADJUSTMENT,
- 'Simple tax (10%)',
- 50,
- false,
- [
- 'taxRateCode' => 'simple_tax',
- 'taxRateName' => 'Simple tax',
- 'taxRateAmount' => 0.1,
- ],
- )
- ->willReturn($taxAdjustment1, $taxAdjustment2)
- ;
-
- $unit1->addAdjustment($taxAdjustment1)->shouldBeCalled();
- $unit2->addAdjustment($taxAdjustment2)->shouldBeCalled();
-
- $this->apply($order, $zone);
- }
-
function it_throws_an_invalid_argument_exception_if_order_item_has_0_quantity(
OrderInterface $order,
OrderItemInterface $orderItem,
@@ -115,61 +60,6 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
$this->shouldThrow(\InvalidArgumentException::class)->during('apply', [$order, $zone]);
}
- function it_does_nothing_if_tax_rate_cannot_be_resolved(
- TaxRateResolverInterface $taxRateResolver,
- OrderInterface $order,
- OrderItemInterface $orderItem,
- ProductVariantInterface $productVariant,
- ZoneInterface $zone,
- ): void {
- $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
- $orderItem->getQuantity()->willReturn(5);
- $orderItem->getVariant()->willReturn($productVariant);
- $taxRateResolver->resolve($productVariant, ['zone' => $zone])->willReturn(null);
-
- $orderItem->getUnits()->shouldNotBeCalled();
-
- $this->apply($order, $zone);
- }
-
- function it_does_not_apply_taxes_with_amount_0(
- CalculatorInterface $calculator,
- AdjustmentFactoryInterface $adjustmentsFactory,
- IntegerDistributorInterface $distributor,
- TaxRateResolverInterface $taxRateResolver,
- OrderInterface $order,
- OrderItemInterface $orderItem,
- OrderItemUnitInterface $unit1,
- OrderItemUnitInterface $unit2,
- ProductVariantInterface $productVariant,
- TaxRateInterface $taxRate,
- ZoneInterface $zone,
- ): void {
- $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
-
- $orderItem->getQuantity()->willReturn(2);
- $orderItem->getVariant()->willReturn($productVariant);
-
- $taxRateResolver->resolve($productVariant, ['zone' => $zone])->willReturn($taxRate);
-
- $orderItem->getTotal()->willReturn(1000);
- $calculator->calculate(1000, $taxRate)->willReturn(0);
-
- $taxRate->getLabel()->willReturn('Simple tax (0%)');
- $taxRate->isIncludedInPrice()->willReturn(false);
-
- $orderItem->getUnits()->willReturn(new ArrayCollection([$unit1->getWrappedObject(), $unit2->getWrappedObject()]));
-
- $distributor->distribute(0, 2)->willReturn([0, 0]);
-
- $adjustmentsFactory
- ->createWithData(AdjustmentInterface::TAX_ADJUSTMENT, 'Simple tax (0%)', 0, false)
- ->shouldNotBeCalled()
- ;
-
- $this->apply($order, $zone);
- }
-
function it_applies_taxes_on_units_based_on_item_total_and_rate_with_distribution_on_items(
CalculatorInterface $calculator,
AdjustmentFactoryInterface $adjustmentsFactory,
@@ -190,8 +80,6 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
TaxRateInterface $taxRate,
ZoneInterface $zone,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $distributor, $taxRateResolver, $proportionalIntegerDistributor);
-
$order->getItems()->willReturn(new ArrayCollection([
$orderItem1->getWrappedObject(),
$orderItem2->getWrappedObject(),
@@ -272,6 +160,37 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
$this->apply($order, $zone);
}
+ function it_does_not_apply_taxes_with_amount_0(
+ CalculatorInterface $calculator,
+ AdjustmentFactoryInterface $adjustmentsFactory,
+ IntegerDistributorInterface $distributor,
+ TaxRateResolverInterface $taxRateResolver,
+ ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
+ OrderInterface $order,
+ OrderItemInterface $orderItem,
+ OrderItemUnitInterface $unit,
+ ProductVariantInterface $productVariant,
+ TaxRateInterface $taxRate,
+ ZoneInterface $zone,
+ ): void {
+ $order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
+
+ $orderItem->getQuantity()->willReturn(1);
+ $orderItem->getTotal()->willReturn(1000);
+ $orderItem->getUnits()->willReturn(new ArrayCollection([$unit->getWrappedObject()]));
+ $orderItem->getVariant()->willReturn($productVariant);
+ $taxRateResolver->resolve($productVariant, ['zone' => $zone])->willReturn($taxRate);
+
+ $calculator->calculate(1000, $taxRate)->willReturn(0);
+
+ $proportionalIntegerDistributor->distribute([0], 0)->willReturn([0, 0]);
+
+ $distributor->distribute(Argument::any())->shouldNotBeCalled();
+ $adjustmentsFactory->createWithData(Argument::any())->shouldNotBeCalled();
+
+ $this->apply($order, $zone);
+ }
+
function it_does_not_apply_taxes_with_distribution_on_items_if_the_given_item_has_no_tax_rate(
CalculatorInterface $calculator,
AdjustmentFactoryInterface $adjustmentsFactory,
@@ -284,8 +203,6 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
ProductVariantInterface $productVariant,
ZoneInterface $zone,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $distributor, $taxRateResolver, $proportionalIntegerDistributor);
-
$order->getItems()->willReturn(new ArrayCollection([$orderItem->getWrappedObject()]));
$orderItem->getQuantity()->willReturn(1);
@@ -305,17 +222,10 @@ final class OrderItemsTaxesApplicatorSpec extends ObjectBehavior
}
function it_throws_an_invalid_argument_exception_if_order_item_has_0_quantity_during_distribution_on_items(
- CalculatorInterface $calculator,
- AdjustmentFactoryInterface $adjustmentsFactory,
- IntegerDistributorInterface $distributor,
- TaxRateResolverInterface $taxRateResolver,
- ProportionalIntegerDistributorInterface $proportionalIntegerDistributor,
OrderInterface $order,
OrderItemInterface $orderItem,
ZoneInterface $zone,
): void {
- $this->beConstructedWith($calculator, $adjustmentsFactory, $distributor, $taxRateResolver, $proportionalIntegerDistributor);
-
$items = new ArrayCollection([$orderItem->getWrappedObject()]);
$order->getItems()->willReturn($items);
diff --git a/src/Sylius/Component/Core/spec/Translation/TranslatableEntityLocaleAssignerSpec.php b/src/Sylius/Component/Core/spec/Translation/TranslatableEntityLocaleAssignerSpec.php
index b6581ce041..943f4fe01b 100644
--- a/src/Sylius/Component/Core/spec/Translation/TranslatableEntityLocaleAssignerSpec.php
+++ b/src/Sylius/Component/Core/spec/Translation/TranslatableEntityLocaleAssignerSpec.php
@@ -23,9 +23,12 @@ use Sylius\Component\Resource\Translation\TranslatableEntityLocaleAssignerInterf
final class TranslatableEntityLocaleAssignerSpec extends ObjectBehavior
{
- function let(LocaleContextInterface $localeContext, TranslationLocaleProviderInterface $translationLocaleProvider): void
- {
- $this->beConstructedWith($localeContext, $translationLocaleProvider);
+ function let(
+ LocaleContextInterface $localeContext,
+ TranslationLocaleProviderInterface $translationLocaleProvider,
+ CLIContextCheckerInterface $commandBasedContextChecker,
+ ): void {
+ $this->beConstructedWith($localeContext, $translationLocaleProvider, $commandBasedContextChecker);
}
function it_implements_traslatable_entity_locale_assigner_interface(): void
@@ -37,30 +40,15 @@ final class TranslatableEntityLocaleAssignerSpec extends ObjectBehavior
LocaleContextInterface $localeContext,
TranslationLocaleProviderInterface $translationLocaleProvider,
TranslatableInterface $translatableEntity,
- ): void {
- $localeContext->getLocaleCode()->willReturn('de_DE');
- $translationLocaleProvider->getDefaultLocaleCode()->willReturn('en_US');
-
- $translatableEntity->setCurrentLocale('de_DE')->shouldBeCalled();
- $translatableEntity->setFallbackLocale('en_US')->shouldBeCalled();
-
- $this->assignLocale($translatableEntity);
- }
-
- function it_assigns_locale_if_command_based_context_checker_is_not_provided(
- LocaleContextInterface $localeContext,
- TranslationLocaleProviderInterface $translationLocaleProvider,
- TranslatableInterface $translatableEntity,
CLIContextCheckerInterface $commandBasedContextChecker,
): void {
$localeContext->getLocaleCode()->willReturn('de_DE');
$translationLocaleProvider->getDefaultLocaleCode()->willReturn('en_US');
+ $commandBasedContextChecker->isExecutedFromCLI()->willReturn(false);
$translatableEntity->setCurrentLocale('de_DE')->shouldBeCalled();
$translatableEntity->setFallbackLocale('en_US')->shouldBeCalled();
- $commandBasedContextChecker->isExecutedFromCLI()->shouldNotBeCalled();
-
$this->assignLocale($translatableEntity);
}
@@ -70,8 +58,6 @@ final class TranslatableEntityLocaleAssignerSpec extends ObjectBehavior
TranslatableInterface $translatableEntity,
CLIContextCheckerInterface $commandBasedContextChecker,
): void {
- $this->beConstructedWith($localeContext, $translationLocaleProvider, $commandBasedContextChecker);
-
$commandBasedContextChecker->isExecutedFromCLI()->willReturn(true);
$localeContext->getLocaleCode()->shouldNotBeCalled();
@@ -106,9 +92,11 @@ final class TranslatableEntityLocaleAssignerSpec extends ObjectBehavior
LocaleContextInterface $localeContext,
TranslationLocaleProviderInterface $translationLocaleProvider,
TranslatableInterface $translatableEntity,
+ CLIContextCheckerInterface $commandBasedContextChecker,
): void {
$localeContext->getLocaleCode()->willThrow(new LocaleNotFoundException());
$translationLocaleProvider->getDefaultLocaleCode()->willReturn('en_US');
+ $commandBasedContextChecker->isExecutedFromCLI()->willReturn(false);
$translatableEntity->setCurrentLocale('en_US')->shouldBeCalled();
$translatableEntity->setFallbackLocale('en_US')->shouldBeCalled();
diff --git a/src/Sylius/Component/Core/spec/Updater/UnpaidOrdersStateUpdaterSpec.php b/src/Sylius/Component/Core/spec/Updater/UnpaidOrdersStateUpdaterSpec.php
index 79eed85906..ef76d85919 100644
--- a/src/Sylius/Component/Core/spec/Updater/UnpaidOrdersStateUpdaterSpec.php
+++ b/src/Sylius/Component/Core/spec/Updater/UnpaidOrdersStateUpdaterSpec.php
@@ -114,61 +114,4 @@ final class UnpaidOrdersStateUpdaterSpec extends ObjectBehavior
$this->cancel();
}
-
- function it_wont_stop_cancelling_unpaid_orders_on_exception_for_a_single_order_and_skips_logging_if_logger_is_not_set(
- Factory $stateMachineFactory,
- ObjectManager $objectManager,
- OrderInterface $firstOrder,
- OrderInterface $secondOrder,
- OrderRepositoryInterface $orderRepository,
- StateMachineInterface $firstOrderStateMachine,
- StateMachineInterface $secondOrderStateMachine,
- ): void {
- $this->beConstructedWith($orderRepository, $stateMachineFactory, '10 months', null, $objectManager);
-
- $orderRepository->findOrdersUnpaidSince(Argument::type(\DateTimeInterface::class), 100)->willReturn(
- [$firstOrder, $secondOrder],
- [],
- );
-
- $firstOrder->getId()->shouldNotBeCalled();
-
- $stateMachineFactory->get($firstOrder, 'sylius_order')->willReturn($firstOrderStateMachine);
- $stateMachineFactory->get($secondOrder, 'sylius_order')->willReturn($secondOrderStateMachine);
-
- $firstOrderStateMachine->apply(OrderTransitions::TRANSITION_CANCEL)->shouldBeCalled()
- ->willThrow(new SMException())
- ;
- $secondOrderStateMachine->apply(OrderTransitions::TRANSITION_CANCEL)->shouldBeCalled();
-
- $this->cancel();
- }
-
- function it_wont_batch_processing_unpaid_orders_if_object_manager_is_not_set(
- Factory $stateMachineFactory,
- ObjectManager $objectManager,
- OrderInterface $firstOrder,
- OrderInterface $secondOrder,
- OrderRepositoryInterface $orderRepository,
- StateMachineInterface $firstOrderStateMachine,
- StateMachineInterface $secondOrderStateMachine,
- ): void {
- $this->beConstructedWith($orderRepository, $stateMachineFactory, '10 months', null, null, 100);
-
- $orderRepository->findOrdersUnpaidSince(Argument::type(\DateTimeInterface::class), null)->willReturn(
- [$firstOrder, $secondOrder],
- [],
- );
-
- $objectManager->flush()->shouldNotBeCalled();
- $objectManager->clear()->shouldNotBeCalled();
-
- $stateMachineFactory->get($firstOrder, 'sylius_order')->willReturn($firstOrderStateMachine);
- $stateMachineFactory->get($secondOrder, 'sylius_order')->willReturn($secondOrderStateMachine);
-
- $firstOrderStateMachine->apply(OrderTransitions::TRANSITION_CANCEL)->shouldBeCalled();
- $secondOrderStateMachine->apply(OrderTransitions::TRANSITION_CANCEL)->shouldBeCalled();
-
- $this->cancel();
- }
}
diff --git a/src/Sylius/Component/Currency/Repository/CurrencyRepositoryInterface.php b/src/Sylius/Component/Currency/Repository/CurrencyRepositoryInterface.php
new file mode 100644
index 0000000000..776774a7e4
--- /dev/null
+++ b/src/Sylius/Component/Currency/Repository/CurrencyRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface CurrencyRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json
index e6e40ee015..74c10288d2 100644
--- a/src/Sylius/Component/Currency/composer.json
+++ b/src/Sylius/Component/Currency/composer.json
@@ -25,9 +25,9 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource": "^1.9",
- "symfony/intl": "^5.4.21 || ^6.0",
+ "php": "^8.2",
+ "sylius/resource": "^1.10",
+ "symfony/intl": "^6.3.2",
"laminas/laminas-stdlib": "^3.3.1"
},
"require-dev": {
@@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Customer/composer.json b/src/Sylius/Component/Customer/composer.json
index c5603adfa3..cfec08d8dd 100644
--- a/src/Sylius/Component/Customer/composer.json
+++ b/src/Sylius/Component/Customer/composer.json
@@ -31,9 +31,9 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/collections": "^1.6",
- "sylius/resource": "^1.9"
+ "sylius/resource": "^1.10"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -45,7 +45,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Inventory/composer.json b/src/Sylius/Component/Inventory/composer.json
index a4c1647e59..805dcf5748 100644
--- a/src/Sylius/Component/Inventory/composer.json
+++ b/src/Sylius/Component/Inventory/composer.json
@@ -26,8 +26,8 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource": "^1.9",
+ "php": "^8.2",
+ "sylius/resource": "^1.10",
"webmozart/assert": "^1.9"
},
"require-dev": {
@@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json
index 03376f540d..fdb6102d8a 100644
--- a/src/Sylius/Component/Locale/composer.json
+++ b/src/Sylius/Component/Locale/composer.json
@@ -26,9 +26,9 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource": "^1.9",
- "symfony/intl": "^5.4.21 || ^6.0",
+ "php": "^8.2",
+ "sylius/resource": "^1.10",
+ "symfony/intl": "^6.3.2",
"laminas/laminas-stdlib": "^3.3.1"
},
"require-dev": {
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/app/config/_container_deprecation.php b/src/Sylius/Component/Order/Context/ResettableCartContextInterface.php
similarity index 57%
rename from app/config/_container_deprecation.php
rename to src/Sylius/Component/Order/Context/ResettableCartContextInterface.php
index 0b9944bac7..019ab286cc 100644
--- a/app/config/_container_deprecation.php
+++ b/src/Sylius/Component/Order/Context/ResettableCartContextInterface.php
@@ -9,14 +9,12 @@
* file that was distributed with this source code.
*/
-/**
- * @internal
- */
-
declare(strict_types=1);
-trigger_deprecation(
- 'sylius/sylius',
- '1.3',
- 'Importing files from Sylius/Sylius\'s "app/config" directory is deprecated.',
-);
+namespace Sylius\Component\Order\Context;
+
+use Symfony\Contracts\Service\ResetInterface;
+
+interface ResettableCartContextInterface extends CartContextInterface, ResetInterface
+{
+}
diff --git a/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php b/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php
index fe52839471..7e4b59773b 100644
--- a/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php
+++ b/src/Sylius/Component/Order/Repository/OrderRepositoryInterface.php
@@ -37,9 +37,6 @@ interface OrderRepositoryInterface extends RepositoryInterface
public function findOneByTokenValue(string $tokenValue): ?OrderInterface;
- /** @deprecated since Sylius 1.9 and will be removed in Sylius 2.0, use src/Sylius/Component/Core/Repository/OrderRepositoryInterface instead */
- public function findCartByTokenValue(string $tokenValue): ?OrderInterface;
-
public function findCartById($id): ?OrderInterface;
/**
diff --git a/src/Sylius/Component/Order/composer.json b/src/Sylius/Component/Order/composer.json
index eaedb93060..e5b219f369 100644
--- a/src/Sylius/Component/Order/composer.json
+++ b/src/Sylius/Component/Order/composer.json
@@ -26,8 +26,8 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/resource": "^1.9",
+ "php": "^8.2",
+ "sylius/resource": "^1.10",
"webmozart/assert": "^1.9",
"laminas/laminas-stdlib": "^3.3.1"
},
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Payment/composer.json b/src/Sylius/Component/Payment/composer.json
index 7ec0afc5e3..2c6b5fae15 100644
--- a/src/Sylius/Component/Payment/composer.json
+++ b/src/Sylius/Component/Payment/composer.json
@@ -26,9 +26,9 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9"
+ "php": "^8.2",
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Product/Repository/ProductAssociationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductAssociationRepositoryInterface.php
new file mode 100644
index 0000000000..f44e06e7b9
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductAssociationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductAssociationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductAssociationTypeTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductAssociationTypeTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..97ff617f49
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductAssociationTypeTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductAssociationTypeTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductAttributeRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductAttributeRepositoryInterface.php
new file mode 100644
index 0000000000..b40e29e89f
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductAttributeRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductAttributeRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductAttributeTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductAttributeTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..e85db69ece
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductAttributeTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductAttributeTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductAttributeValueRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductAttributeValueRepositoryInterface.php
index e4707eb581..fbc9718e3f 100644
--- a/src/Sylius/Component/Product/Repository/ProductAttributeValueRepositoryInterface.php
+++ b/src/Sylius/Component/Product/Repository/ProductAttributeValueRepositoryInterface.php
@@ -15,14 +15,14 @@ namespace Sylius\Component\Product\Repository;
use Doctrine\ORM\QueryBuilder;
use Sylius\Component\Product\Model\ProductAttributeValueInterface;
-use Sylius\Component\Resource\Repository\RepositoryInterface;
+use Sylius\Component\Attribute\Repository\AttributeValueRepositoryInterface as BaseAttributeValueRepositoryInterface;
/**
* @template T of ProductAttributeValueInterface
*
- * @extends RepositoryInterface
+ * @extends BaseAttributeValueRepositoryInterface
*/
-interface ProductAttributeValueRepositoryInterface extends RepositoryInterface
+interface ProductAttributeValueRepositoryInterface extends BaseAttributeValueRepositoryInterface
{
/**
* @return array|ProductAttributeValueInterface[]
diff --git a/src/Sylius/Component/Product/Repository/ProductOptionTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductOptionTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..fd4637c12f
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductOptionTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductOptionTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductOptionValueRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductOptionValueRepositoryInterface.php
new file mode 100644
index 0000000000..79ff3f6030
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductOptionValueRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductOptionValueRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductOptionValueTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductOptionValueTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..cf1e86aae3
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductOptionValueTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductOptionValueTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..ce346261c4
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/Repository/ProductVariantTranslationRepositoryInterface.php b/src/Sylius/Component/Product/Repository/ProductVariantTranslationRepositoryInterface.php
new file mode 100644
index 0000000000..490fd11c2b
--- /dev/null
+++ b/src/Sylius/Component/Product/Repository/ProductVariantTranslationRepositoryInterface.php
@@ -0,0 +1,26 @@
+
+ */
+interface ProductVariantTranslationRepositoryInterface extends RepositoryInterface
+{
+}
diff --git a/src/Sylius/Component/Product/composer.json b/src/Sylius/Component/Product/composer.json
index 507356ee88..35042564f4 100644
--- a/src/Sylius/Component/Product/composer.json
+++ b/src/Sylius/Component/Product/composer.json
@@ -28,11 +28,11 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"behat/transliterator": "^1.3",
- "sylius/attribute": "^1.12",
- "sylius/resource": "^1.9",
- "symfony/polyfill-iconv": "^1.17",
+ "sylius/attribute": "^2.0",
+ "sylius/resource": "^1.10",
+ "symfony/polyfill-iconv": "^1.28",
"webmozart/assert": "^1.9"
},
"require-dev": {
@@ -48,7 +48,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Promotion/composer.json b/src/Sylius/Component/Promotion/composer.json
index 2e37108fdb..a8b9537efb 100644
--- a/src/Sylius/Component/Promotion/composer.json
+++ b/src/Sylius/Component/Promotion/composer.json
@@ -25,10 +25,10 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/orm": "^2.13",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9"
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Review/composer.json b/src/Sylius/Component/Review/composer.json
index 9fa9db7448..bec653616a 100644
--- a/src/Sylius/Component/Review/composer.json
+++ b/src/Sylius/Component/Review/composer.json
@@ -37,9 +37,9 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/collections": "^1.6",
- "sylius/resource": "^1.9"
+ "sylius/resource": "^1.10"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -51,7 +51,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityChecker.php b/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityChecker.php
deleted file mode 100644
index ebff23547b..0000000000
--- a/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityChecker.php
+++ /dev/null
@@ -1,54 +0,0 @@
-getCategory()) {
- return true;
- }
-
- $numMatches = $numShippables = 0;
- foreach ($shippingSubject->getShippables() as $shippable) {
- ++$numShippables;
- if ($category === $shippable->getShippingCategory()) {
- ++$numMatches;
- }
- }
-
- return match ($shippingMethod->getCategoryRequirement()) {
- ShippingMethodInterface::CATEGORY_REQUIREMENT_MATCH_NONE => 0 === $numMatches,
- ShippingMethodInterface::CATEGORY_REQUIREMENT_MATCH_ANY => 0 < $numMatches,
- ShippingMethodInterface::CATEGORY_REQUIREMENT_MATCH_ALL => $numShippables === $numMatches,
- default => false,
- };
- }
-}
diff --git a/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityCheckerInterface.php b/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityCheckerInterface.php
deleted file mode 100644
index 04794a3369..0000000000
--- a/src/Sylius/Component/Shipping/Checker/ShippingMethodEligibilityCheckerInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-shippingMethodRepository instanceof ShippingMethodRepositoryInterface) {
- trigger_deprecation(
- 'sylius/shipping',
- '1.13',
- 'Not implementing "%s" in "%s" is deprecated and will be required in Sylius 2.0.',
- ShippingMethodRepositoryInterface::class,
- get_debug_type($this->shippingMethodRepository),
- );
- }
}
public function getSupportedMethods(ShippingSubjectInterface $subject): array
{
$methods = [];
- foreach ($this->getEnabledShippingMethods() as $shippingMethod) {
+ foreach ($this->shippingMethodRepository->findEnabledWithRules() as $shippingMethod) {
if ($this->eligibilityChecker->isEligible($subject, $shippingMethod)) {
$methods[] = $shippingMethod;
}
@@ -53,16 +42,4 @@ final class ShippingMethodsResolver implements ShippingMethodsResolverInterface
{
return true;
}
-
- /**
- * @return ShippingMethodInterface[]
- */
- private function getEnabledShippingMethods(): array
- {
- if ($this->shippingMethodRepository instanceof ShippingMethodRepositoryInterface) {
- return $this->shippingMethodRepository->findEnabledWithRules();
- }
-
- return $this->shippingMethodRepository->findBy(['enabled' => true]);
- }
}
diff --git a/src/Sylius/Component/Shipping/ShipmentUnitTransitions.php b/src/Sylius/Component/Shipping/ShipmentUnitTransitions.php
deleted file mode 100644
index dfd981a04c..0000000000
--- a/src/Sylius/Component/Shipping/ShipmentUnitTransitions.php
+++ /dev/null
@@ -1,34 +0,0 @@
-shouldImplement(ShippingMethodEligibilityCheckerInterface::class);
- }
-
- function it_approves_category_requirement_if_categories_match(
- ShippingSubjectInterface $subject,
- ShippingMethodInterface $shippingMethod,
- ShippingCategoryInterface $shippingCategory,
- ShippableInterface $shippable,
- ): void {
- $shippingMethod->getCategory()->willReturn($shippingCategory);
- $shippingMethod->getCategoryRequirement()->willReturn(ShippingMethodInterface::CATEGORY_REQUIREMENT_MATCH_ANY);
-
- $shippable->getShippingCategory()->willReturn($shippingCategory);
- $subject->getShippables()->willReturn(new ArrayCollection([$shippable->getWrappedObject()]));
-
- $this->isEligible($subject, $shippingMethod)->shouldReturn(true);
- }
-
- function it_approves_category_requirement_if_no_category_is_required(
- ShippingSubjectInterface $subject,
- ShippingMethodInterface $shippingMethod,
- ): void {
- $shippingMethod->getCategory()->willReturn(null);
-
- $this->isEligible($subject, $shippingMethod)->shouldReturn(true);
- }
-
- function it_denies_category_requirement_if_categories_do_not_match(
- ShippingSubjectInterface $subject,
- ShippingMethodInterface $shippingMethod,
- ShippingCategoryInterface $shippingCategory,
- ShippingCategoryInterface $shippingCategory2,
- ShippableInterface $shippable,
- ): void {
- $shippingMethod->getCategory()->willReturn($shippingCategory);
- $shippingMethod->getCategoryRequirement()->willReturn(ShippingMethodInterface::CATEGORY_REQUIREMENT_MATCH_ANY);
-
- $shippable->getShippingCategory()->willReturn($shippingCategory2);
- $subject->getShippables()->willReturn(new ArrayCollection([$shippable->getWrappedObject()]));
-
- $this->isEligible($subject, $shippingMethod)->shouldReturn(false);
- }
-}
diff --git a/src/Sylius/Component/Taxation/Checker/TaxRateDateEligibilityChecker.php b/src/Sylius/Component/Taxation/Checker/TaxRateDateEligibilityChecker.php
index d2863111e9..483d02736b 100644
--- a/src/Sylius/Component/Taxation/Checker/TaxRateDateEligibilityChecker.php
+++ b/src/Sylius/Component/Taxation/Checker/TaxRateDateEligibilityChecker.php
@@ -13,19 +13,19 @@ declare(strict_types=1);
namespace Sylius\Component\Taxation\Checker;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Taxation\Model\TaxRateInterface;
+use Symfony\Component\Clock\ClockInterface;
final class TaxRateDateEligibilityChecker implements TaxRateDateEligibilityCheckerInterface
{
public function __construct(
- protected DateTimeProviderInterface $calendar,
+ protected ClockInterface $clock,
) {
}
public function isEligible(TaxRateInterface $taxRate): bool
{
- $date = $this->calendar->now();
+ $date = $this->clock->now();
$startDate = $taxRate->getStartDate();
$endDate = $taxRate->getEndDate();
diff --git a/src/Sylius/Component/Taxation/Resolver/TaxRateResolver.php b/src/Sylius/Component/Taxation/Resolver/TaxRateResolver.php
index ed2580602c..6f8d8931bc 100644
--- a/src/Sylius/Component/Taxation/Resolver/TaxRateResolver.php
+++ b/src/Sylius/Component/Taxation/Resolver/TaxRateResolver.php
@@ -22,15 +22,8 @@ class TaxRateResolver implements TaxRateResolverInterface
{
public function __construct(
protected RepositoryInterface $taxRateRepository,
- protected ?TaxRateDateEligibilityCheckerInterface $taxRateDateChecker = null,
+ protected TaxRateDateEligibilityCheckerInterface $taxRateDateChecker,
) {
- if ($this->taxRateDateChecker === null) {
- trigger_deprecation(
- 'sylius/taxation',
- '1.12',
- 'Not passing a $taxRateDateChecker through constructor is deprecated and it will be prohibited in Sylius 2.0',
- );
- }
}
public function resolve(TaxableInterface $taxable, array $criteria = []): ?TaxRateInterface
@@ -41,17 +34,8 @@ class TaxRateResolver implements TaxRateResolverInterface
$criteria = array_merge(['category' => $category], $criteria);
- if ($this->taxRateDateChecker) {
- $taxRates = $this->taxRateRepository->findBy($criteria);
+ $taxRates = $this->taxRateRepository->findBy($criteria);
- return $this->provideEligibleTaxRate($taxRates);
- }
-
- return $this->taxRateRepository->findOneBy($criteria);
- }
-
- private function provideEligibleTaxRate(array $taxRates): ?TaxRateInterface
- {
foreach ($taxRates as $taxRate) {
if ($this->taxRateDateChecker->isEligible($taxRate)) {
return $taxRate;
diff --git a/src/Sylius/Component/Taxation/composer.json b/src/Sylius/Component/Taxation/composer.json
index b9d2bdadca..2c458a2ad1 100644
--- a/src/Sylius/Component/Taxation/composer.json
+++ b/src/Sylius/Component/Taxation/composer.json
@@ -28,10 +28,10 @@
}
],
"require": {
- "php": "^8.0",
- "sylius/calendar": "^0.3 || ^0.4 || ^0.5",
- "sylius/registry": "^1.5",
- "sylius/resource": "^1.9"
+ "php": "^8.2",
+ "sylius/registry": "^1.6",
+ "sylius/resource": "^1.10",
+ "symfony/clock": "^6.3.4"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -43,7 +43,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/Taxation/spec/Checker/TaxRateDateEligibilityCheckerSpec.php b/src/Sylius/Component/Taxation/spec/Checker/TaxRateDateEligibilityCheckerSpec.php
index 074fc6b6eb..54ac7b8a40 100644
--- a/src/Sylius/Component/Taxation/spec/Checker/TaxRateDateEligibilityCheckerSpec.php
+++ b/src/Sylius/Component/Taxation/spec/Checker/TaxRateDateEligibilityCheckerSpec.php
@@ -13,17 +13,16 @@ declare(strict_types=1);
namespace spec\Sylius\Component\Taxation\Checker;
-use DateTime;
use PhpSpec\ObjectBehavior;
-use Sylius\Calendar\Provider\DateTimeProviderInterface;
use Sylius\Component\Taxation\Checker\TaxRateDateEligibilityCheckerInterface;
use Sylius\Component\Taxation\Model\TaxRateInterface;
+use Symfony\Component\Clock\ClockInterface;
final class TaxRateDateEligibilityCheckerSpec extends ObjectBehavior
{
- function let(DateTimeProviderInterface $calendar): void
+ function let(ClockInterface $clock): void
{
- $this->beConstructedWith($calendar);
+ $this->beConstructedWith($clock);
}
function it_implements_tax_rate_resolver_interface(): void
@@ -34,16 +33,16 @@ final class TaxRateDateEligibilityCheckerSpec extends ObjectBehavior
function it_can_be_in_date_when_both_dates_are_defined(
TaxRateInterface $taxRate1,
TaxRateInterface $taxRate2,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
): void {
- $calendar->now()->willReturn(new DateTime('01-02-2022'));
- $startDate = new DateTime('01-01-2022');
- $endDate = new DateTime('01-03-2022');
+ $clock->now()->willReturn(new \DateTimeImmutable('01-02-2022'));
+ $startDate = new \DateTimeImmutable('01-01-2022');
+ $endDate = new \DateTimeImmutable('01-03-2022');
$taxRate1->getStartDate()->willReturn($startDate);
$taxRate1->getEndDate()->willReturn($endDate);
- $startDate2 = new DateTime('01-01-2012');
- $endDate2 = new DateTime('21-01-2022');
+ $startDate2 = new \DateTimeImmutable('01-01-2012');
+ $endDate2 = new \DateTimeImmutable('21-01-2022');
$taxRate2->getStartDate()->willReturn($startDate2);
$taxRate2->getEndDate()->willReturn($endDate2);
@@ -54,14 +53,14 @@ final class TaxRateDateEligibilityCheckerSpec extends ObjectBehavior
function it_can_be_in_date_when_only_start_date_is_defined(
TaxRateInterface $taxRate1,
TaxRateInterface $taxRate2,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
): void {
- $calendar->now()->willReturn(new DateTime('01-02-2022'));
- $startDate = new DateTime('01-01-2022');
+ $clock->now()->willReturn(new \DateTimeImmutable('01-02-2022'));
+ $startDate = new \DateTimeImmutable('01-01-2022');
$taxRate1->getStartDate()->willReturn($startDate);
$taxRate1->getEndDate()->willReturn(null);
- $startDate2 = new DateTime('21-09-2029');
+ $startDate2 = new \DateTimeImmutable('21-09-2029');
$taxRate2->getStartDate()->willReturn($startDate2);
$taxRate2->getEndDate()->willReturn(null);
@@ -72,14 +71,14 @@ final class TaxRateDateEligibilityCheckerSpec extends ObjectBehavior
function it_can_be_in_date_when_only_end_date_is_defined(
TaxRateInterface $taxRate1,
TaxRateInterface $taxRate2,
- DateTimeProviderInterface $calendar,
+ ClockInterface $clock,
): void {
- $calendar->now()->willReturn(new DateTime('01-02-2022'));
- $endDate = new DateTime('01-01-2022');
+ $clock->now()->willReturn(new \DateTimeImmutable('01-02-2022'));
+ $endDate = new \DateTimeImmutable('01-01-2022');
$taxRate1->getStartDate()->willReturn(null);
$taxRate1->getEndDate()->willReturn($endDate);
- $endDate2 = new DateTime('21-09-2029');
+ $endDate2 = new \DateTimeImmutable('21-09-2029');
$taxRate2->getStartDate()->willReturn(null);
$taxRate2->getEndDate()->willReturn($endDate2);
diff --git a/src/Sylius/Component/Taxonomy/composer.json b/src/Sylius/Component/Taxonomy/composer.json
index 566b9dd61c..68cb164b5a 100644
--- a/src/Sylius/Component/Taxonomy/composer.json
+++ b/src/Sylius/Component/Taxonomy/composer.json
@@ -26,9 +26,9 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"behat/transliterator": "^1.3",
- "sylius/resource": "^1.9",
+ "sylius/resource": "^1.10",
"webmozart/assert": "^1.9"
},
"require-dev": {
@@ -41,7 +41,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/User/Model/User.php b/src/Sylius/Component/User/Model/User.php
index 286928a791..7db49156b0 100644
--- a/src/Sylius/Component/User/Model/User.php
+++ b/src/Sylius/Component/User/Model/User.php
@@ -291,6 +291,9 @@ class User implements UserInterface, \Stringable
}
}
+ /**
+ * @inheritdoc
+ */
public function getRoles(): array
{
return $this->roles;
@@ -401,20 +404,13 @@ class User implements UserInterface, \Stringable
}
/**
- * @internal
- *
- * @deprecated since Sylius 1.11 and will be removed in Sylius 2.0, use \Sylius\Component\User\Model\User::__serialize() or \serialize($user) in PHP 8.1 instead
+ * @inheritdoc
*/
- public function serialize(): string
- {
- return serialize($this->__serialize());
- }
-
- public function __unserialize(array $serialized): void
+ public function __unserialize(array $data): void
{
// add a few extra elements in the array to ensure that we have enough keys when unserializing
// older data which does not include all properties.
- $serialized = array_merge($serialized, array_fill(0, 2, null));
+ $data = array_merge($data, array_fill(0, 2, null));
[
$this->password,
@@ -425,19 +421,7 @@ class User implements UserInterface, \Stringable
$this->enabled,
$this->id,
$this->encoderName,
- ] = $serialized;
- }
-
- /**
- * @param string $serialized
- *
- * @internal
- *
- * @deprecated since Sylius 1.11 and will be removed in Sylius 2.0, use \Sylius\Component\User\Model\User::__unserialize() or \unserialize($serialized) in PHP 8.1 instead
- */
- public function unserialize($serialized): void
- {
- $this->__unserialize(unserialize($serialized));
+ ] = $data;
}
protected function hasExpired(?\DateTimeInterface $date): bool
diff --git a/src/Sylius/Component/User/Model/UserInterface.php b/src/Sylius/Component/User/Model/UserInterface.php
index e2c8305fac..fc6250c155 100644
--- a/src/Sylius/Component/User/Model/UserInterface.php
+++ b/src/Sylius/Component/User/Model/UserInterface.php
@@ -25,7 +25,6 @@ interface UserInterface extends
AdvancedUserInterface,
CredentialsHolderInterface,
ResourceInterface,
- \Serializable,
TimestampableInterface,
ToggleableInterface,
EncoderAwareInterface,
@@ -114,5 +113,6 @@ interface UserInterface extends
public function __serialize(): array;
+ /** @param array $data */
public function __unserialize(array $data): void;
}
diff --git a/src/Sylius/Component/User/Security/PasswordUpdater.php b/src/Sylius/Component/User/Security/PasswordUpdater.php
index 37cf520973..2470a85ad4 100644
--- a/src/Sylius/Component/User/Security/PasswordUpdater.php
+++ b/src/Sylius/Component/User/Security/PasswordUpdater.php
@@ -17,17 +17,8 @@ use Sylius\Component\User\Model\CredentialsHolderInterface;
final class PasswordUpdater implements PasswordUpdaterInterface
{
- public function __construct(private UserPasswordEncoderInterface|UserPasswordHasherInterface $userPasswordEncoderOrHasher)
+ public function __construct(private UserPasswordHasherInterface $userPasswordHasher)
{
- if ($this->userPasswordEncoderOrHasher instanceof UserPasswordEncoderInterface) {
- trigger_deprecation(
- 'sylius/user',
- '1.12',
- 'The "%s" class is deprecated, use "%s" instead.',
- UserPasswordEncoderInterface::class,
- UserPasswordHasherInterface::class,
- );
- }
}
public function updatePassword(CredentialsHolderInterface $user): void
@@ -36,14 +27,7 @@ final class PasswordUpdater implements PasswordUpdaterInterface
return;
}
- if ($this->userPasswordEncoderOrHasher instanceof UserPasswordEncoderInterface) {
- $user->setPassword($this->userPasswordEncoderOrHasher->encode($user));
- $user->eraseCredentials();
-
- return;
- }
-
- $user->setPassword($this->userPasswordEncoderOrHasher->hash($user));
+ $user->setPassword($this->userPasswordHasher->hash($user));
$user->eraseCredentials();
}
}
diff --git a/src/Sylius/Component/User/Security/UserPasswordEncoderInterface.php b/src/Sylius/Component/User/Security/UserPasswordEncoderInterface.php
deleted file mode 100644
index ecf75cbf65..0000000000
--- a/src/Sylius/Component/User/Security/UserPasswordEncoderInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-algorithm = $algorithm ?? 'sha512';
- $this->encodeHashAsBase64 = $encodeHashAsBase64 ?? true;
- $this->iterations = $iterations ?? 1000;
- $this->length = $length ?? 40;
- }
-
- /**
- * @throws \LogicException when the algorithm is not supported
- */
- public function encode(CredentialsHolderInterface $user): string
- {
- return $this->encodePassword($user->getPlainPassword(), $user->getSalt());
- }
-
- /**
- * @throws \InvalidArgumentException
- * @throws \LogicException when the algorithm is not supported
- */
- private function encodePassword(string $plainPassword, string $salt): string
- {
- Assert::lessThanEq(
- strlen($plainPassword),
- self::MAX_PASSWORD_LENGTH,
- sprintf('The password must be at most %d characters long.', self::MAX_PASSWORD_LENGTH),
- );
-
- if (!in_array($this->algorithm, hash_algos(), true)) {
- throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm));
- }
-
- $digest = hash_pbkdf2($this->algorithm, $plainPassword, $salt, $this->iterations, $this->length, true);
-
- return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest);
- }
-}
diff --git a/src/Sylius/Component/User/composer.json b/src/Sylius/Component/User/composer.json
index 6905f7512c..2609c5a1e7 100644
--- a/src/Sylius/Component/User/composer.json
+++ b/src/Sylius/Component/User/composer.json
@@ -33,12 +33,12 @@
}
],
"require": {
- "php": "^8.0",
+ "php": "^8.2",
"doctrine/collections": "^1.6",
"sylius-labs/polyfill-symfony-security": "^1.1",
- "sylius/resource": "^1.9",
- "symfony/polyfill-mbstring": "^1.17",
- "symfony/security-core": "^5.4.21 || ^6.0"
+ "sylius/resource": "^1.10",
+ "symfony/polyfill-mbstring": "^1.28",
+ "symfony/security-core": "^6.3.3"
},
"require-dev": {
"phpspec/phpspec": "^7.2"
@@ -53,7 +53,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.12-dev"
+ "dev-main": "2.0-dev"
}
},
"autoload": {
diff --git a/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php b/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php
index 79e6195f0c..eb728fef77 100644
--- a/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php
+++ b/src/Sylius/Component/User/spec/Security/PasswordUpdaterSpec.php
@@ -17,7 +17,6 @@ use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Component\User\Model\UserInterface;
use Sylius\Component\User\Security\PasswordUpdaterInterface;
-use Sylius\Component\User\Security\UserPasswordEncoderInterface;
use Sylius\Component\User\Security\UserPasswordHasherInterface;
final class PasswordUpdaterSpec extends ObjectBehavior
@@ -28,7 +27,7 @@ final class PasswordUpdaterSpec extends ObjectBehavior
$this->shouldImplement(PasswordUpdaterInterface::class);
}
- function it_updates_user_profile_with_hashed_password_if_using_symfony_6(
+ function it_updates_user_profile_with_hashed_password(
UserPasswordHasherInterface $userPasswordHasher,
UserInterface $user,
): void {
@@ -43,21 +42,6 @@ final class PasswordUpdaterSpec extends ObjectBehavior
$this->updatePassword($user);
}
- function it_updates_user_profile_with_encoded_password_if_using_symfony_5_4(
- UserPasswordEncoderInterface $userPasswordEncoder,
- UserInterface $user,
- ): void {
- $this->beConstructedWith($userPasswordEncoder);
- $user->getPlainPassword()->willReturn('topSecretPlainPassword');
-
- $userPasswordEncoder->encode($user)->willReturn('topSecretEncodedPassword');
-
- $user->eraseCredentials()->shouldBeCalled();
- $user->setPassword('topSecretEncodedPassword')->shouldBeCalled();
-
- $this->updatePassword($user);
- }
-
function it_does_nothing_if_plain_password_is_empty(
UserPasswordHasherInterface $userPasswordHasher,
UserInterface $user,
diff --git a/src/Sylius/Component/User/spec/Security/UserPbkdf2PasswordEncoderSpec.php b/src/Sylius/Component/User/spec/Security/UserPbkdf2PasswordEncoderSpec.php
deleted file mode 100644
index 2178b0fc71..0000000000
--- a/src/Sylius/Component/User/spec/Security/UserPbkdf2PasswordEncoderSpec.php
+++ /dev/null
@@ -1,34 +0,0 @@
-shouldImplement(UserPasswordEncoderInterface::class);
- }
-
- function it_encodes_password(CredentialsHolderInterface $user): void
- {
- $user->getPlainPassword()->willReturn('myPassword');
- $user->getSalt()->willReturn('typicalSalt');
-
- $this->encode($user)->shouldReturn('G1DuArwJiu+4Ctk9p2965gC3SXjGcom6gNhmV0OGUm79Kb9Anm5GWg==');
- }
-}
diff --git a/symfony.lock b/symfony.lock
index d739fe2739..149ea1a386 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -1,23 +1,11 @@
{
- "aeon-php/calendar": {
- "version": "0.15.0"
- },
- "alcohol/iso4217": {
- "version": "4.0.0"
- },
- "amphp/amp": {
- "version": "v2.5.0"
- },
- "amphp/byte-stream": {
- "version": "v1.8.0"
- },
"api-platform/core": {
- "version": "2.5",
+ "version": "2.7",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
+ "branch": "main",
"version": "2.5",
- "ref": "a93061567140e386f107be75340ac2aee3f86cbf"
+ "ref": "b86557ce5677fa855b1b2608f4a4bc4a8fed8be7"
},
"files": [
"config/packages/api_platform.yaml",
@@ -26,257 +14,85 @@
]
},
"babdev/pagerfanta-bundle": {
- "version": "v2.8.0"
- },
- "behat/behat": {
- "version": "v3.7.0"
- },
- "behat/gherkin": {
- "version": "v4.6.2"
- },
- "behat/mink-selenium2-driver": {
- "version": "v1.4.0"
- },
- "behat/transliterator": {
- "version": "v1.3.0"
- },
- "clue/stream-filter": {
- "version": "v1.4.1"
- },
- "coduo/php-matcher": {
- "version": "4.0.0"
- },
- "coduo/php-to-string": {
- "version": "3.0.0"
- },
- "composer/pcre": {
- "version": "3.0.0"
- },
- "composer/semver": {
- "version": "1.5.1"
- },
- "composer/xdebug-handler": {
- "version": "1.4.3"
- },
- "dealerdirect/phpcodesniffer-composer-installer": {
- "version": "v0.7.0"
- },
- "dmore/behat-chrome-extension": {
- "version": "1.3.0"
- },
- "dmore/chrome-mink-driver": {
- "version": "2.7.0"
- },
- "dnoegel/php-xdg-base-dir": {
- "version": "v0.1.1"
+ "version": "v3.8.0"
},
"doctrine/annotations": {
- "version": "1.0",
+ "version": "2.0",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "1.0",
- "ref": "a2759dd6123694c8d901d0ec80006e044c2e6457"
- },
- "files": [
- "config/routes/annotations.yaml"
- ]
- },
- "doctrine/cache": {
- "version": "1.10.2"
- },
- "doctrine/collections": {
- "version": "1.6.7"
- },
- "doctrine/common": {
- "version": "2.13.3"
- },
- "doctrine/data-fixtures": {
- "version": "1.4.4"
- },
- "doctrine/dbal": {
- "version": "2.10.3"
- },
- "doctrine/deprecations": {
- "version": "v0.5.3"
+ "branch": "main",
+ "version": "1.10",
+ "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05"
+ }
},
"doctrine/doctrine-bundle": {
- "version": "1.12",
+ "version": "2.10",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "1.12",
- "ref": "b11d5292f574a9cd092d506c899d05c79cf4d613"
+ "branch": "main",
+ "version": "2.10",
+ "ref": "e025a6cb69b195970543820b2f18ad21724473fa"
},
"files": [
"config/packages/doctrine.yaml",
- "config/packages/prod/doctrine.yaml",
"src/Entity/.gitignore",
"src/Repository/.gitignore"
]
},
"doctrine/doctrine-migrations-bundle": {
- "version": "2.2",
+ "version": "3.2",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "2.2",
- "ref": "baaa439e3e3179e69e3da84b671f0a3e4a2f56ad"
+ "branch": "main",
+ "version": "3.1",
+ "ref": "1d01ec03c6ecbd67c3375c5478c9a423ae5d6a33"
},
"files": [
"config/packages/doctrine_migrations.yaml",
"migrations/.gitignore"
]
},
- "doctrine/event-manager": {
- "version": "1.1.1"
- },
- "doctrine/inflector": {
- "version": "1.3.1"
- },
- "doctrine/instantiator": {
- "version": "1.3.1"
- },
- "doctrine/lexer": {
- "version": "1.2.1"
- },
- "doctrine/migrations": {
- "version": "3.0.1"
- },
- "doctrine/orm": {
- "version": "v2.7.3"
- },
- "doctrine/persistence": {
- "version": "1.3.8"
- },
- "doctrine/sql-formatter": {
- "version": "1.1.1"
- },
- "egulias/email-validator": {
- "version": "2.1.19"
- },
- "enshrined/svg-sanitize": {
- "version": "0.16.0"
- },
- "fakerphp/faker": {
- "version": "v1.12.0"
- },
- "felixfbecker/advanced-json-rpc": {
- "version": "v3.1.1"
- },
- "felixfbecker/language-server-protocol": {
- "version": "v1.4.0"
- },
- "friends-of-behat/mink": {
- "version": "v1.8.0"
- },
- "friends-of-behat/mink-browserkit-driver": {
- "version": "v1.4.0"
- },
- "friends-of-behat/mink-debug-extension": {
- "version": "v2.0.0"
- },
- "friends-of-behat/mink-extension": {
- "version": "v2.4.0"
- },
- "friends-of-behat/page-object-extension": {
- "version": "v0.3.1"
- },
"friends-of-behat/symfony-extension": {
- "version": "2.0",
+ "version": "2.4",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
+ "branch": "main",
"version": "2.0",
- "ref": "3d21344765fd3440a85bdd27d4cada186ec628bd"
+ "ref": "1e012e04f573524ca83795cd19df9ea690adb604"
}
},
- "friends-of-behat/variadic-extension": {
- "version": "v1.3.0"
- },
- "friendsofphp/proxy-manager-lts": {
- "version": "v1.0.2"
- },
"friendsofsymfony/rest-bundle": {
- "version": "2.2",
+ "version": "3.5",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
- "version": "2.2",
- "ref": "cad41ef93d6150067ae2bb3c7fd729492dff6f0a"
+ "branch": "main",
+ "version": "3.0",
+ "ref": "3762cc4e4f2d6faabeca5a151b41c8c791bd96e5"
}
},
- "gedmo/doctrine-extensions": {
- "version": "v2.4.42"
- },
- "guzzlehttp/guzzle": {
- "version": "6.5.5"
- },
- "guzzlehttp/promises": {
- "version": "v1.3.1"
- },
- "guzzlehttp/psr7": {
- "version": "1.6.1"
- },
- "hamcrest/hamcrest-php": {
- "version": "v2.0.1"
- },
"hwi/oauth-bundle": {
- "version": "0.6",
- "recipe": {
- "repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
- "version": "0.6",
- "ref": "20cacc9b2da49d96ea55c8a8dd31324c5be88bc9"
- }
- },
- "imagine/imagine": {
- "version": "1.2.3"
- },
- "instaclick/php-webdriver": {
- "version": "1.4.7"
- },
- "jms/metadata": {
- "version": "1.7.0"
- },
- "jms/serializer": {
- "version": "1.14.1"
- },
- "jms/serializer-bundle": {
"version": "2.0",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
- "version": "2.0",
- "ref": "fe60ce509ef04a3f40da96e3979bc8d9b13b2372"
+ "branch": "main",
+ "version": "0.6",
+ "ref": "18ce21f16066cccfa0803c9e846a2e4f4bec92ab"
}
},
- "knplabs/gaufrette": {
- "version": "v0.8.3"
+ "jms/serializer-bundle": {
+ "version": "4.2",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "4.0",
+ "ref": "cc04e10cf7171525b50c18b36004edf64cb478be"
+ }
},
"knplabs/knp-gaufrette-bundle": {
- "version": "v0.7.1"
- },
- "knplabs/knp-menu": {
- "version": "v3.1.2"
+ "version": "v0.8.0"
},
"knplabs/knp-menu-bundle": {
- "version": "v3.0.0"
- },
- "laminas/laminas-code": {
- "version": "3.5.1"
- },
- "laminas/laminas-stdlib": {
- "version": "3.3.1"
- },
- "lchrusciel/api-test-case": {
- "version": "v5.0.0"
- },
- "lcobucci/clock": {
- "version": "2.0.0"
- },
- "lcobucci/jwt": {
- "version": "3.3.1"
+ "version": "v3.2.0"
},
"league/flysystem-bundle": {
"version": "2.4",
@@ -291,640 +107,317 @@
"var/storage/.gitignore"
]
},
- "league/uri": {
- "version": "5.3.0"
- },
- "league/uri-components": {
- "version": "1.8.2"
- },
- "league/uri-interfaces": {
- "version": "1.1.1"
- },
"lexik/jwt-authentication-bundle": {
- "version": "2.5",
+ "version": "2.17",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
+ "branch": "main",
"version": "2.5",
- "ref": "5b2157bcd5778166a5696e42f552ad36529a07a6"
+ "ref": "e9481b233a11ef7e15fe055a2b21fd3ac1aa2bb7"
},
"files": [
"config/packages/lexik_jwt_authentication.yaml"
]
},
"liip/imagine-bundle": {
- "version": "1.8",
+ "version": "2.12",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
+ "branch": "main",
"version": "1.8",
- "ref": "5a5bdc2d0e2533ed6935d5ae562f2b318a8fc1ee"
+ "ref": "d1227d002b70d1a1f941d91845fcd7ac7fbfc929"
}
},
- "marcj/topsort": {
- "version": "1.1.0"
- },
- "matthiasnoback/symfony-config-test": {
- "version": "4.2.0"
- },
- "matthiasnoback/symfony-dependency-injection-test": {
- "version": "4.1.1"
- },
- "mikey179/vfsstream": {
- "version": "v1.6.8"
- },
- "mockery/mockery": {
- "version": "1.4.2"
- },
- "monolog/monolog": {
- "version": "1.25.5"
- },
- "myclabs/deep-copy": {
- "version": "1.10.1"
- },
- "namshi/jose": {
- "version": "7.2.3"
- },
"nelmio/alice": {
- "version": "3.2",
+ "version": "3.12",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.2",
- "ref": "0b9900ece737bec7752e4155c0164639dd9b0cb0"
+ "branch": "main",
+ "version": "3.3",
+ "ref": "42b52d2065dc3fde27912d502c18ca1926e35ae2"
},
"files": [
- "config/packages/dev/nelmio_alice.yaml",
- "config/packages/test/nelmio_alice.yaml"
+ "config/packages/nelmio_alice.yaml"
]
},
- "netresearch/jsonmapper": {
- "version": "v2.1.0"
- },
- "nikic/php-parser": {
- "version": "v4.6.0"
- },
"nyholm/psr7": {
- "version": "1.6",
+ "version": "1.8",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.0",
- "ref": "0cd4d2d0e7f646fda75f9944f747a56e6ed13d4c"
+ "ref": "4a8c0345442dcca1d8a2c65633dcf0285dd5a5a2"
},
"files": [
"config/packages/nyholm_psr7.yaml"
]
},
- "openlss/lib-array2xml": {
- "version": "1.0.0"
- },
- "pagerfanta/pagerfanta": {
- "version": "v3.5.2"
- },
- "payum/iso4217": {
- "version": "1.0.1"
- },
"payum/payum-bundle": {
- "version": "2.4",
+ "version": "2.5",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
+ "branch": "main",
"version": "2.4",
- "ref": "72ad834a0f4a99175beddb5e2d049136f4a50a67"
+ "ref": "518ac22defa04a8a1d82479ed362e2921487adf0"
}
},
- "phar-io/manifest": {
- "version": "1.0.3"
- },
- "phar-io/version": {
- "version": "2.0.1"
- },
- "php-http/message": {
- "version": "1.7.0"
- },
- "php-http/message-factory": {
- "version": "v1.0.2"
- },
- "phparkitect/phparkitect": {
- "version": "0.2.9"
- },
- "phpdocumentor/reflection-common": {
- "version": "1.0.1"
- },
- "phpdocumentor/reflection-docblock": {
- "version": "4.3.0"
- },
- "phpdocumentor/type-resolver": {
- "version": "0.4.0"
- },
- "phpspec/php-diff": {
- "version": "v1.1.0"
- },
- "phpspec/phpspec": {
- "version": "4.3.1"
- },
- "phpspec/prophecy": {
- "version": "1.8.0"
- },
- "phpstan/phpdoc-parser": {
- "version": "0.4.9"
- },
"phpstan/phpstan": {
- "version": "0.12.29"
- },
- "phpstan/phpstan-doctrine": {
- "version": "0.10"
- },
- "phpstan/phpstan-webmozart-assert": {
- "version": "1.1.2"
- },
- "phpunit/php-code-coverage": {
- "version": "5.3.2"
- },
- "phpunit/php-file-iterator": {
- "version": "1.4.5"
- },
- "phpunit/php-text-template": {
- "version": "1.2.1"
- },
- "phpunit/php-timer": {
- "version": "1.0.9"
- },
- "phpunit/php-token-stream": {
- "version": "2.0.2"
- },
- "phpunit/phpunit": {
- "version": "4.7",
- "recipe": {
- "repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.7",
- "ref": "c276fa48d4713de91eb410289b3b1834acb7e403"
- }
- },
- "polishsymfonycommunity/symfony-mocker-container": {
- "version": "v1.0.2"
- },
- "psalm/plugin-mockery": {
- "version": "0.3.0"
- },
- "psr/cache": {
- "version": "1.0.1"
- },
- "psr/container": {
- "version": "1.0.0"
- },
- "psr/event-dispatcher": {
- "version": "1.0.0"
- },
- "psr/http-client": {
- "version": "1.0.1"
- },
- "psr/http-message": {
- "version": "1.0.1"
- },
- "psr/link": {
- "version": "1.0.0"
- },
- "psr/log": {
- "version": "1.0.2"
- },
- "ralouphie/getallheaders": {
- "version": "3.0.3"
- },
- "ramsey/uuid": {
- "version": "3.8.0"
- },
- "rector/rector": {
- "version": "0.11.52"
- },
- "sebastian/code-unit-reverse-lookup": {
- "version": "1.0.1"
- },
- "sebastian/comparator": {
- "version": "2.1.3"
- },
- "sebastian/diff": {
- "version": "2.0.1"
- },
- "sebastian/environment": {
- "version": "3.1.0"
- },
- "sebastian/exporter": {
- "version": "3.1.0"
- },
- "sebastian/global-state": {
- "version": "2.0.0"
- },
- "sebastian/object-enumerator": {
- "version": "3.0.3"
- },
- "sebastian/object-reflector": {
- "version": "1.1.1"
- },
- "sebastian/recursion-context": {
- "version": "3.0.0"
- },
- "sebastian/resource-operations": {
- "version": "1.0.0"
- },
- "sebastian/type": {
- "version": "1.1.3"
- },
- "sebastian/version": {
- "version": "2.0.1"
- },
- "slevomat/coding-standard": {
- "version": "4.6.3"
- },
- "sonata-project/block-bundle": {
- "version": "3.12.1"
- },
- "sonata-project/cache": {
- "version": "2.0.1"
- },
- "sonata-project/form-extensions": {
- "version": "1.0",
+ "version": "1.10",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
+ "branch": "main",
"version": "1.0",
- "ref": "8273133183506fe6ec66895e8890227b0dfba1c7"
+ "ref": "f10b8054de1a94a3b9e8806a6453fd5c98491c44"
+ }
+ },
+ "phpunit/phpunit": {
+ "version": "9.6",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "9.6",
+ "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326"
+ },
+ "files": [
+ ".env.test",
+ "phpunit.xml.dist",
+ "tests/bootstrap.php"
+ ]
+ },
+ "sonata-project/block-bundle": {
+ "version": "5.0",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "4.11",
+ "ref": "b4edd2a1e6ac1827202f336cac2771cb529de542"
+ }
+ },
+ "sonata-project/form-extensions": {
+ "version": "2.0",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "1.4",
+ "ref": "9c8a1e8ce2b1f215015ed16652c4ed18eb5867fd"
}
},
"squizlabs/php_codesniffer": {
- "version": "3.3.1"
- },
- "stella-maris/clock": {
- "version": "0.1.4"
- },
- "stof/doctrine-extensions-bundle": {
- "version": "1.2",
+ "version": "3.7",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
- "version": "1.2",
- "ref": "6c1ceb662f8997085f739cd089bfbef67f245983"
+ "branch": "main",
+ "version": "3.6",
+ "ref": "1019e5c08d4821cb9b77f4891f8e9c31ff20ac6f"
}
},
- "stripe/stripe-php": {
- "version": "v4.13.0"
- },
- "sylius-labs/association-hydrator": {
- "version": "v1.1.0"
- },
- "sylius-labs/coding-standard": {
- "version": "v2.0.0"
+ "stof/doctrine-extensions-bundle": {
+ "version": "1.7",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "1.2",
+ "ref": "e805aba9eff5372e2d149a9ff56566769e22819d"
+ }
},
"sylius-labs/doctrine-migrations-extra-bundle": {
- "version": "v0.1.3"
- },
- "sylius-labs/polyfill-symfony-event-dispatcher": {
- "version": "v1.0.0"
- },
- "sylius-labs/polyfill-symfony-framework-bundle": {
- "version": "v1.0.0"
- },
- "sylius-labs/polyfill-symfony-security": {
- "version": "v1.0.0"
- },
- "sylius/calendar": {
- "version": "v0.3.0"
+ "version": "v0.2.0"
},
"sylius/fixtures-bundle": {
- "version": "v1.4.1"
+ "version": "v1.8.0"
},
"sylius/grid-bundle": {
- "version": "v1.7.5"
+ "version": "v1.12.0"
},
"sylius/mailer-bundle": {
- "version": "v1.5.1"
- },
- "sylius/registry": {
- "version": "v1.4.0"
+ "version": "v2.0.0"
},
"sylius/resource-bundle": {
- "version": "v1.6.4"
+ "version": "1.10",
+ "recipe": {
+ "repo": "github.com/symfony/recipes-contrib",
+ "branch": "main",
+ "version": "1.9",
+ "ref": "ee21c1fc90778f4b01c20e72c320cc34f8839c1e"
+ }
},
"sylius/theme-bundle": {
- "version": "v1.4.2"
- },
- "symfony/asset": {
- "version": "v4.1.3"
- },
- "symfony/browser-kit": {
- "version": "v4.1.3"
- },
- "symfony/cache": {
- "version": "v4.1.3"
- },
- "symfony/cache-contracts": {
- "version": "v2.1.3"
- },
- "symfony/config": {
- "version": "v4.1.3"
+ "version": "v2.3.0"
},
"symfony/console": {
- "version": "3.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.3",
- "ref": "e3868d2f4a5104f19f844fe551099a00c6562527"
- }
- },
- "symfony/css-selector": {
- "version": "v4.1.3"
+ "branch": "main",
+ "version": "5.3",
+ "ref": "da0c8be8157600ad34f10ff0c9cc91232522e047"
+ },
+ "files": [
+ "bin/console"
+ ]
},
"symfony/debug-bundle": {
- "version": "4.1",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.1",
- "ref": "f8863cbad2f2e58c4b65fa1eac892ab189971bea"
- }
- },
- "symfony/dependency-injection": {
- "version": "v4.1.3"
- },
- "symfony/deprecation-contracts": {
- "version": "v2.1.2"
- },
- "symfony/doctrine-bridge": {
- "version": "v4.1.3"
- },
- "symfony/dom-crawler": {
- "version": "v4.1.3"
- },
- "symfony/dotenv": {
- "version": "v4.1.3"
- },
- "symfony/error-handler": {
- "version": "v4.4.13"
- },
- "symfony/event-dispatcher": {
- "version": "v4.1.3"
- },
- "symfony/event-dispatcher-contracts": {
- "version": "v1.1.9"
- },
- "symfony/expression-language": {
- "version": "v4.1.3"
- },
- "symfony/filesystem": {
- "version": "v4.1.3"
- },
- "symfony/finder": {
- "version": "v4.1.3"
+ "branch": "main",
+ "version": "5.3",
+ "ref": "5aa8aa48234c8eb6dbdd7b3cd5d791485d2cec4b"
+ },
+ "files": [
+ "config/packages/debug.yaml"
+ ]
},
"symfony/flex": {
- "version": "1.0",
+ "version": "2.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
+ "branch": "main",
"version": "1.0",
- "ref": "e921bdbfe20cdefa3b82f379d1cd36df1bc8d115"
- }
- },
- "symfony/form": {
- "version": "v4.1.3"
+ "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
+ },
+ "files": [
+ ".env"
+ ]
},
"symfony/framework-bundle": {
- "version": "3.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.3",
- "ref": "87c585d24de9f43bca80ebcfd5cf5cb39445d95f"
- }
- },
- "symfony/http-foundation": {
- "version": "v4.1.3"
- },
- "symfony/http-kernel": {
- "version": "v4.1.3"
- },
- "symfony/intl": {
- "version": "v4.1.3"
+ "branch": "main",
+ "version": "6.2",
+ "ref": "af47254c5e4cd543e6af3e4508298ffebbdaddd3"
+ },
+ "files": [
+ "config/packages/cache.yaml",
+ "config/packages/framework.yaml",
+ "config/preload.php",
+ "config/routes/framework.yaml",
+ "config/services.yaml",
+ "public/index.php",
+ "src/Controller/.gitignore",
+ "src/Kernel.php"
+ ]
},
"symfony/mailer": {
- "version": "5.4",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "4.3",
- "ref": "97a61eabb351d7f6cb7702039bcfe07fe9d7e03c"
+ "ref": "2bf89438209656b85b9a49238c4467bff1b1f939"
},
"files": [
"config/packages/mailer.yaml"
]
},
"symfony/messenger": {
- "version": "4.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.3",
- "ref": "8a2675c061737658bed85102e9241c752620e575"
+ "branch": "main",
+ "version": "6.0",
+ "ref": "ba1ac4e919baba5644d31b57a3284d6ba12d52ee"
},
"files": [
"config/packages/messenger.yaml"
]
},
- "symfony/mime": {
- "version": "v5.1.5"
- },
- "symfony/monolog-bridge": {
- "version": "v4.1.3"
- },
"symfony/monolog-bundle": {
- "version": "3.1",
+ "version": "3.8",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.1",
- "ref": "18ebf5a940573a20de06f9c4060101eeb438cf3d"
- }
- },
- "symfony/options-resolver": {
- "version": "v4.1.3"
- },
- "symfony/password-hasher": {
- "version": "v5.4.3"
- },
- "symfony/polyfill-ctype": {
- "version": "v1.9.0"
- },
- "symfony/polyfill-iconv": {
- "version": "v1.9.0"
- },
- "symfony/polyfill-intl-grapheme": {
- "version": "v1.22.0"
- },
- "symfony/polyfill-intl-icu": {
- "version": "v1.9.0"
- },
- "symfony/polyfill-intl-idn": {
- "version": "v1.18.1"
- },
- "symfony/polyfill-intl-normalizer": {
- "version": "v1.17.0"
- },
- "symfony/polyfill-mbstring": {
- "version": "v1.9.0"
- },
- "symfony/polyfill-php56": {
- "version": "v1.15.0"
- },
- "symfony/polyfill-php72": {
- "version": "v1.18.1"
- },
- "symfony/polyfill-php80": {
- "version": "v1.15.0"
- },
- "symfony/process": {
- "version": "v4.4.13"
- },
- "symfony/property-access": {
- "version": "v4.4.13"
- },
- "symfony/property-info": {
- "version": "v5.0.7"
- },
- "symfony/proxy-manager-bridge": {
- "version": "v4.4.13"
- },
- "symfony/routing": {
- "version": "4.2",
- "recipe": {
- "repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.2",
- "ref": "683dcb08707ba8d41b7e34adb0344bfd68d248a7"
+ "branch": "main",
+ "version": "3.7",
+ "ref": "213676c4ec929f046dfde5ea8e97625b81bc0578"
+ },
+ "files": [
+ "config/packages/monolog.yaml"
+ ]
+ },
+ "symfony/routing": {
+ "version": "6.3",
+ "recipe": {
+ "repo": "github.com/symfony/recipes",
+ "branch": "main",
+ "version": "6.2",
+ "ref": "e0a11b4ccb8c9e70b574ff5ad3dfdcd41dec5aa6"
},
"files": [
- "config/packages/prod/routing.yaml",
"config/packages/routing.yaml",
"config/routes.yaml"
]
},
"symfony/security-bundle": {
- "version": "4.4",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.4",
- "ref": "7b4408dc203049666fe23fabed23cbadc6d8440f"
+ "branch": "main",
+ "version": "6.0",
+ "ref": "8a5b112826f7d3d5b07027f93786ae11a1c7de48"
},
"files": [
"config/packages/security.yaml"
]
},
- "symfony/security-core": {
- "version": "v4.4.13"
- },
- "symfony/security-csrf": {
- "version": "v4.4.13"
- },
- "symfony/security-http": {
- "version": "v4.4.13"
- },
- "symfony/serializer": {
- "version": "v5.0.7"
- },
- "symfony/service-contracts": {
- "version": "v2.1.3"
- },
- "symfony/stopwatch": {
- "version": "v5.1.5"
- },
- "symfony/string": {
- "version": "v5.2.1"
- },
- "symfony/templating": {
- "version": "v4.4.13"
- },
- "symfony/thanks": {
- "version": "v1.2.9"
- },
"symfony/translation": {
- "version": "3.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.3",
- "ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd"
+ "branch": "main",
+ "version": "6.3",
+ "ref": "64fe617084223633e1dedf9112935d8c95410d3e"
},
"files": [
"config/packages/translation.yaml",
"translations/.gitignore"
]
},
- "symfony/translation-contracts": {
- "version": "v1.1.9"
- },
- "symfony/twig-bridge": {
- "version": "v4.4.13"
- },
"symfony/twig-bundle": {
- "version": "4.4",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.4",
- "ref": "15a41bbd66a1323d09824a189b485c126bbefa51"
+ "branch": "main",
+ "version": "6.3",
+ "ref": "b7772eb20e92f3fb4d4fe756e7505b4ba2ca1a2c"
},
"files": [
- "config/packages/test/twig.yaml",
"config/packages/twig.yaml",
"templates/base.html.twig"
]
},
"symfony/validator": {
- "version": "4.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "4.3",
- "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869"
+ "branch": "main",
+ "version": "5.3",
+ "ref": "c32cfd98f714894c4f128bb99aa2530c1227603c"
},
"files": [
- "config/packages/test/validator.yaml",
"config/packages/validator.yaml"
]
},
- "symfony/var-dumper": {
- "version": "v5.1.5"
- },
- "symfony/var-exporter": {
- "version": "v5.1.5"
- },
- "symfony/web-link": {
- "version": "v5.0.7"
- },
"symfony/web-profiler-bundle": {
- "version": "3.3",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
- "version": "3.3",
- "ref": "6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6"
+ "branch": "main",
+ "version": "6.1",
+ "ref": "e42b3f0177df239add25373083a564e5ead4e13a"
},
"files": [
- "config/packages/dev/web_profiler.yaml",
- "config/packages/test/web_profiler.yaml",
- "config/routes/dev/web_profiler.yaml"
+ "config/packages/web_profiler.yaml",
+ "config/routes/web_profiler.yaml"
]
},
"symfony/webpack-encore-bundle": {
- "version": "1.15",
+ "version": "1.17",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
"version": "1.10",
- "ref": "51fec8b86251b9bfc126ebc1827c9a02fa81ee81"
+ "ref": "eff2e505d4557c967b6710fe06bd947ba555cae5"
},
"files": [
"assets/app.js",
@@ -938,7 +431,7 @@
]
},
"symfony/workflow": {
- "version": "5.4",
+ "version": "6.3",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "main",
@@ -949,61 +442,25 @@
"config/packages/workflow.yaml"
]
},
- "symfony/yaml": {
- "version": "v4.4.13"
- },
- "symplify/easy-coding-standard": {
- "version": "v8.1.19"
- },
- "textalk/websocket": {
- "version": "1.2.0"
- },
"theofidry/alice-data-fixtures": {
- "version": "1.0",
+ "version": "1.6",
"recipe": {
"repo": "github.com/symfony/recipes",
- "branch": "master",
+ "branch": "main",
"version": "1.0",
"ref": "fe5a50faf580eb58f08ada2abe8afbd2d4941e05"
}
},
- "theseer/tokenizer": {
- "version": "1.2.0"
- },
- "twig/intl-extra": {
- "version": "v2.13.1"
- },
- "twig/twig": {
- "version": "v2.13.1"
- },
- "vimeo/psalm": {
- "version": "3.11.6"
- },
- "webmozart/assert": {
- "version": "1.9.1"
- },
- "willdurand/hateoas": {
- "version": "2.12.0"
- },
"willdurand/hateoas-bundle": {
- "version": "1.4",
+ "version": "2.5",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
- "branch": "master",
- "version": "1.4",
+ "branch": "main",
+ "version": "2.0",
"ref": "34df072c6edaa61ae19afb2f3a239f272fecab87"
}
},
- "willdurand/jsonp-callback-validator": {
- "version": "v1.1.0"
- },
- "willdurand/negotiation": {
- "version": "v2.3.1"
- },
- "winzou/state-machine": {
- "version": "0.3.3"
- },
"winzou/state-machine-bundle": {
- "version": "0.3.2"
+ "version": "0.6.0"
}
}
diff --git a/tests/Functional/EligibleCatalogPromotionsProcessorTest.php b/tests/Functional/EligibleCatalogPromotionsProcessorTest.php
index 40ce590827..f01006aece 100644
--- a/tests/Functional/EligibleCatalogPromotionsProcessorTest.php
+++ b/tests/Functional/EligibleCatalogPromotionsProcessorTest.php
@@ -40,8 +40,9 @@ final class EligibleCatalogPromotionsProcessorTest extends WebTestCase
{
/** @var EligibleCatalogPromotionsProvider $eligibleCatalogPromotionsProvider */
$eligibleCatalogPromotionsProvider = self::$kernel->getContainer()->get('Sylius\Bundle\PromotionBundle\Provider\EligibleCatalogPromotionsProviderInterface');
+ $dateFilePath = self::$kernel->getContainer()->getParameter('sylius.behat.clock.date_file');
- file_put_contents(self::$kernel->getProjectDir() . '/var/temporaryDate.txt', '2021-10-12 00:00:02');
+ file_put_contents($dateFilePath, '2021-10-12 00:00:02');
$eligibleCatalogPromotions = $eligibleCatalogPromotionsProvider->provide();
@@ -60,7 +61,7 @@ final class EligibleCatalogPromotionsProcessorTest extends WebTestCase
$this->assertTrue(in_array($actualDateTime, $expectedDateTimes));
}
- unlink(self::$kernel->getProjectDir() . '/var/temporaryDate.txt');
+ unlink($dateFilePath);
}
/** @test */
@@ -68,8 +69,9 @@ final class EligibleCatalogPromotionsProcessorTest extends WebTestCase
{
/** @var EligibleCatalogPromotionsProvider $eligibleCatalogPromotionsProvider */
$eligibleCatalogPromotionsProvider = self::$kernel->getContainer()->get('Sylius\Bundle\PromotionBundle\Provider\EligibleCatalogPromotionsProviderInterface');
+ $dateFilePath = self::$kernel->getContainer()->getParameter('sylius.behat.clock.date_file');
- file_put_contents(self::$kernel->getProjectDir() . '/var/temporaryDate.txt', '2021-10-12 23:59:58');
+ file_put_contents($dateFilePath, '2021-10-12 23:59:58');
$eligibleCatalogPromotions = $eligibleCatalogPromotionsProvider->provide();
@@ -87,6 +89,6 @@ final class EligibleCatalogPromotionsProcessorTest extends WebTestCase
$this->assertTrue(($expectedDateTimes == $actualDateTimes));
- unlink(self::$kernel->getProjectDir() . '/var/temporaryDate.txt');
+ unlink($dateFilePath);
}
}
diff --git a/yaml-standards.yaml b/yaml-standards.yaml
deleted file mode 100644
index 9080c82cd4..0000000000
--- a/yaml-standards.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- pathsToCheck:
- - ./*{.yml,.yaml,.yml.dist,.yaml.dist}
- excludedPaths:
- - ./node_modules/*{.yml,.yaml,.yml.dist,.yaml.dist}
- - ./public/*{.yml,.yaml,.yml.dist,.yaml.dist}
- - ./var/*{.yml,.yaml,.yml.dist,.yaml.dist}
- - ./vendor/*{.yml,.yaml,.yml.dist,.yaml.dist}
- checkers:
- - pathToChecker: YamlStandards\Model\YamlIndent\YamlIndentChecker
- parameters:
- { indents: 4 }
- - pathToChecker: YamlStandards\Model\YamlEmptyLineAtEnd\YamlEmptyLineAtEndChecker