Merge remote-tracking branch 'origin/6.9'

# Conflicts: # bundles/EcommerceFrameworkBundle/Resources/config/tracking_manager.yml
pimcore · Feb 18, 2021 · 1924e32 · 1924e32
2 parents bcd2f88 + fa24453
commit 1924e32
Show file tree

Hide file tree

Showing 31 changed files with 95 additions and 4 deletions.
diff --git a/bundles/AdminBundle/Controller/Reports/PiwikController.php b/bundles/AdminBundle/Controller/Reports/PiwikController.php
@@ -28,6 +28,7 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
+ * @deprecated
  * @Route("/piwik")
  */
 class PiwikController extends ReportsControllerBase

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/analytics/piwik/widget_store_provider.js b/bundles/AdminBundle/Resources/public/js/pimcore/analytics/piwik/widget_store_provider.js
@@ -11,6 +11,9 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PEL
  */
 
+/**
+ * @deprecated
+ */
 pimcore.registerNS("pimcore.analytics.piwik.WidgetStoreProvider");
 
 (function() {

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/layout/portlets/piwik.js b/bundles/AdminBundle/Resources/public/js/pimcore/layout/portlets/piwik.js
@@ -11,6 +11,9 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PEL
  */
 
+/**
+ * @deprecated
+ */
 pimcore.registerNS("pimcore.layout.portlets.piwik");
 pimcore.layout.portlets.piwik = Class.create(pimcore.layout.portlets.abstract, {
 

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/report/piwik/dashboard_iframe.js b/bundles/AdminBundle/Resources/public/js/pimcore/report/piwik/dashboard_iframe.js
@@ -11,6 +11,9 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PEL
  */
 
+/**
+ * @deprecated
+ */
 pimcore.registerNS("pimcore.report.piwik.dashboard_iframe");
 pimcore.report.piwik.dashboard_iframe = Class.create(pimcore.report.abstract, {
     matchType: function (type) {

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/report/piwik/settings.js b/bundles/AdminBundle/Resources/public/js/pimcore/report/piwik/settings.js
@@ -11,6 +11,9 @@
  * @license    http://www.pimcore.org/license     GPLv3 and PEL
  */
 
+/**
+ * @deprecated
+ */
 pimcore.registerNS("pimcore.report.piwik.settings");
 pimcore.report.piwik.settings = Class.create({
 
@@ -24,10 +27,14 @@ pimcore.report.piwik.settings = Class.create({
 
     getLayout: function () {
         this.panel = new Ext.FormPanel({
-            title: "Matomo/Piwik",
+            title: "Matomo/Piwik (Deprecated)",
             bodyStyle: "padding: 10px;",
             autoScroll: true,
             items: [
+                {
+                    xtype: 'container',
+                    html: "<b>DEPRECATED! Will be removed in Pimcore 10</b><br />"
+                },
                 {
                     xtype: "displayfield",
                     width: 670,

diff --git a/bundles/AdminBundle/Resources/public/js/pimcore/settings/targeting/conditions.js b/bundles/AdminBundle/Resources/public/js/pimcore/settings/targeting/conditions.js
@@ -505,6 +505,12 @@ pimcore.settings.targeting.conditions = (function () {
                         name: "type",
                         value: "visitedpagebefore"
                     },
+                    {
+                        xtype: "displayfield",
+                        hideLabel: true,
+                        value: warningIconHtml + ' DEPRECATED! Will be removed in Pimcore 10',
+                        cls: "pimcore_extra_label"
+                    },
                     {
                         xtype: "displayfield",
                         hideLabel: true,

diff --git a/bundles/CoreBundle/Resources/config/analytics.yml b/bundles/CoreBundle/Resources/config/analytics.yml
@@ -44,7 +44,8 @@ services:
     Pimcore\Analytics\Piwik\ReportBroker: ~
     Pimcore\Analytics\Piwik\WidgetBroker: ~
 
-    Pimcore\Analytics\Piwik\Tracker: ~
+    Pimcore\Analytics\Piwik\Tracker:
+        deprecated: ~
 
     Pimcore\Analytics\Piwik\EventListener\CacheListener: ~
     Pimcore\Analytics\Piwik\EventListener\IndexSettingsListener: ~

diff --git a/bundles/EcommerceFrameworkBundle/Resources/config/tracking_manager.yml b/bundles/EcommerceFrameworkBundle/Resources/config/tracking_manager.yml
@@ -37,7 +37,7 @@ services:
         arguments:
             - '@Pimcore\Analytics\Piwik\Tracker'
             - '@Pimcore\Bundle\EcommerceFrameworkBundle\Tracking\TrackingItemBuilder'
-
+        deprecated: 'The "%service_id%" service is deprecated.'
 
 
     #

diff --git a/bundles/EcommerceFrameworkBundle/Tracking/Tracker/Piwik.php b/bundles/EcommerceFrameworkBundle/Tracking/Tracker/Piwik.php
@@ -35,6 +35,9 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Twig\Environment;
 
+/**
+ * @deprecated
+ */
 class Piwik extends Tracker implements
     ProductViewInterface,
     CategoryPageViewInterface,

diff --git a/...velopment_Documentation/18_Tools_and_Features/28_Marketing_Settings/07_Piwik.md b/...velopment_Documentation/18_Tools_and_Features/28_Marketing_Settings/07_Piwik.md
@@ -1,4 +1,4 @@
-# Matomo (formerly known as Piwik)
+# [Deprecated] Matomo (formerly known as Piwik) 
 
 Similar to Google Analytics, a Matomo tracking code can be automatically injected into each response. For a basic tracking
 integration you need to know the following:

diff --git a/...evelopment_Documentation/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md b/...evelopment_Documentation/23_Installation_and_Upgrade/09_Upgrade_Notes/README.md
@@ -132,6 +132,9 @@
   `CartInterface::COUNT_MAIN_ITEMS_ONLY`, `CartInterface::COUNT_MAIN_AND_SUB_ITEMS`, `CartInterface::COUNT_MAIN_OR_SUB_ITEMS` 
   instead. 
 
+- [Analytics] Matomo(Piwik) integration has been deprecated in Core and Ecommerce bundle, and will be removed in Pimcore 10.
+- [Targeting and Personalization] VisitedPageBefore condition has been deprecated, as it is based on deprecated Piwik integration and will be removed in Pimcore 10.
+
 #### Migrating legacy module/controller/action configurations to new controller references
 You can use `./bin/console migration:controller-reference` to migrate your existing Documents, 
 Staticroutes and Document Types to the new controller references in the format: `AppBundle\Controller\FooController::barAction`.

diff --git a/lib/Analytics/Piwik/Api/ApiClient.php b/lib/Analytics/Piwik/Api/ApiClient.php
@@ -25,6 +25,9 @@
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\SerializerInterface;
 
+/**
+ * @deprecated
+ */
 class ApiClient
 {
     /**

diff --git a/lib/Analytics/Piwik/Api/Exception/ApiException.php b/lib/Analytics/Piwik/Api/Exception/ApiException.php
@@ -19,6 +19,9 @@
 
 use Throwable;
 
+/**
+ * @deprecated
+ */
 class ApiException extends \RuntimeException
 {
     /**

diff --git a/lib/Analytics/Piwik/Api/SitesManager.php b/lib/Analytics/Piwik/Api/SitesManager.php
@@ -26,6 +26,8 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
+ * @deprecated
+ *
  * Exposes parts of the Piwik SitesManager API
  */
 class SitesManager

diff --git a/lib/Analytics/Piwik/Api/VisitorClient.php b/lib/Analytics/Piwik/Api/VisitorClient.php
@@ -19,6 +19,9 @@
 
 use Pimcore\Analytics\Piwik\Config\Config;
 
+/**
+ * @deprecated
+ */
 class VisitorClient
 {
     /**

diff --git a/lib/Analytics/Piwik/Config/Config.php b/lib/Analytics/Piwik/Config/Config.php
@@ -19,6 +19,9 @@
 
 use Pimcore\Config\Config as ConfigObject;
 
+/**
+ * @deprecated
+ */
 class Config
 {
     /**

diff --git a/lib/Analytics/Piwik/Config/ConfigProvider.php b/lib/Analytics/Piwik/Config/ConfigProvider.php
@@ -19,6 +19,9 @@
 
 use Pimcore\Config\Config as ConfigObject;
 
+/**
+ * @deprecated
+ */
 class ConfigProvider
 {
     /**

diff --git a/lib/Analytics/Piwik/Dto/ReportConfig.php b/lib/Analytics/Piwik/Dto/ReportConfig.php
@@ -17,6 +17,9 @@
 
 namespace Pimcore\Analytics\Piwik\Dto;
 
+/**
+ * @deprecated
+ */
 final class ReportConfig
 {
     /**

diff --git a/lib/Analytics/Piwik/Dto/WidgetConfig.php b/lib/Analytics/Piwik/Dto/WidgetConfig.php
@@ -17,6 +17,9 @@
 
 namespace Pimcore\Analytics\Piwik\Dto;
 
+/**
+ * @deprecated
+ */
 final class WidgetConfig
 {
     /**

diff --git a/lib/Analytics/Piwik/Dto/WidgetReference.php b/lib/Analytics/Piwik/Dto/WidgetReference.php
@@ -17,6 +17,9 @@
 
 namespace Pimcore\Analytics\Piwik\Dto;
 
+/**
+ * @deprecated
+ */
 final class WidgetReference
 {
     /**

diff --git a/lib/Analytics/Piwik/Event/ReportConfigEvent.php b/lib/Analytics/Piwik/Event/ReportConfigEvent.php
@@ -20,6 +20,9 @@
 use Pimcore\Analytics\Piwik\Dto\ReportConfig;
 use Symfony\Contracts\EventDispatcher\Event;
 
+/**
+ * @deprecated
+ */
 class ReportConfigEvent extends Event
 {
     /**

diff --git a/lib/Analytics/Piwik/Event/TrackingDataEvent.php b/lib/Analytics/Piwik/Event/TrackingDataEvent.php
@@ -22,6 +22,9 @@
 use Pimcore\Analytics\SiteId\SiteId;
 use Symfony\Contracts\EventDispatcher\Event;
 
+/**
+ * @deprecated
+ */
 class TrackingDataEvent extends Event
 {
     /**

diff --git a/lib/Analytics/Piwik/EventListener/CacheListener.php b/lib/Analytics/Piwik/EventListener/CacheListener.php
@@ -22,6 +22,9 @@
 use Pimcore\Event\Admin\ReportEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * @deprecated
+ */
 class CacheListener implements EventSubscriberInterface
 {
     /**

diff --git a/lib/Analytics/Piwik/EventListener/IndexSettingsListener.php b/lib/Analytics/Piwik/EventListener/IndexSettingsListener.php
@@ -24,6 +24,9 @@
 use Pimcore\Event\AdminEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * @deprecated
+ */
 class IndexSettingsListener implements EventSubscriberInterface
 {
     /**

diff --git a/lib/Analytics/Piwik/EventListener/TrackingCodeListener.php b/lib/Analytics/Piwik/EventListener/TrackingCodeListener.php
@@ -27,6 +27,9 @@
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
+/**
+ * @deprecated
+ */
 class TrackingCodeListener implements EventSubscriberInterface
 {
     use ResponseInjectionTrait;

diff --git a/lib/Analytics/Piwik/ReportBroker.php b/lib/Analytics/Piwik/ReportBroker.php
@@ -26,6 +26,8 @@
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
+ * @deprecated
+ *
  * Builds a list of all available Piwik reports which should be shown in reports panel. A ReportConfig references an
  * iframe URL with a title. Additional reports can be added by adding them in the GENERATE_REPORTS event.
  */

diff --git a/lib/Analytics/Piwik/Tracker.php b/lib/Analytics/Piwik/Tracker.php
@@ -30,6 +30,9 @@
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Twig\Environment;
 
+/**
+ * @deprecated
+ */
 class Tracker extends AbstractTracker
 {
     const BLOCK_BEFORE_SCRIPT_TAG = 'beforeScriptTag';
@@ -78,6 +81,10 @@ public function __construct(
         EventDispatcherInterface $eventDispatcher,
         Environment $twig
     ) {
+        @trigger_error(
+            'Piwik\Tracker has been deprecated and will be removed in Pimcore 10.',
+            E_USER_DEPRECATED
+        );
         parent::__construct($siteIdProvider);
 
         $this->configProvider = $configProvider;

diff --git a/lib/Analytics/Piwik/WidgetBroker.php b/lib/Analytics/Piwik/WidgetBroker.php
@@ -28,6 +28,8 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
+ * @deprecated
+ *
  * Fetches and caches available widget data (stored by site ID and language) from the
  * Piwik API. This is used to show a list of widgets inside the Pimcore admin and to
  * generate iframe URLs to single widgets.

diff --git a/lib/Event/Analytics/PiwikEvents.php b/lib/Event/Analytics/PiwikEvents.php
@@ -14,6 +14,9 @@
 
 namespace Pimcore\Event\Analytics;
 
+/**
+ * @deprecated
+ */
 final class PiwikEvents
 {
     /**

diff --git a/lib/Targeting/Condition/Piwik/VisitedPageBefore.php b/lib/Targeting/Condition/Piwik/VisitedPageBefore.php
@@ -22,6 +22,9 @@
 use Pimcore\Targeting\DataProviderDependentInterface;
 use Pimcore\Targeting\Model\VisitorInfo;
 
+/**
+ * @deprecated
+ */
 class VisitedPageBefore implements ConditionInterface, DataProviderDependentInterface
 {
     /**

diff --git a/lib/Targeting/EventListener/PiwikVisitorIdListener.php b/lib/Targeting/EventListener/PiwikVisitorIdListener.php
@@ -22,6 +22,9 @@
 use Pimcore\Event\Analytics\PiwikEvents;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
+/**
+ * @deprecated
+ */
 class PiwikVisitorIdListener implements EventSubscriberInterface
 {
     /**