kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-05 20:57:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' into bootstrap-admin-panel

Browse source 
* 2.0:
  Change application's version to v1.13.1-dev
  Generate changelog for v1.13.0
  Change application's version to v1.13.0
  Change application's version to v1.12.16-dev
  Generate changelog for v1.12.15
  Change application's version to v1.12.15
  [Bunnyshell] Bump default node version to 20
  Fix setup command locale parameter update
  [Maintenance][Configuration] Deprecate unused `options` configuration nodes
  [DX][Checkout][ShippingMethod] Dispatch new ui events
  [Checkout][PaymentMethod] Extract description and inject it via the new event
  [Checkout][PaymentMethod] Dispatch ui event to allow customize every choice in payment method selection
This commit is contained in:
Grzegorz Sadowski 2024-04-25 09:01:06 +02:00
commit d5d1af791f
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
27 changed files with 281 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bunnyshell/docker/php/Dockerfile
View file

@ -2,7 +2,7 @@
# https://docs.docker.com/compose/compose-file/#target
ARG PHP_VERSION=8.2
ARG NODE_VERSION=18
ARG NODE_VERSION=20
ARG ALPINE_VERSION=3.18
ARG COMPOSER_VERSION=2.6
ARG PHP_EXTENSION_INSTALLER_VERSION=latest

24
src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
View file

@ -74,7 +74,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('address')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -91,7 +93,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('address_log_entry')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -106,7 +110,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('country')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -123,7 +129,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('province')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -140,7 +148,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('zone')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -157,7 +167,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('zone_member')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/addressing-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

12
src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
View file

@ -60,7 +60,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('attribute')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/attribute-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -75,7 +77,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/attribute-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -95,7 +99,9 @@ final class Configuration implements ConfigurationInterface
->isRequired()
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/attribute-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

4
src/Sylius/Bundle/ChannelBundle/DependencyInjection/Configuration.php
View file

@ -53,7 +53,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('channel')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/channel-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

32
src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
View file

@ -156,7 +156,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_image')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -172,7 +174,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('avatar_image')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -188,7 +192,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('taxon_image')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -204,7 +210,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_taxon')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -220,7 +228,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('channel_pricing')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -237,7 +247,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('channel_pricing_log_entry')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -254,7 +266,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shop_billing_data')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -271,7 +285,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('channel_price_history_config')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/core-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

3
src/Sylius/Bundle/CoreBundle/Installer/Setup/LocaleSetup.php
View file

