From 833f37c5f00c4cbe7d6299956ea711275fd33569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Fr=C3=A9mont?= <lc.fremont@gmail.com>
Date: Mon, 23 Sep 2024 09:51:44 +0200
Subject: [PATCH] Fix Doctrine dependency on state processors

---
 .../config/services/integrations/doctrine.xml     | 15 ++++++++++++---
 src/Bundle/Resources/config/services/state.xml    | 12 +-----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/Resources/config/services/integrations/doctrine.xml b/src/Bundle/Resources/config/services/integrations/doctrine.xml
index 1a43104d9..5779f97b0 100644
--- 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
index 4514c8a33..a6af7a29b 100644
--- 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>