Merge branch '1.11' into 1.12

* 1.11: Fix Doctrine dependency on state processors
Sylius · Sep 23, 2024 · 7125cd7 · 7125cd7
2 parents 1b6c925 + 7e2f214
commit 7125cd7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/src/Bundle/Resources/config/services/integrations/doctrine.xml b/src/Bundle/Resources/config/services/integrations/doctrine.xml
@@ -13,13 +13,22 @@
 
 <container xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://symfony.com/schema/dic/services" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
     <services>
-        <defaults public="true" />
-
         <service id="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain"
-                 decorates="doctrine.orm.default_metadata_driver">
+                 decorates="doctrine.orm.default_metadata_driver"
+                 public="true">
             <argument type="service" id="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain.inner" />
             <argument type="service" id="sylius.resource_registry" />
         </service>
         <service id="sylius_resource.doctrine.mapping_driver_chain" alias="Sylius\Bundle\ResourceBundle\Doctrine\ResourceMappingDriverChain" />
+
+        <service id="Sylius\Resource\Doctrine\Common\State\PersistProcessor">
+            <argument type="service" id="doctrine" />
+            <tag name="sylius.state_processor" />
+        </service>
+
+        <service id="Sylius\Resource\Doctrine\Common\State\RemoveProcessor">
+            <argument type="service" id="doctrine" />
+            <tag name="sylius.state_processor" />
+        </service>
     </services>
 </container>
diff --git a/src/Bundle/Resources/config/services/state.xml b/src/Bundle/Resources/config/services/state.xml
@@ -44,19 +44,9 @@
             <tag name="sylius.state_provider" />
         </service>
 
-        <service id="Sylius\Resource\Doctrine\Common\State\PersistProcessor">
-            <argument type="service" id="doctrine" />
-            <tag name="sylius.state_processor" />
-        </service>
-
-        <service id="Sylius\Resource\Doctrine\Common\State\RemoveProcessor">
-            <argument type="service" id="doctrine" />
-            <tag name="sylius.state_processor" />
-        </service>
-
         <service id="Sylius\Resource\StateMachine\State\ApplyStateMachineTransitionProcessor">
             <argument type="service" id="sylius.state_machine.operation" />
-            <argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" />
+            <argument type="service" id="Sylius\Resource\Doctrine\Common\State\PersistProcessor" on-invalid="null" />
             <tag name="sylius.state_processor" />
         </service>