Skip to content

Commit 2197e0c

Browse files
keulinhokeulinho
committed
NEXT-39344 - Update symfony to 7.2
1 parent f934082 commit 2197e0c

File tree

38 files changed

+182
-176
lines changed

38 files changed

+182
-176
lines changed

‎.bc-exclude.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,8 @@
4848

4949
// Added new optional parameter to those classes
5050
'Parameter cacheDir was added to Method createTwigEnvironment\(\) of class Shopware\\\\Core\\\\Content\\\\Seo\\\\SeoUrlTwigFactory',
51-
],
51+
52+
// Version related const values changed for 7.2 update
53+
'Value of constant Symfony\\\\Component\\\\HttpKernel\\\\Kernel'
54+
],
5255
];

‎changelog/_unreleased/2024-10-30-update-to-symfony-7-2.md

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
title: Update to Symfony 7.2
3+
issue: NEXT-39344
4+
---
5+
# Core
6+
* Changed `symfony/*` dependencies to `^7.2`

‎composer.json

+49-49
Original file line numberDiff line numberDiff line change
@@ -108,57 +108,57 @@
108108
"shopware/conflicts": ">=0.2.0",
109109
"shyim/opensearch-php-dsl": "^1.0.5",
110110
"squirrelphp/twig-php-syntax": "^1.8.0",
111-
"symfony/asset": "~7.1.1",
112-
"symfony/cache": "~7.1.1",
111+
"symfony/asset": "~7.2.0",
112+
"symfony/cache": "~7.2.0",
113113
"symfony/cache-contracts": "~3.5.0",
114-
"symfony/clock": "~7.1.1",
115-
"symfony/config": "~7.1.1",
116-
"symfony/console": "~7.1.1",
117-
"symfony/debug-bundle": "~7.1.1",
118-
"symfony/dependency-injection": "~7.1.1",
114+
"symfony/clock": "~7.2.0",
115+
"symfony/config": "~7.2.0",
116+
"symfony/console": "~7.2.0",
117+
"symfony/debug-bundle": "~7.2.0",
118+
"symfony/dependency-injection": "~7.2.0",
119119
"symfony/deprecation-contracts": "~3.5.0",
120-
"symfony/doctrine-messenger": "~7.1.1",
121-
"symfony/dotenv": "~7.1.1",
122-
"symfony/error-handler": "~7.1.1",
123-
"symfony/event-dispatcher": "~7.1.1",
120+
"symfony/doctrine-messenger": "~7.2.0",
121+
"symfony/dotenv": "~7.2.0",
122+
"symfony/error-handler": "~7.2.0",
123+
"symfony/event-dispatcher": "~7.2.0",
124124
"symfony/event-dispatcher-contracts": "~3.5.0",
125-
"symfony/filesystem": "~7.1.1",
126-
"symfony/finder": "~7.1.1",
127-
"symfony/framework-bundle": "~7.1.1",
128-
"symfony/http-client": "~7.1.1",
129-
"symfony/http-foundation": "~7.1.1",
130-
"symfony/http-kernel": "~7.1.1",
131-
"symfony/intl": "~7.1.1",
132-
"symfony/lock": "~7.1.1",
133-
"symfony/mailer": "~7.1.1",
134-
"symfony/messenger": "~7.1.1",
135-
"symfony/mime": "~7.1.1",
136-
"symfony/monolog-bridge": "~7.1.1",
125+
"symfony/filesystem": "~7.2.0",
126+
"symfony/finder": "~7.2.0",
127+
"symfony/framework-bundle": "~7.2.0",
128+
"symfony/http-client": "~7.2.0",
129+
"symfony/http-foundation": "~7.2.0",
130+
"symfony/http-kernel": "~7.2.0",
131+
"symfony/intl": "~7.2.0",
132+
"symfony/lock": "~7.2.0",
133+
"symfony/mailer": "~7.2.0",
134+
"symfony/messenger": "~7.2.0",
135+
"symfony/mime": "~7.2.0",
136+
"symfony/monolog-bridge": "~7.2.0",
137137
"symfony/monolog-bundle": "~3.10.0",
138-
"symfony/options-resolver": "~7.1.1",
138+
"symfony/options-resolver": "~7.2.0",
139139
"symfony/polyfill-php83": "~1.29.0",
140-
"symfony/process": "~7.1.1",
141-
"symfony/property-access": "~7.1.1",
142-
"symfony/property-info": "~7.1.1",
140+
"symfony/process": "~7.2.0",
141+
"symfony/property-access": "~7.2.0",
142+
"symfony/property-info": "~7.2.0",
143143
"symfony/proxy-manager-bridge": "~6.4.8",
144-
"symfony/psr-http-message-bridge": "~7.1.1",
145-
"symfony/rate-limiter": "~7.1.1",
146-
"symfony/routing": "~7.1.1",
147-
"symfony/runtime": "~7.1.1",
148-
"symfony/scheduler": "~7.1.1",
149-
"symfony/security-core": "~7.1.1",
150-
"symfony/security-csrf": "~7.1.1",
151-
"symfony/serializer": "~7.1.1",
144+
"symfony/psr-http-message-bridge": "~7.2.0",
145+
"symfony/rate-limiter": "~7.2.0",
146+
"symfony/routing": "~7.2.0",
147+
"symfony/runtime": "~7.2.0",
148+
"symfony/scheduler": "~7.2.0",
149+
"symfony/security-core": "~7.2.0",
150+
"symfony/security-csrf": "~7.2.0",
151+
"symfony/serializer": "~7.2.0",
152152
"symfony/service-contracts": "~3.5.0",
153-
"symfony/stopwatch": "~7.1.1",
154-
"symfony/string": "~7.1.1",
155-
"symfony/translation": "~7.1.1",
153+
"symfony/stopwatch": "~7.2.0",
154+
"symfony/string": "~7.2.0",
155+
"symfony/translation": "~7.2.0",
156156
"symfony/translation-contracts": "~3.5.0",
157-
"symfony/twig-bridge": "~7.1.1",
158-
"symfony/twig-bundle": "~7.1.1",
159-
"symfony/validator": "~7.1.1",
160-
"symfony/var-exporter": "~7.1.1",
161-
"symfony/yaml": "~7.1.1",
157+
"symfony/twig-bridge": "~7.2.0",
158+
"symfony/twig-bundle": "~7.2.0",
159+
"symfony/validator": "~7.2.0",
160+
"symfony/var-exporter": "~7.2.0",
161+
"symfony/yaml": "~7.2.0",
162162
"tecnickcom/tcpdf": "^6.7.7",
163163
"twig/intl-extra": "^3.10.0",
164164
"twig/string-extra": "^3.10.0",
@@ -193,12 +193,12 @@
193193
"rector/type-perfect": "1.0.0",
194194
"shopware/dev-tools": "^1.3",
195195
"smalot/pdfparser": "^2.2.2",
196-
"symfony/browser-kit": "~7.1.1",
197-
"symfony/css-selector": "~7.1.1",
198-
"symfony/dom-crawler": "~7.1.1",
199-
"symfony/expression-language": "~7.1.1",
200-
"symfony/phpunit-bridge": "~7.1.1",
201-
"symfony/var-dumper": "~7.1.1",
196+
"symfony/browser-kit": "~7.2.0",
197+
"symfony/css-selector": "~7.2.0",
198+
"symfony/dom-crawler": "~7.2.0",
199+
"symfony/expression-language": "~7.2.0",
200+
"symfony/phpunit-bridge": "~7.2.0",
201+
"symfony/var-dumper": "~7.2.0",
202202
"symplify/phpstan-rules": "13.0.1"
203203
},
204204
"suggest": {

‎src/Administration/composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"doctrine/dbal": "^3.9",
3333
"pentatrion/vite-bundle": "^7.0",
3434
"shopware/core": "*",
35-
"symfony/framework-bundle": "~7.1.1",
36-
"symfony/http-foundation": "~7.1.1",
37-
"symfony/mime": "~7.1.1",
38-
"symfony/routing": "~7.1.1"
35+
"symfony/framework-bundle": "~7.2.0",
36+
"symfony/http-foundation": "~7.2.0",
37+
"symfony/mime": "~7.2.0",
38+
"symfony/routing": "~7.2.0"
3939
}
4040
}