@ -117,7 +117,8 @@ final class LocaleSetup implements LocaleSetupInterface
if (
$this->localeParameterFilePath === null ||
$this->filesystem === null ||
!$this->filesystem->exists($this->localeParameterFilePath)
!$this->filesystem->exists($this->localeParameterFilePath) ||
!is_writable($this->localeParameterFilePath)
) {
$output->writeln('<info>You may also need to add this locale into config/parameters.yaml configuration.</info>');

38
src/Sylius/Bundle/CoreBundle/Tests/Installation/Setup/LocaleSetupTest.php
View file

@ -164,6 +164,44 @@ final class LocaleSetupTest extends KernelTestCase
);
}
/** @test */
public function it_does_not_update_locale_if_file_is_not_writable(): void
{
$this->localeSetup = new LocaleSetup(
$this->localeRepository->reveal(),
$this->localeFactory->reveal(),
'en_US',
$this->filesystem,
$this->localeParameterFilePath,
);
$this->filesystem->chmod($this->localeParameterFilePath, 0444);
$questionHelper = $this->prophesize(QuestionHelper::class);
$questionHelper->ask(Argument::cetera())->willReturn('fr_FR');
$locale = $this->prophesize(LocaleInterface::class);
$this->localeRepository->findOneBy(['code' => 'fr_FR'])->willReturn(null);
$this->localeFactory->createNew()->willReturn($locale->reveal());
$locale->setCode('fr_FR')->shouldBeCalled();
$this->localeRepository->add($locale->reveal())->shouldBeCalled();
$output = $this->prophesize(OutputInterface::class);
$output->writeln('Adding <info>French</info> Language.')->shouldBeCalled();
$output->writeln('Adding <info>fr_FR</info> locale.')->shouldBeCalled();
$output->writeln('<info>You may also need to add this locale into config/parameters.yaml configuration.</info>')->shouldBeCalled();
$this->localeSetup->setup(
$this->prophesize(InputInterface::class)->reveal(),
$output->reveal(),
$questionHelper->reveal(),
);
$this->assertEquals('en_US', Yaml::parseFile($this->localeParameterFilePath)['parameters']['locale']);
unlink($this->localeParameterFilePath);
}
private function createTemporaryServicesFile(array $parameters): void
{
$content = Yaml::dump($parameters);

8
src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php
View file

@ -57,7 +57,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('currency')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/currency-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -74,7 +76,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('exchange_rate')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/currency-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

8
src/Sylius/Bundle/CustomerBundle/DependencyInjection/Configuration.php
View file

@ -56,7 +56,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('customer')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/customer-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -73,7 +75,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('customer_group')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/customer-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

4
src/Sylius/Bundle/InventoryBundle/DependencyInjection/Configuration.php
View file

@ -57,7 +57,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('inventory_unit')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/inventory-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

4
src/Sylius/Bundle/LocaleBundle/DependencyInjection/Configuration.php
View file

@ -53,7 +53,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('locale')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/locale-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

20
src/Sylius/Bundle/OrderBundle/DependencyInjection/Configuration.php
View file

@ -66,7 +66,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('order')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/order-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -83,7 +85,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('order_item')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/order-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -100,7 +104,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('order_item_unit')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/order-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -116,7 +122,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('adjustment')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/order-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -132,7 +140,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('order_sequence')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/order-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

12
src/Sylius/Bundle/PaymentBundle/DependencyInjection/Configuration.php
View file

@ -64,7 +64,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('payment_method')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/payment-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -79,7 +81,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/payment-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -98,7 +102,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('payment')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/payment-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

8
src/Sylius/Bundle/PayumBundle/DependencyInjection/Configuration.php
View file

@ -71,7 +71,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('payment_security_token')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/payum-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -86,7 +88,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('gateway_config')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/payum-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

48
src/Sylius/Bundle/ProductBundle/DependencyInjection/Configuration.php
View file

@ -95,7 +95,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -110,7 +112,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -129,7 +133,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_variant')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -144,7 +150,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -163,7 +171,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_option')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -178,7 +188,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -197,7 +209,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_option_value')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -212,8 +226,12 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('option_value')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->variableNode('option_value')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->isRequired()
->addDefaultsIfNotSet()
@ -233,7 +251,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_association')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -250,7 +270,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('product_association_type')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -265,7 +287,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/product-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

40
src/Sylius/Bundle/PromotionBundle/DependencyInjection/Configuration.php
View file

@ -114,7 +114,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('promotion_subject')
->isRequired()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->isRequired()
->children()
@ -126,7 +128,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('promotion')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -141,7 +145,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -160,7 +166,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('catalog_promotion')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -175,7 +183,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -194,7 +204,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('catalog_promotion_scope')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -211,7 +223,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('catalog_promotion_action')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -228,7 +242,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('promotion_rule')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -245,7 +261,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('promotion_action')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -262,7 +280,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('promotion_coupon')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/promotion-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

8
src/Sylius/Bundle/ReviewBundle/DependencyInjection/Configuration.php
View file

@ -56,7 +56,9 @@ final class Configuration implements ConfigurationInterface
->isRequired()
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/review-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -73,7 +75,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('reviewer')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/review-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

24
src/Sylius/Bundle/ShippingBundle/DependencyInjection/Configuration.php
View file

@ -86,7 +86,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shipment')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -103,7 +105,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shipment_unit')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -119,7 +123,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shipping_method')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -134,7 +140,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -153,7 +161,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shipping_method_rule')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -170,7 +180,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('shipping_category')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/shipping-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

15
src/Sylius/Bundle/ShopBundle/Resources/config/app/config.yml
View file

