From 5bfd9c4e077b278996b543f9bc7b1682563ad1e7 Mon Sep 17 00:00:00 2001
From: Alexander Rakushin <rakushinav@modeltech.ru>
Date: Thu, 27 Jul 2023 22:18:33 +0300
Subject: [PATCH] Add options: force_use_attribute_reader, separate_xml_mapping

---
 src/DependencyInjection/Configuration.php                  | 2 ++
 .../StofDoctrineExtensionsExtension.php                    | 3 +++
 src/Resources/config/blameable.xml                         | 6 ++++++
 src/Resources/config/ip_traceable.xml                      | 6 ++++++
 src/Resources/config/loggable.xml                          | 6 ++++++
 src/Resources/config/reference_integrity.xml               | 6 ++++++
 src/Resources/config/sluggable.xml                         | 6 ++++++
 src/Resources/config/softdeleteable.xml                    | 6 ++++++
 src/Resources/config/sortable.xml                          | 6 ++++++
 src/Resources/config/timestampable.xml                     | 6 ++++++
 src/Resources/config/translatable.xml                      | 6 ++++++
 src/Resources/config/tree.xml                              | 6 ++++++
 src/Resources/config/uploadable.xml                        | 7 ++++++-
 13 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 483d087e..b0ccdee4 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -26,6 +26,8 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->cannotBeEmpty()
                     ->defaultValue('en')
                 ->end()
+                ->booleanNode('force_use_attribute_reader')->defaultFalse()->end()
+                ->booleanNode('separate_xml_mapping')->defaultFalse()->end()
                 ->booleanNode('translation_fallback')->defaultFalse()->end()
                 ->booleanNode('persist_default_translation')->defaultFalse()->end()
                 ->booleanNode('skip_translation_on_load')->defaultFalse()->end()
diff --git a/src/DependencyInjection/StofDoctrineExtensionsExtension.php b/src/DependencyInjection/StofDoctrineExtensionsExtension.php
index 1f0fb1eb..00591ae8 100644
--- a/src/DependencyInjection/StofDoctrineExtensionsExtension.php
+++ b/src/DependencyInjection/StofDoctrineExtensionsExtension.php
@@ -106,6 +106,9 @@ public function load(array $configs, ContainerBuilder $container)
         $this->entityManagers = $this->processObjectManagerConfigurations($config['orm'], $container, $loader, $loaded, 'doctrine.event_listener');
         $this->documentManagers = $this->processObjectManagerConfigurations($config['mongodb'], $container, $loader, $loaded, 'doctrine_mongodb.odm.event_listener');
 
+
+        $container->setParameter('stof_doctrine_extensions.force_use_attribute_reader', $config['force_use_attribute_reader']);
+        $container->setParameter('stof_doctrine_extensions.separate_xml_mapping', $config['separate_xml_mapping']);
         $container->setParameter('stof_doctrine_extensions.default_locale', $config['default_locale']);
         $container->setParameter('stof_doctrine_extensions.translation_fallback', $config['translation_fallback']);
         $container->setParameter('stof_doctrine_extensions.persist_default_translation', $config['persist_default_translation']);
diff --git a/src/Resources/config/blameable.xml b/src/Resources/config/blameable.xml
index f0ac84ae..a3b6429e 100644
--- a/src/Resources/config/blameable.xml
+++ b/src/Resources/config/blameable.xml
@@ -16,6 +16,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
 
         <service id="stof_doctrine_extensions.event_listener.blame" class="%stof_doctrine_extensions.event_listener.blame.class%">
diff --git a/src/Resources/config/ip_traceable.xml b/src/Resources/config/ip_traceable.xml
index d480f036..53207869 100644
--- a/src/Resources/config/ip_traceable.xml
+++ b/src/Resources/config/ip_traceable.xml
@@ -12,6 +12,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
 
         <service id="stof_doctrine_extensions.event_listener.ip_trace" class="Stof\DoctrineExtensionsBundle\EventListener\IpTraceListener" public="false">
diff --git a/src/Resources/config/loggable.xml b/src/Resources/config/loggable.xml
index a8bd3146..7b36a8b9 100644
--- a/src/Resources/config/loggable.xml
+++ b/src/Resources/config/loggable.xml
@@ -16,6 +16,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
 
         <service id="stof_doctrine_extensions.event_listener.logger" class="%stof_doctrine_extensions.event_listener.logger.class%">
diff --git a/src/Resources/config/reference_integrity.xml b/src/Resources/config/reference_integrity.xml
index 1bf70611..2389950b 100644
--- a/src/Resources/config/reference_integrity.xml
+++ b/src/Resources/config/reference_integrity.xml
@@ -15,6 +15,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/sluggable.xml b/src/Resources/config/sluggable.xml
index cb2839f3..ae1d29cf 100644
--- a/src/Resources/config/sluggable.xml
+++ b/src/Resources/config/sluggable.xml
@@ -15,6 +15,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/softdeleteable.xml b/src/Resources/config/softdeleteable.xml
index 3f53141a..11d85af5 100644
--- a/src/Resources/config/softdeleteable.xml
+++ b/src/Resources/config/softdeleteable.xml
@@ -18,6 +18,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/sortable.xml b/src/Resources/config/sortable.xml
index 894a4502..e58705f2 100644
--- a/src/Resources/config/sortable.xml
+++ b/src/Resources/config/sortable.xml
@@ -15,6 +15,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/timestampable.xml b/src/Resources/config/timestampable.xml
index f5577efc..a0ee3454 100644
--- a/src/Resources/config/timestampable.xml
+++ b/src/Resources/config/timestampable.xml
@@ -18,6 +18,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/translatable.xml b/src/Resources/config/translatable.xml
index 008e15b0..1a8d6607 100644
--- a/src/Resources/config/translatable.xml
+++ b/src/Resources/config/translatable.xml
@@ -31,6 +31,12 @@
             <call method="setSkipOnLoad">
                 <argument>%stof_doctrine_extensions.skip_translation_on_load%</argument>
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
 
         <service id="stof_doctrine_extensions.event_listener.locale" class="%stof_doctrine_extensions.event_listener.locale.class%">
diff --git a/src/Resources/config/tree.xml b/src/Resources/config/tree.xml
index d0e6cafe..f34e2d43 100644
--- a/src/Resources/config/tree.xml
+++ b/src/Resources/config/tree.xml
@@ -15,6 +15,12 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
     </services>
 </container>
diff --git a/src/Resources/config/uploadable.xml b/src/Resources/config/uploadable.xml
index 429e2fd7..2f0a7514 100644
--- a/src/Resources/config/uploadable.xml
+++ b/src/Resources/config/uploadable.xml
@@ -21,10 +21,15 @@
             <call method="setAnnotationReader">
                 <argument type="service" id=".stof_doctrine_extensions.reader" on-invalid="ignore" />
             </call>
-
             <call method="setDefaultFileInfoClass">
                 <argument>%stof_doctrine_extensions.uploadable.default_file_info.class%</argument>
             </call>
+            <call method="setForceUseAttributeReader">
+                <argument>%stof_doctrine_extensions.force_use_attribute_reader%</argument>
+            </call>
+            <call method="setSeparateXmlMapping">
+                <argument>%stof_doctrine_extensions.separate_xml_mapping%</argument>
+            </call>
         </service>
 
         <service id="stof_doctrine_extensions.uploadable.mime_type_guesser" class="%stof_doctrine_extensions.uploadable.mime_type_guesser.class%" public="false" />