‎src/Core/Checkout/DependencyInjection/cart.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@
305305
</service>
306306

307307
<service id="Shopware\Core\Checkout\Cart\Validator">
308-
<argument type="tagged" tag="shopware.cart.validator"/>
308+
<argument type="tagged_iterator" tag="shopware.cart.validator"/>
309309
</service>
310310

311311
<service id="Shopware\Core\Content\Product\Cart\ProductLineItemValidator">
@@ -316,8 +316,8 @@
316316
<argument type="service" id="Shopware\Core\Checkout\Cart\Validator"/>
317317
<argument type="service" id="Shopware\Core\Checkout\Cart\Price\AmountCalculator"/>
318318
<argument type="service" id="Shopware\Core\Checkout\Cart\Transaction\TransactionProcessor"/>
319-
<argument type="tagged" tag="shopware.cart.processor"/>
320-
<argument type="tagged" tag="shopware.cart.collector"/>
319+
<argument type="tagged_iterator" tag="shopware.cart.processor"/>
320+
<argument type="tagged_iterator" tag="shopware.cart.collector"/>
321321
<argument type="service" id="Shopware\Core\Framework\Script\Execution\ScriptExecutor"/>
322322
</service>
323323

@@ -400,7 +400,7 @@
400400
<service id="Shopware\Core\Checkout\Cart\PriceDefinitionFactory"/>
401401