@ -1028,6 +1028,11 @@ sylius_ui:
context:
event: sylius.shop.checkout.select_payment.before_navigation
sylius.shop.checkout.select_payment.choice_item_content:
blocks:
description:
template: "@SyliusShop/Checkout/SelectPayment/_description.html.twig"
sylius.shop.checkout.select_shipping.before_navigation:
blocks:
legacy:
@ -1035,6 +1040,16 @@ sylius_ui:
context:
event: sylius.shop.checkout.select_shipping.before_navigation
sylius.shop.checkout.select_shipping.choice_item_content:
blocks:
description:
template: "@SyliusShop/Checkout/SelectShipping/_description.html.twig"
sylius.shop.checkout.select_shipping.choice_item_extra:
blocks:
shipping_fee:
template: "@SyliusShop/Checkout/SelectShipping/_fee.html.twig"
sylius.shop.product.show.left_sidebar:
blocks:
before_legacy:

6
src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/SelectPayment/_choice.html.twig
View file

@ -6,10 +6,6 @@
</div>
<div class="content">
<a class="header">{{ form_label(form, null, {'label_attr': {'data-test-payment-method-label': ''}}) }}</a>
{% if method.description is not null %}
<div class="description">
<p>{{ method.description }}</p>
</div>
{% endif %}
{{ sylius_template_event('sylius.shop.checkout.select_payment.choice_item_content', {'method': method}) }}
</div>
</div>

5
src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/SelectPayment/_description.html.twig Normal file
View file

@ -0,0 +1,5 @@
{% if method.description is not null %}
<div class="description">
<p>{{ method.description }}</p>
</div>
{% endif %}

12
src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/SelectShipping/_choice.html.twig
View file

@ -1,5 +1,3 @@
{% import '@SyliusShop/Common/Macro/money.html.twig' as money %}
<div class="item" {{ sylius_test_html_attribute('shipping-item') }}>
<div class="field">
<div class="ui radio checkbox" {{ sylius_test_html_attribute('shipping-method-checkbox') }}>
@ -8,15 +6,9 @@
</div>
<div class="content">
<a class="header" {{ sylius_test_html_attribute('shipping-method-label') }}>{{ form_label(form) }}</a>
{% if method.description is not null %}
<div class="description">
<p>{{ method.description }}</p>
</div>
{% endif %}
{{ sylius_template_event('sylius.shop.checkout.select_shipping.choice_item_content', {'method': method, 'fee': fee}) }}
</div>
<div class="extra">
<div class="ui large right floated fee label" {{ sylius_test_html_attribute('shipping-method-fee') }}>
{{ money.convertAndFormat(fee) }}
</div>
{{ sylius_template_event('sylius.shop.checkout.select_shipping.choice_item_extra', {'method': method, 'fee': fee}) }}
</div>
</div>

5
src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/SelectShipping/_description.html.twig Normal file
View file

@ -0,0 +1,5 @@
{% if method.description is not null %}
<div class="description">
<p>{{ method.description }}</p>
</div>
{% endif %}

5
src/Sylius/Bundle/ShopBundle/Resources/views/Checkout/SelectShipping/_fee.html.twig Normal file
View file

@ -0,0 +1,5 @@
{% import '@SyliusShop/Common/Macro/money.html.twig' as money %}
<div class="ui large right floated fee label" {{ sylius_test_html_attribute('shipping-method-fee') }}>
{{ money.convertAndFormat(fee) }}
</div>

8
src/Sylius/Bundle/TaxationBundle/DependencyInjection/Configuration.php
View file

@ -56,7 +56,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('tax_category')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/taxation-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -73,7 +75,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('tax_rate')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/taxation-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

8
src/Sylius/Bundle/TaxonomyBundle/DependencyInjection/Configuration.php
View file

@ -57,7 +57,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('taxon')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/taxonomy-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()
@ -72,7 +74,9 @@ final class Configuration implements ConfigurationInterface
->arrayNode('translation')
->addDefaultsIfNotSet()
->children()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/taxonomy-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('classes')
->addDefaultsIfNotSet()
->children()

4
src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php
View file

@ -57,7 +57,9 @@ final class Configuration implements ConfigurationInterface
->scalarNode('templates')->defaultValue('SyliusUserBundle:User')->end()
->scalarNode('encoder')->defaultNull()->end()
->scalarNode('login_tracking_interval')->defaultNull()->end()
->variableNode('options')->end()
->variableNode('options')
->setDeprecated('sylius/user-bundle', '1.13', 'The "%node%" node at "%path%" is deprecated and will be removed in 2.0.')
->end()
->arrayNode('resetting')
->addDefaultsIfNotSet()
->children()