Moved TrackingCodeSubscriber to EcommerceFrameworkBundle where it belongs to

Author: brusch

bundles/GoogleMarketingBundle/src/EventSubscriber/TrackingCodeSubscriber.php renamed to bundles/EcommerceFrameworkBundle/src/EventListener/Frontend/TrackingCodeSubscriber.php

@@ -15,7 +15,7 @@
  *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
-namespace Pimcore\Bundle\GoogleMarketingBundle\EventSubscriber;
+namespace Pimcore\Bundle\EcommerceFrameworkBundle\EventListener\Frontend;
 
 use Pimcore\Bundle\CoreBundle\EventListener\Traits\EnabledTrait;
 use Pimcore\Bundle\CoreBundle\EventListener\Traits\PimcoreContextAwareTrait;

bundles/EcommerceFrameworkBundle/src/Resources/config/event_listeners.yaml

@@ -10,3 +10,5 @@ services:
 
     Pimcore\Bundle\EcommerceFrameworkBundle\EventListener\Frontend\TrackingCodeFlashMessageListener: ~
     Pimcore\Bundle\EcommerceFrameworkBundle\EventListener\SessionBagListener: ~
+
+    Pimcore\Bundle\EcommerceFrameworkBundle\EventListener\Frontend\TrackingCodeSubscriber: ~

bundles/GoogleMarketingBundle/.github/ci/files/config/analytics.yaml

@@ -1,27 +1,27 @@
-services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-        public: false
-    #
-    # GOOGLE TAG MANAGER
-    #
-    Pimcore\Bundle\GoogleMarketingBundle\EventSubscriber\TrackingCodeSubscriber: ~
-
-    Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider: ~
-    Pimcore\Bundle\GoogleMarketingBundle\Config\Config:
-        factory: [ '@Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider', 'getConfig' ]
-
-    Pimcore\Bundle\GoogleMarketingBundle\Config\SiteConfigProvider: ~
-
-    Pimcore\Bundle\GoogleMarketingBundle\Tracker\Tracker:
-        calls:
-            - [ setLogger, [ '@logger' ] ]
-
-    # fallback locator which is used from the deprecated Pimcore\Google\Analytics class
-    pimcore.analytics.google.fallback_service_locator:
-        class: Symfony\Component\DependencyInjection\ServiceLocator
-        public: true
-        tags:
-            - { name: container.service_locator }
-
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+    #
+    # GOOGLE TAG MANAGER
+    #
+    Pimcore\Bundle\EcommerceFrameworkBundle\EventListener\Frontend\TrackingCodeSubscriber: ~
+
+    Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider: ~
+    Pimcore\Bundle\GoogleMarketingBundle\Config\Config:
+        factory: [ '@Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider', 'getConfig' ]
+
+    Pimcore\Bundle\GoogleMarketingBundle\Config\SiteConfigProvider: ~
+
+    Pimcore\Bundle\GoogleMarketingBundle\Tracker\Tracker:
+        calls:
+            - [ setLogger, [ '@logger' ] ]
+
+    # fallback locator which is used from the deprecated Pimcore\Google\Analytics class
+    pimcore.analytics.google.fallback_service_locator:
+        class: Symfony\Component\DependencyInjection\ServiceLocator
+        public: true
+        tags:
+            - { name: container.service_locator }
+

bundles/GoogleMarketingBundle/config/analytics.yaml

@@ -1,27 +1,23 @@
-services:
-    _defaults:
-        autowire: true
-        autoconfigure: true
-        public: false
-    #
-    # GOOGLE TAG MANAGER
-    #
-    Pimcore\Bundle\GoogleMarketingBundle\EventSubscriber\TrackingCodeSubscriber: ~
-
-    Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider: ~
-    Pimcore\Bundle\GoogleMarketingBundle\Config\Config:
-        factory: [ '@Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider', 'getConfig' ]
-
-    Pimcore\Bundle\GoogleMarketingBundle\Config\SiteConfigProvider: ~
-
-    Pimcore\Bundle\GoogleMarketingBundle\Tracker\Tracker:
-        calls:
-            - [ setLogger, [ '@logger' ] ]
-
-    # fallback locator which is used from the deprecated Pimcore\Google\Analytics class
-    pimcore.analytics.google.fallback_service_locator:
-        class: Symfony\Component\DependencyInjection\ServiceLocator
-        public: true
-        tags:
-            - { name: container.service_locator }
-
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: false
+
+    Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider: ~
+    Pimcore\Bundle\GoogleMarketingBundle\Config\Config:
+        factory: [ '@Pimcore\Bundle\GoogleMarketingBundle\Config\ConfigProvider', 'getConfig' ]
+
+    Pimcore\Bundle\GoogleMarketingBundle\Config\SiteConfigProvider: ~
+
+    Pimcore\Bundle\GoogleMarketingBundle\Tracker\Tracker:
+        calls:
+            - [ setLogger, [ '@logger' ] ]
+
+    # fallback locator which is used from the deprecated Pimcore\Google\Analytics class
+    pimcore.analytics.google.fallback_service_locator:
+        class: Symfony\Component\DependencyInjection\ServiceLocator
+        public: true
+        tags:
+            - { name: container.service_locator }
+