402402
<service id="Shopware\Core\Checkout\Cart\LineItemFactoryRegistry">
403-
<argument type="tagged" tag="shopware.cart.line_item.factory"/>
403+
<argument type="tagged_iterator" tag="shopware.cart.line_item.factory"/>
404404
<argument type="service" id="Shopware\Core\Framework\Validation\DataValidator"/>
405405
<argument type="service" id="event_dispatcher"/>
406406
</service>
@@ -443,8 +443,8 @@
443443
</service>
444444

445445
<service id="Shopware\Core\Checkout\Cart\LineItem\Group\LineItemGroupServiceRegistry">
446-
<argument type="tagged" tag="lineitem.group.packager"/>
447-
<argument type="tagged" tag="lineitem.group.sorter"/>
446+
<argument type="tagged_iterator" tag="lineitem.group.packager"/>
447+
<argument type="tagged_iterator" tag="lineitem.group.sorter"/>
448448
</service>
449449

450450
<service id="Shopware\Core\Checkout\Cart\LineItem\Group\Packager\LineItemGroupCountPackager">

‎src/Core/Checkout/DependencyInjection/customer.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</service>
9494

9595
<service id="Shopware\Core\Checkout\Customer\Password\LegacyPasswordVerifier">
96-
<argument type="tagged" tag="shopware.legacy_encoder" />
96+
<argument type="tagged_iterator" tag="shopware.legacy_encoder" />
9797
</service>
9898

9999
<service id="Shopware\Core\Checkout\Customer\Subscriber\CustomerMetaFieldSubscriber">

‎src/Core/Checkout/DependencyInjection/document.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
</service>
107107

108108
<service id="Shopware\Core\Checkout\Document\Renderer\DocumentRendererRegistry">
109-
<argument type="tagged" tag="document.renderer"/>
109+
<argument type="tagged_iterator" tag="document.renderer"/>
110110
</service>
111111

112112
<service id="Shopware\Core\Checkout\Document\Service\PdfRenderer">

‎src/Core/Checkout/DependencyInjection/promotion.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
</service>
148148

149149
<service id="Shopware\Core\Checkout\Promotion\Cart\Discount\Filter\FilterServiceRegistry">
150-
<argument type="tagged" tag="promotion.filter.sorter"/>
151-
<argument type="tagged" tag="promotion.filter.picker"/>
150+
<argument type="tagged_iterator" tag="promotion.filter.sorter"/>
151+
<argument type="tagged_iterator" tag="promotion.filter.picker"/>
152152
</service>
153153

154154
<service id="Shopware\Core\Checkout\Promotion\Cart\Discount\Filter\Sorter\FilterSorterPriceAsc">

‎src/Core/Content/DependencyInjection/cms.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</service>
3030

3131
<service id="Shopware\Core\Content\Cms\DataResolver\CmsSlotsDataResolver" public="true">
32-
<argument type="tagged" tag="shopware.cms.data_resolver"/>
32+
<argument type="tagged_iterator" tag="shopware.cms.data_resolver"/>
3333
<argument type="collection">
3434
<argument type="service" key="product" id="sales_channel.product.repository" />
3535
</argument>

‎src/Core/Content/DependencyInjection/flow.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<service id="Shopware\Core\Content\Flow\Rule\FlowRuleScopeBuilder">
2828
<argument type="service" id="Shopware\Core\Checkout\Cart\Order\OrderConverter"/>
2929
<argument type="service" id="Shopware\Core\Checkout\Cart\Delivery\DeliveryBuilder"/>
30-
<argument type="tagged" tag="shopware.cart.collector"/>
30+
<argument type="tagged_iterator" tag="shopware.cart.collector"/>
3131
</service>
3232

