Merge branch '1.0' into 1.1

* 1.0: Lazy load Doctrine event listeners
ezecosystem · May 26, 2018 · 0dd1f6b · 0dd1f6b
2 parents fd2f79d + 317380d
commit 0dd1f6b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml b/src/Sylius/Bundle/CoreBundle/Resources/config/services/listeners.xml
@@ -34,7 +34,7 @@
             <argument type="service" id="sylius.image_uploader" />
             <argument type="service" id="liip_imagine.cache.manager" />
             <argument type="service" id="liip_imagine.filter.manager" />
-            <tag name="doctrine.event_listener" event="postRemove" />
+            <tag name="doctrine.event_listener" event="postRemove" lazy="true" />
         </service>
         <service id="sylius.listener.order_recalculation" class="Sylius\Bundle\CoreBundle\EventListener\OrderRecalculationListener">
             <argument type="service" id="sylius.order_processing.order_processor" />
@@ -47,21 +47,21 @@
             <tag name="kernel.event_listener" event="security.interactive_login" method="recalculateCartWhileLogin" />
         </service>
         <service id="sylius.listener.default_username" class="Sylius\Bundle\CoreBundle\EventListener\DefaultUsernameORMListener">
-            <tag name="doctrine.event_listener" event="onFlush" />
+            <tag name="doctrine.event_listener" event="onFlush" lazy="true" />
         </service>
         <service id="sylius.listener.canonicalizer" class="Sylius\Bundle\CoreBundle\EventListener\CanonicalizerListener">
             <argument type="service" id="sylius.canonicalizer" />
-            <tag name="doctrine.event_listener" event="prePersist" />
-            <tag name="doctrine.event_listener" event="preUpdate" />
+            <tag name="doctrine.event_listener" event="prePersist" lazy="true" />
+            <tag name="doctrine.event_listener" event="preUpdate" lazy="true" />
         </service>
         <service id="sylius.listener.password_updater" class="Sylius\Bundle\CoreBundle\EventListener\PasswordUpdaterListener">
             <argument type="service" id="sylius.security.password_updater" />
             <tag name="kernel.event_listener" event="sylius.user.pre_password_reset" method="genericEventUpdater" />
             <tag name="kernel.event_listener" event="sylius.user.pre_password_change" method="genericEventUpdater" />
             <tag name="kernel.event_listener" event="sylius.admin_user.pre_update" method="genericEventUpdater" />
             <tag name="kernel.event_listener" event="sylius.customer.pre_update" method="customerUpdateEvent" />
-            <tag name="doctrine.event_listener" event="prePersist" />
-            <tag name="doctrine.event_listener" event="preUpdate" />
+            <tag name="doctrine.event_listener" event="prePersist" lazy="true" />
+            <tag name="doctrine.event_listener" event="preUpdate" lazy="true" />
         </service>
         <service id="sylius.translator.listener" class="Symfony\Component\HttpKernel\EventListener\TranslatorListener">
             <argument type="service" id="translator" />

diff --git a/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml b/src/Sylius/Bundle/ProductBundle/Resources/config/services.xml
@@ -53,7 +53,7 @@
 
         <service id="sylius.listener.select_product_attribute_choice_remove" class="Sylius\Bundle\ProductBundle\EventListener\SelectProductAttributeChoiceRemoveListener">
             <argument>%sylius.model.product_attribute_value.class%</argument>
-            <tag name="doctrine.event_listener" event="postUpdate" />
+            <tag name="doctrine.event_listener" event="postUpdate" lazy="true" />
         </service>
     </services>
 </container>
diff --git a/src/Sylius/Bundle/ReviewBundle/DependencyInjection/SyliusReviewExtension.php b/src/Sylius/Bundle/ReviewBundle/DependencyInjection/SyliusReviewExtension.php
@@ -77,12 +77,15 @@ private function createReviewListeners(array $reviewSubjects, ContainerBuilder $
             $reviewChangeListener
                 ->addTag('doctrine.event_listener', [
                     'event' => 'postPersist',
+                    'lazy' => true,
                 ])
                 ->addTag('doctrine.event_listener', [
                     'event' => 'postUpdate',
+                    'lazy' => true,
                 ])
                 ->addTag('doctrine.event_listener', [
                     'event' => 'postRemove',
+                    'lazy' => true,
                 ])
             ;
 

diff --git a/src/Sylius/Bundle/UserBundle/Resources/config/services.xml b/src/Sylius/Bundle/UserBundle/Resources/config/services.xml
@@ -55,8 +55,8 @@
             <argument type="service" id="sylius.security.password_updater" />
             <tag name="kernel.event_listener" event="sylius.user.pre_password_reset" method="genericEventUpdater" />
             <tag name="kernel.event_listener" event="sylius.user.pre_password_change" method="genericEventUpdater" />
-            <tag name="doctrine.event_listener" event="prePersist" />
-            <tag name="doctrine.event_listener" event="preUpdate" />
+            <tag name="doctrine.event_listener" event="prePersist" lazy="true" />
+            <tag name="doctrine.event_listener" event="preUpdate" lazy="true" />
         </service>
         <service id="sylius.listener.user_mailer_listener" class="Sylius\Bundle\UserBundle\EventListener\MailerListener">
             <argument type="service" id="sylius.email_sender" />