Skip to content

Commit

Permalink
minor #16157 [Maintenance][Configuration] Deprecate unused options …
Browse files Browse the repository at this point in the history 
…configuration nodes (NoResponseMate)

This PR was merged into the 1.13 branch.

Discussion
----------

| Q               | A                                                            |
|-----------------|--------------------------------------------------------------|
| Branch?         | 1.13 |
| Bug fix?        | no                                                       |
| New feature?    | no                                                       |
| BC breaks?      | no                                                       |
| Deprecations?   | yes |
| Related tickets | -                      |
| License         | MIT                                                          |


Commits
-------

1fb2d89 [Maintenance][Configuration] Deprecate unused `options` configuration nodes
  • Loading branch information
@GSadee
GSadee committed Apr 23, 2024
2 parents ecb8430 + 1fb2d89 commit 57deed9
Show file tree
Hide file tree
Showing 19 changed files with 209 additions and 69 deletions.
2 changes: 2 additions & 0 deletions UPGRADE-1.13.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,8 @@ To ease the update process, we have grouped the changes into the following categ
...
```

1. All instances of `options` node have been deprecated in all resource and translation configurations.

### State Machine

1. We have configured all existing Sylius graphs to be usable with the Symfony Workflow out of the box.
Expand Down
24 changes: 18 additions & 6 deletions src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -87,7 +89,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -102,7 +106,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -119,7 +125,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -136,7 +144,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -153,7 +163,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
12 changes: 9 additions & 3 deletions src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -72,7 +74,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -92,7 +96,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
4 changes: 3 additions & 1 deletion src/Sylius/Bundle/ChannelBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
32 changes: 24 additions & 8 deletions src/Sylius/Bundle/CoreBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -172,7 +174,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -188,7 +192,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -204,7 +210,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -220,7 +228,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -237,7 +247,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -254,7 +266,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -271,7 +285,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
8 changes: 6 additions & 2 deletions src/Sylius/Bundle/CurrencyBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -72,7 +74,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
8 changes: 6 additions & 2 deletions src/Sylius/Bundle/CustomerBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand All @@ -73,7 +75,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
4 changes: 3 additions & 1 deletion src/Sylius/Bundle/InventoryBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down
4 changes: 3 additions & 1 deletion src/Sylius/Bundle/LocaleBundle/DependencyInjection/Configuration.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ private function addResourcesSection(ArrayNodeDefinition $node): void
->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()
Expand Down

0 comments on commit 57deed9

Please sign in to comment.