3333
<service id="Shopware\Core\Content\Flow\Dispatching\FlowExecutor" public="true">
@@ -136,7 +136,7 @@
136136
</service>
137137

138138
<service id="Shopware\Core\Content\Flow\Api\FlowActionCollector">
139-
<argument type="tagged" tag="flow.action" />
139+
<argument type="tagged_iterator" tag="flow.action" />
140140
<argument type="service" id="event_dispatcher"/>
141141
<argument type="service" id="app_flow_action.repository"/>
142142
</service>

‎src/Core/Content/DependencyInjection/import_export.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
</service>
9191

9292
<service id="Shopware\Core\Content\ImportExport\DataAbstractionLayer\Serializer\SerializerRegistry">
93-
<argument type="tagged" tag="shopware.import_export.entity_serializer"/>
94-
<argument type="tagged" tag="shopware.import_export.field_serializer"/>
93+
<argument type="tagged_iterator" tag="shopware.import_export.entity_serializer"/>
94+
<argument type="tagged_iterator" tag="shopware.import_export.field_serializer"/>
9595
</service>
9696

9797
<service id="Shopware\Core\Content\ImportExport\DataAbstractionLayer\Serializer\Entity\EntitySerializer">
@@ -227,9 +227,9 @@
227227
<argument type="service" id="Doctrine\DBAL\Connection"/>
228228
<argument type="service" id="Shopware\Core\Content\ImportExport\Service\FileService"/>
229229

230-
<argument type="tagged" tag="shopware.import_export.reader_factory"/>
231-
<argument type="tagged" tag="shopware.import_export.writer_factory"/>
232-
<argument type="tagged" tag="shopware.import_export.pipe_factory"/>
230+
<argument type="tagged_iterator" tag="shopware.import_export.reader_factory"/>
231+
<argument type="tagged_iterator" tag="shopware.import_export.writer_factory"/>
232+
<argument type="tagged_iterator" tag="shopware.import_export.pipe_factory"/>
233233
</service>
234234

235235
<service id="Shopware\Core\Content\ImportExport\Message\ImportExportHandler" public="true">

‎src/Core/Content/DependencyInjection/media.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
</service>
186186

187187
<service id="Shopware\Core\Content\Media\Metadata\MetadataLoader">
188-
<argument type="tagged" tag="shopware.metadata.loader"/>
188+
<argument type="tagged_iterator" tag="shopware.metadata.loader"/>
189189
</service>
190190

191191
<!-- TypeDetector -->
@@ -214,7 +214,7 @@
214214
</service>
215215

216216
<service id="Shopware\Core\Content\Media\TypeDetector\TypeDetector">
217-
<argument type="tagged" tag="shopware.media_type.detector"/>
217+
<argument type="tagged_iterator" tag="shopware.media_type.detector"/>
218218
</service>
219219

220220
<!-- Services -->

‎src/Core/Content/DependencyInjection/media_path.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</service>
4343

4444
<service id="Shopware\Core\Content\Media\Core\Strategy\PathStrategyFactory">
45-
<argument type="tagged" tag="shopware.path.strategy"/>
45+
<argument type="tagged_iterator" tag="shopware.path.strategy"/>
4646
</service>
4747

4848
<service id="Shopware\Core\Content\Media\Core\Strategy\FilenamePathStrategy">

‎src/Core/Content/DependencyInjection/product_export.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</service>
9696

9797
<service id="Shopware\Core\Content\ProductExport\Service\ProductExportValidator">
98-
<argument type="tagged" tag="shopware.product_export.validator"/>
98+
<argument type="tagged_iterator" tag="shopware.product_export.validator"/>
9999
</service>
100100

101101
<service id="Shopware\Core\Content\ProductExport\Validator\XmlValidator">

‎src/Core/Content/DependencyInjection/sitemap.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66
<services>
77
<service id="Shopware\Core\Content\Sitemap\Service\SitemapExporter">
8-
<argument type="tagged" tag="shopware.sitemap_url_provider"/>
8+
<argument type="tagged_iterator" tag="shopware.sitemap_url_provider"/>
99
<argument type="service" id="cache.system"/>
1010
<argument>%shopware.sitemap.batchsize%</argument>
1111
<argument type="service" id="shopware.filesystem.sitemap"/>
@@ -19,7 +19,7 @@
1919
</service>
2020

2121
<service id="Shopware\Core\Content\Sitemap\Service\ConfigHandler">
22-
<argument type="tagged" tag="shopware.sitemap.config_handler"/>
22+
<argument type="tagged_iterator" tag="shopware.sitemap.config_handler"/>
2323
</service>
2424

2525
<service id="Shopware\Core\Content\Sitemap\Service\SitemapHandleFactoryInterface" class="Shopware\Core\Content\Sitemap\Service\SitemapHandleFactory">

‎src/Core/DevOps/DependencyInjection/services.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</service>
2121

2222
<service id="Shopware\Core\DevOps\Docs\Script\ScriptReferenceGeneratorCommand">
23-
<argument type="tagged" tag="shopware.scripts_reference.generator"/>
23+
<argument type="tagged_iterator" tag="shopware.scripts_reference.generator"/>
2424

2525
<tag name="console.command"/>
2626
</service>

‎src/Core/Framework/DependencyInjection/api.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
</service>
210210

211211
<service id="Shopware\Core\Framework\Api\OAuth\ScopeRepository">
212-
<argument type="tagged" tag="shopware.oauth.scope"/>
212+
<argument type="tagged_iterator" tag="shopware.oauth.scope"/>
213213
<argument type="service" id="Doctrine\DBAL\Connection"/>
214214
</service>
215215

‎src/Core/Framework/DependencyInjection/app.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</service>
4747

4848
<service id="Shopware\Core\Framework\App\Validation\ManifestValidator">
49-
<argument type="tagged" tag="shopware.app_manifest.validator"/>
49+
<argument type="tagged_iterator" tag="shopware.app_manifest.validator"/>
5050
</service>
5151

5252
<service id="Shopware\Core\Framework\App\Validation\ConfigValidator">
@@ -476,7 +476,7 @@
476476
</service>
477477

478478
<service id="Shopware\Core\Framework\App\AppUrlChangeResolver\Resolver" public="true">
479-
<argument type="tagged" tag="shopware.app_url_changed_resolver"/>
479+
<argument type="tagged_iterator" tag="shopware.app_url_changed_resolver"/>
480480
</service>
481481

482482
<service id="Shopware\Core\Framework\App\AppUrlChangeResolver\MoveShopPermanentlyStrategy">

‎src/Core/Framework/DependencyInjection/data-abstraction-layer.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@
129129
<service id="Shopware\Core\Framework\DataAbstractionLayer\Search\Parser\AggregationParser"/>
130130

131131
<service id="Shopware\Core\Framework\DataAbstractionLayer\ExtensionRegistry" public="true">
132-
<argument type="tagged" tag="shopware.entity.extension"/>
133-
<argument type="tagged" tag="shopware.bulk.entity.extension"/>
132+
<argument type="tagged_iterator" tag="shopware.entity.extension"/>
133+
<argument type="tagged_iterator" tag="shopware.bulk.entity.extension"/>
134134
</service>
135135

136136
<service id="Shopware\Core\Framework\DataAbstractionLayer\Facade\RepositoryFacadeHookFactory" public="true">
@@ -667,11 +667,11 @@
667667

668668
<service id="Shopware\Core\Framework\Api\Sync\SyncFkResolver">
669669
<argument type="service" id="Shopware\Core\Framework\DataAbstractionLayer\DefinitionInstanceRegistry"/>
670-
<argument type="tagged" tag="shopware.sync.fk_resolver"/>
670+
<argument type="tagged_iterator" tag="shopware.sync.fk_resolver"/>
671671
</service>
672672

673673
<service id="Shopware\Core\Framework\DataAbstractionLayer\Dbal\ExceptionHandlerRegistry">
674-
<argument type="tagged" tag="shopware.dal.exception_handler"/>
674+
<argument type="tagged_iterator" tag="shopware.dal.exception_handler"/>
675675
</service>
676676

677677
<service id="Shopware\Core\Framework\DataAbstractionLayer\TechnicalNameExceptionHandler">
@@ -684,7 +684,7 @@
684684
</service>
685685

686686
<service id="Shopware\Core\Framework\DataAbstractionLayer\Indexing\EntityIndexerRegistry" public="true">
687-
<argument type="tagged" tag="shopware.entity_indexer"/>
687+
<argument type="tagged_iterator" tag="shopware.entity_indexer"/>
688688
<argument type="service" id="messenger.default_bus"/>
689689
<argument type="service" id="event_dispatcher"/>
690690
<tag name="messenger.message_handler" />

0 commit comments

Comments
 (0)