From b7d41a4978eeb2719c98af3190f3fad20033e020 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Wed, 10 Jan 2018 21:19:53 +0100
Subject: [PATCH 01/10] Update copyright notice

---
 Block/Piwik.php                                        | 2 +-
 CustomerData/Checkout/CartPlugin.php                   | 2 +-
 CustomerData/Customer/CustomerPlugin.php               | 2 +-
 Helper/Data.php                                        | 2 +-
 Helper/Tracker.php                                     | 2 +-
 Model/Config/Source/UserId/Provider.php                | 2 +-
 Model/Tracker.php                                      | 2 +-
 Model/Tracker/Action.php                               | 2 +-
 Observer/BeforeTrackPageViewObserver.php               | 2 +-
 Observer/CartViewObserver.php                          | 2 +-
 Observer/CategoryViewObserver.php                      | 2 +-
 Observer/CheckoutSuccessObserver.php                   | 2 +-
 Observer/ProductViewObserver.php                       | 2 +-
 Observer/SearchResultObserver.php                      | 2 +-
 Test/Unit/CustomerData/Checkout/CartPluginTest.php     | 2 +-
 Test/Unit/CustomerData/Customer/CustomerPluginTest.php | 2 +-
 Test/Unit/Helper/DataTest.php                          | 2 +-
 Test/Unit/Helper/TrackerTest.php                       | 2 +-
 Test/Unit/Model/TrackerTest.php                        | 2 +-
 Test/Unit/Observer/BeforeTrackPageViewObserverTest.php | 2 +-
 Test/Unit/Observer/CartViewObserverTest.php            | 2 +-
 Test/Unit/Observer/CategoryViewObserverTest.php        | 2 +-
 Test/Unit/Observer/CheckoutSuccessObserverTest.php     | 2 +-
 Test/Unit/Observer/ProductViewObserverTest.php         | 2 +-
 Test/Unit/Observer/SearchResultObserverTest.php        | 2 +-
 UserId/Provider/EmailProvider.php                      | 2 +-
 UserId/Provider/EntityIdProvider.php                   | 2 +-
 UserId/Provider/Pool.php                               | 2 +-
 UserId/Provider/ProviderInterface.php                  | 2 +-
 etc/acl.xml                                            | 2 +-
 etc/adminhtml/system.xml                               | 2 +-
 etc/config.xml                                         | 2 +-
 etc/di.xml                                             | 2 +-
 etc/frontend/di.xml                                    | 2 +-
 etc/frontend/events.xml                                | 2 +-
 etc/module.xml                                         | 2 +-
 registration.php                                       | 2 +-
 view/frontend/layout/default.xml                       | 2 +-
 view/frontend/templates/piwik.phtml                    | 2 +-
 view/frontend/web/js/tracker.js                        | 2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/Block/Piwik.php b/Block/Piwik.php
index e5a13a6..96ee73f 100644
--- a/Block/Piwik.php
+++ b/Block/Piwik.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/CustomerData/Checkout/CartPlugin.php b/CustomerData/Checkout/CartPlugin.php
index 32f12f5..afd6360 100644
--- a/CustomerData/Checkout/CartPlugin.php
+++ b/CustomerData/Checkout/CartPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/CustomerData/Customer/CustomerPlugin.php b/CustomerData/Customer/CustomerPlugin.php
index 206fbfe..6ba69e9 100644
--- a/CustomerData/Customer/CustomerPlugin.php
+++ b/CustomerData/Customer/CustomerPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Helper/Data.php b/Helper/Data.php
index d192691..fa67250 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Helper/Tracker.php b/Helper/Tracker.php
index 24d3887..593e1cc 100644
--- a/Helper/Tracker.php
+++ b/Helper/Tracker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Model/Config/Source/UserId/Provider.php b/Model/Config/Source/UserId/Provider.php
index 10fef6a..424c2b1 100644
--- a/Model/Config/Source/UserId/Provider.php
+++ b/Model/Config/Source/UserId/Provider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Model/Tracker.php b/Model/Tracker.php
index b9a1a07..fae638b 100644
--- a/Model/Tracker.php
+++ b/Model/Tracker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Model/Tracker/Action.php b/Model/Tracker/Action.php
index 6ad5797..ec808dc 100644
--- a/Model/Tracker/Action.php
+++ b/Model/Tracker/Action.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/BeforeTrackPageViewObserver.php b/Observer/BeforeTrackPageViewObserver.php
index a63ec0a..9d4d34f 100644
--- a/Observer/BeforeTrackPageViewObserver.php
+++ b/Observer/BeforeTrackPageViewObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/CartViewObserver.php b/Observer/CartViewObserver.php
index e69b57a..167753b 100644
--- a/Observer/CartViewObserver.php
+++ b/Observer/CartViewObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/CategoryViewObserver.php b/Observer/CategoryViewObserver.php
index 2552404..0d0688e 100644
--- a/Observer/CategoryViewObserver.php
+++ b/Observer/CategoryViewObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/CheckoutSuccessObserver.php b/Observer/CheckoutSuccessObserver.php
index 123905a..d3dd351 100644
--- a/Observer/CheckoutSuccessObserver.php
+++ b/Observer/CheckoutSuccessObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/ProductViewObserver.php b/Observer/ProductViewObserver.php
index 3535505..11512b8 100644
--- a/Observer/ProductViewObserver.php
+++ b/Observer/ProductViewObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Observer/SearchResultObserver.php b/Observer/SearchResultObserver.php
index 3d03656..48939b7 100644
--- a/Observer/SearchResultObserver.php
+++ b/Observer/SearchResultObserver.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/CustomerData/Checkout/CartPluginTest.php b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
index 9f3d578..959841d 100644
--- a/Test/Unit/CustomerData/Checkout/CartPluginTest.php
+++ b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/CustomerData/Customer/CustomerPluginTest.php b/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
index 79b0918..b4e16e3 100644
--- a/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
+++ b/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Helper/DataTest.php b/Test/Unit/Helper/DataTest.php
index fbd9a91..9b77817 100644
--- a/Test/Unit/Helper/DataTest.php
+++ b/Test/Unit/Helper/DataTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Helper/TrackerTest.php b/Test/Unit/Helper/TrackerTest.php
index 1c02015..8e0c65b 100644
--- a/Test/Unit/Helper/TrackerTest.php
+++ b/Test/Unit/Helper/TrackerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Model/TrackerTest.php b/Test/Unit/Model/TrackerTest.php
index 03d7fc4..33e33a9 100644
--- a/Test/Unit/Model/TrackerTest.php
+++ b/Test/Unit/Model/TrackerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php b/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
index a7ca7ca..062c6fc 100644
--- a/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
+++ b/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/CartViewObserverTest.php b/Test/Unit/Observer/CartViewObserverTest.php
index 515a2af..973a866 100644
--- a/Test/Unit/Observer/CartViewObserverTest.php
+++ b/Test/Unit/Observer/CartViewObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/CategoryViewObserverTest.php b/Test/Unit/Observer/CategoryViewObserverTest.php
index 412e4e4..104b626 100644
--- a/Test/Unit/Observer/CategoryViewObserverTest.php
+++ b/Test/Unit/Observer/CategoryViewObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/CheckoutSuccessObserverTest.php b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
index 764194e..c1d5530 100644
--- a/Test/Unit/Observer/CheckoutSuccessObserverTest.php
+++ b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/ProductViewObserverTest.php b/Test/Unit/Observer/ProductViewObserverTest.php
index 1354e29..ef4d4b2 100644
--- a/Test/Unit/Observer/ProductViewObserverTest.php
+++ b/Test/Unit/Observer/ProductViewObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/Test/Unit/Observer/SearchResultObserverTest.php b/Test/Unit/Observer/SearchResultObserverTest.php
index 846ec07..765c18d 100644
--- a/Test/Unit/Observer/SearchResultObserverTest.php
+++ b/Test/Unit/Observer/SearchResultObserverTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/UserId/Provider/EmailProvider.php b/UserId/Provider/EmailProvider.php
index 068bce5..c375ac1 100644
--- a/UserId/Provider/EmailProvider.php
+++ b/UserId/Provider/EmailProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/UserId/Provider/EntityIdProvider.php b/UserId/Provider/EntityIdProvider.php
index 5bce075..ca6918f 100644
--- a/UserId/Provider/EntityIdProvider.php
+++ b/UserId/Provider/EntityIdProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/UserId/Provider/Pool.php b/UserId/Provider/Pool.php
index 1e84b86..7384fe5 100644
--- a/UserId/Provider/Pool.php
+++ b/UserId/Provider/Pool.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/UserId/Provider/ProviderInterface.php b/UserId/Provider/ProviderInterface.php
index 604279a..2e6f298 100644
--- a/UserId/Provider/ProviderInterface.php
+++ b/UserId/Provider/ProviderInterface.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/acl.xml b/etc/acl.xml
index c759a08..77abfd2 100644
--- a/etc/acl.xml
+++ b/etc/acl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 51f5e59..9220676 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/config.xml b/etc/config.xml
index e37b7ce..4e6ceb7 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/di.xml b/etc/di.xml
index 2299d2c..51313fc 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index 8d0a059..44830dc 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
index fc2d6a1..1c58bd4 100644
--- a/etc/frontend/events.xml
+++ b/etc/frontend/events.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/etc/module.xml b/etc/module.xml
index e542e33..80c4592 100644
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/registration.php b/registration.php
index 8095402..ef2d4db 100644
--- a/registration.php
+++ b/registration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/view/frontend/layout/default.xml b/view/frontend/layout/default.xml
index 45b57cf..ab09e03 100644
--- a/view/frontend/layout/default.xml
+++ b/view/frontend/layout/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/view/frontend/templates/piwik.phtml b/view/frontend/templates/piwik.phtml
index 6177b12..b39057c 100644
--- a/view/frontend/templates/piwik.phtml
+++ b/view/frontend/templates/piwik.phtml
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *
diff --git a/view/frontend/web/js/tracker.js b/view/frontend/web/js/tracker.js
index 774ff94..b6efc5f 100644
--- a/view/frontend/web/js/tracker.js
+++ b/view/frontend/web/js/tracker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017 Henrik Hedelund
+ * Copyright 2016-2018 Henrik Hedelund
  *
  * This file is part of Henhed_Piwik.
  *

From fb18ea423dbda7e5f8312a9488815f5a9295d079 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Thu, 11 Jan 2018 20:04:22 +0100
Subject: [PATCH 02/10] Update dependency config (closes #20, closes #21,
 closes #23)

---
 .travis.yml   | 10 +++-------
 composer.json | 12 +++++++++++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2fe3db2..962357e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,10 @@ language: php
 php:
   - 7.1
   - 7.0
-  - 5.6
 env:
-  - M2_VERSION=2.1.9
-  - M2_VERSION=2.0.16
-matrix:
-  include:
-    - php: 5.5
-      env: M2_VERSION=2.0.16
+  - M2_VERSION=2.2.2
+  - M2_VERSION=2.2.1
+  - M2_VERSION=2.2.0
 cache:
   directories:
     - $HOME/.composer/cache
diff --git a/composer.json b/composer.json
index ecbf2f4..1592759 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,17 @@
         "AGPL-3.0+"
     ],
     "require": {
-        "php": "~5.5.0|~5.6.0|~7.0.0|~7.1.0"
+        "php": "~7.0.0|~7.1.0",
+        "magento/framework": "~101.0",
+        "magento/module-catalog": "~102.0",
+        "magento/module-catalog-search": "~100.0",
+        "magento/module-checkout": "~100.0",
+        "magento/module-config": "~101.0",
+        "magento/module-customer": "~101.0",
+        "magento/module-quote": "~101.0",
+        "magento/module-sales": "~101.0",
+        "magento/module-search": "~100.0",
+        "magento/module-store": "~100.0"
     },
     "autoload": {
         "files": ["registration.php"],

From 844e81b4eb861a796471361ce6ccaabcd332f8a1 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 14 Jan 2018 18:46:46 +0100
Subject: [PATCH 03/10] Workaround for checkout adblock issue

---
 view/frontend/templates/piwik.phtml | 36 +++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/view/frontend/templates/piwik.phtml b/view/frontend/templates/piwik.phtml
index b39057c..cc72ced 100644
--- a/view/frontend/templates/piwik.phtml
+++ b/view/frontend/templates/piwik.phtml
@@ -47,6 +47,42 @@
     s.parentNode.insertBefore(g, s);
 })(window, document);
 </script>
+<?php
+// The following script is a workaround that prevents the checkout loader
+// overlay from spinning indefinitely in cases where a browser plugin such as
+// AdBlock stops the tracker JS component from loading. The loader indicator
+// relies on require's module registry to decide when to hide itself so here we
+// export a mocked version of the component if we get an `errback' from require.
+// @see vendor/magento/module-checkout/view/frontend/web/js/checkout-loader.js
+// @see lib/web/mage/requirejs/resolver.js
+?>
+<script type="text/javascript">
+(function (require, undefined) {
+    'use strict';
+    var moduleName = 'Henhed_Piwik/js/tracker';
+    (require !== undefined) && require([moduleName], undefined, function (e) {
+        if (e.requireType === 'scripterror'
+            && (e.requireModules && e.requireModules[0]) === moduleName
+        ) {
+            require.undef(moduleName);
+            define(moduleName, function () {
+                var noop = function () { /* NoOp */ };
+                var error = function () {
+                    throw new Error('Failed to load Piwik module');
+                };
+                var mock = {
+                    createTracker: error,
+                    getPiwik: error,
+                    getTracker: error,
+                    push: noop
+                };
+                mock[moduleName] = noop;
+                return mock;
+            });
+        }
+    });
+})(require);
+</script>
 <noscript>
     <p>
         <img src="<?php echo $block->getTrackingPixelUrl(); ?>"

From 8b15b4907d73543fae370fdccfbcefce6e8c2e23 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 14 Jan 2018 19:37:29 +0100
Subject: [PATCH 04/10] Update tests for PHPUnit 6

---
 .../CustomerData/Checkout/CartPluginTest.php  | 23 +++---
 .../Customer/CustomerPluginTest.php           | 21 +++---
 Test/Unit/Helper/DataTest.php                 | 57 ++++++++++-----
 Test/Unit/Helper/TrackerTest.php              | 25 ++++---
 Test/Unit/Model/TrackerTest.php               | 14 ++--
 .../BeforeTrackPageViewObserverTest.php       | 27 +++----
 Test/Unit/Observer/CartViewObserverTest.php   | 20 +++---
 .../Observer/CategoryViewObserverTest.php     | 23 +++---
 .../Observer/CheckoutSuccessObserverTest.php  | 72 +++++++++++--------
 .../Unit/Observer/ProductViewObserverTest.php | 39 +++++-----
 .../Observer/SearchResultObserverTest.php     | 33 ++++-----
 11 files changed, 207 insertions(+), 147 deletions(-)

diff --git a/Test/Unit/CustomerData/Checkout/CartPluginTest.php b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
index 959841d..0758e78 100644
--- a/Test/Unit/CustomerData/Checkout/CartPluginTest.php
+++ b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\CustomerData\Checkout\CartPlugin
  *
  */
-class CartPluginTest extends \PHPUnit_Framework_TestCase
+class CartPluginTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -78,18 +78,21 @@ class CartPluginTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\CustomerData\Checkout\CartPlugin';
+        $className = \Henhed\Piwik\CustomerData\Checkout\CartPlugin::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className, [
-            'trackerFactory' => $this->getMock(
+            'trackerFactory' => $this->createPartialMock(
+                // @codingStandardsIgnoreStart
                 'Henhed\Piwik\Model\TrackerFactory',
-                ['create'], [], '', false
+                // @codingStandardsIgnoreEnd
+                ['create']
             )
         ]);
         $this->_cartPlugin = $objectManager->getObject($className, $arguments);
 
-        $this->_quoteMock = $this->getMock(
-            'Magento\Quote\Model\Quote', ['getId'], [], '', false
+        $this->_quoteMock = $this->createPartialMock(
+            \Magento\Quote\Model\Quote::class,
+            ['getId']
         );
         $arguments['checkoutSession']
             ->expects($this->any())
@@ -97,8 +100,8 @@ public function setUp()
             ->willReturn($this->_quoteMock);
 
         $this->_dataHelperMock = $arguments['dataHelper'];
-        $this->_trackerMock = $this->getMock(
-            'Henhed\Piwik\Model\Tracker', [], [], '', false
+        $this->_trackerMock = $this->createMock(
+            \Henhed\Piwik\Model\Tracker::class
         );
         $arguments['trackerFactory']
             ->expects($this->any())
@@ -107,8 +110,8 @@ public function setUp()
 
         $this->_trackerHelperMock = $arguments['trackerHelper'];
 
-        $this->_cartMock = $this->getMock(
-            'Magento\Checkout\CustomerData\Cart', [], [], '', false
+        $this->_cartMock = $this->createMock(
+            \Magento\Checkout\CustomerData\Cart::class
         );
     }
 
diff --git a/Test/Unit/CustomerData/Customer/CustomerPluginTest.php b/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
index b4e16e3..1a20250 100644
--- a/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
+++ b/Test/Unit/CustomerData/Customer/CustomerPluginTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\CustomerData\Customer\CustomerPlugin
  *
  */
-class CustomerPluginTest extends \PHPUnit_Framework_TestCase
+class CustomerPluginTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -78,19 +78,19 @@ class CustomerPluginTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\CustomerData\Customer\CustomerPlugin';
+        $className = \Henhed\Piwik\CustomerData\Customer\CustomerPlugin::class;
         $objectManager = new ObjectManager($this);
         $args = $objectManager->getConstructArguments($className);
         $this->_customerPlugin = $objectManager->getObject($className, $args);
         $this->_currentCustomerMock = $args['currentCustomer'];
         $this->_dataHelperMock = $args['dataHelper'];
         $this->_uidProviderPoolMock = $args['uidProviderPool'];
-        $this->_uidProviderMock = $this->getMock(
-            'Henhed\Piwik\UserId\Provider\ProviderInterface',
-            ['getUserId', 'getTitle'], [], '', false
+        $this->_uidProviderMock = $this->createPartialMock(
+            \Henhed\Piwik\UserId\Provider\ProviderInterface::class,
+            ['getUserId', 'getTitle']
         );
-        $this->_customerDataMock = $this->getMock(
-            'Magento\Customer\CustomerData\Customer', [], [], '', false
+        $this->_customerDataMock = $this->createMock(
+            \Magento\Customer\CustomerData\Customer::class
         );
     }
 
@@ -113,7 +113,7 @@ public function testafterGetSectionDataDataProvider()
     /**
      * Test `afterGetSectionData'
      *
-     * @param boolean $enabled
+     * @param bool $enabled
      * @param int $customerId
      * @param string|null $provider
      * @param string $userId
@@ -121,7 +121,10 @@ public function testafterGetSectionDataDataProvider()
      * @dataProvider testafterGetSectionDataDataProvider
      */
     public function testafterGetSectionData(
-        $enabled, $customerId, $provider, $userId
+        $enabled,
+        $customerId,
+        $provider,
+        $userId
     ) {
         $expectedResult = [];
         if ($enabled && $customerId && $provider && $userId) {
diff --git a/Test/Unit/Helper/DataTest.php b/Test/Unit/Helper/DataTest.php
index 9b77817..cff1038 100644
--- a/Test/Unit/Helper/DataTest.php
+++ b/Test/Unit/Helper/DataTest.php
@@ -27,7 +27,7 @@
  * Test for \Henhed\Piwik\Helper\Data
  *
  */
-class DataTest extends \PHPUnit_Framework_TestCase
+class DataTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -37,7 +37,6 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected $_helper;
 
-
     /**
      * Scope config mock object
      *
@@ -59,7 +58,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = '\Henhed\Piwik\Helper\Data';
+        $className = \Henhed\Piwik\Helper\Data::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
         $this->_helper = $objectManager->getObject($className, $arguments);
@@ -81,12 +80,19 @@ public function setUp()
      * @param string $jsScriptPath
      * @param string $cdnHostname
      * @param string $scope
-     * @param null|string|bool|int|Store $store
+     * @param null|string|bool|int|\Magento\Store\Model\Store $store
      */
-    protected function _prepareScopeConfigMock($enabled = null,
-        $hostname = null, $siteId = null, $linkEnabled = null,
-        $linkDelay = null, $phpScriptPath = null, $jsScriptPath = null,
-        $cdnHostname = null, $scope = ScopeInterface::SCOPE_STORE, $store = null
+    protected function _prepareScopeConfigMock(
+        $enabled = null,
+        $hostname = null,
+        $siteId = null,
+        $linkEnabled = null,
+        $linkDelay = null,
+        $phpScriptPath = null,
+        $jsScriptPath = null,
+        $cdnHostname = null,
+        $scope = ScopeInterface::SCOPE_STORE,
+        $store = null
     ) {
         $this->_scopeConfigMock
             ->expects($this->any())
@@ -161,7 +167,10 @@ public function isTrackingEnabledDataProvider()
      * @return void
      * @dataProvider isTrackingEnabledDataProvider
      */
-    public function testIsTrackingEnabled($enabled, $hostname, $siteId,
+    public function testIsTrackingEnabled(
+        $enabled,
+        $hostname,
+        $siteId,
         $returnValue
     ) {
         $this->_prepareScopeConfigMock($enabled, $hostname, $siteId);
@@ -209,13 +218,18 @@ public function phpScriptUrlDataProvider()
      * @param string $returnValue
      * @dataProvider phpScriptUrlDataProvider
      */
-    public function testGetPhpScriptUrl($hostname, $isSecure, $phpScriptPath,
+    public function testGetPhpScriptUrl(
+        $hostname,
+        $isSecure,
+        $phpScriptPath,
         $returnValue
     ) {
         $this->_prepareScopeConfigMock(
             null,
             $hostname,
-            null, null, null,
+            null,
+            null,
+            null,
             $phpScriptPath
         );
 
@@ -279,13 +293,20 @@ public function jsScriptUrlDataProvider()
      * @param string $returnValue
      * @dataProvider jsScriptUrlDataProvider
      */
-    public function testGetJsScriptUrl($hostname, $isSecure, $jsScriptPath,
-        $cdnHostname, $returnValue
+    public function testGetJsScriptUrl(
+        $hostname,
+        $isSecure,
+        $jsScriptPath,
+        $cdnHostname,
+        $returnValue
     ) {
         $this->_prepareScopeConfigMock(
             null,
             $hostname,
-            null, null, null, null,
+            null,
+            null,
+            null,
+            null,
             $jsScriptPath,
             $cdnHostname
         );
@@ -334,8 +355,12 @@ public function isLinkTrackingEnabledDataProvider()
      * @param bool $returnValue
      * @dataProvider isLinkTrackingEnabledDataProvider
      */
-    public function testIsLinkTrackingEnabled($linkEnabled, $enabled,
-        $hostname, $siteId, $returnValue
+    public function testIsLinkTrackingEnabled(
+        $linkEnabled,
+        $enabled,
+        $hostname,
+        $siteId,
+        $returnValue
     ) {
         $this->_prepareScopeConfigMock(
             $enabled,
diff --git a/Test/Unit/Helper/TrackerTest.php b/Test/Unit/Helper/TrackerTest.php
index 8e0c65b..834b2e6 100644
--- a/Test/Unit/Helper/TrackerTest.php
+++ b/Test/Unit/Helper/TrackerTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Helper\Tracker
  *
  */
-class TrackerTest extends \PHPUnit_Framework_TestCase
+class TrackerTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -54,15 +54,17 @@ public function setUp()
 
         // Create test subject
         $this->_helper = $objectManager->getObject(
-            '\Henhed\Piwik\Helper\Tracker'
+            \Henhed\Piwik\Helper\Tracker::class
         );
 
         // Create tracker instance
-        $class = '\Henhed\Piwik\Model\Tracker';
+        $class = \Henhed\Piwik\Model\Tracker::class;
         $arguments = $objectManager->getConstructArguments($class, [
-            'actionFactory' => $this->getMock(
+            'actionFactory' => $this->createPartialMock(
+                // @codingStandardsIgnoreStart
                 'Henhed\Piwik\Model\Tracker\ActionFactory',
-                ['create'], [], '', false
+                // @codingStandardsIgnoreEnd
+                ['create']
             )
         ]);
         $arguments['actionFactory']
@@ -149,8 +151,10 @@ protected function _getQuoteMock($items, $total)
         $quoteItems = [];
         foreach ($items as $itemData) {
             list($sku, $name, $price, $qty) = $itemData;
-            $itemClass = 'Magento\Quote\Model\Quote\Item';
-            $item = $this->getMock($itemClass, ['getData'], [], '', false);
+            $item = $this->createPartialMock(
+                \Magento\Quote\Model\Quote\Item::class,
+                ['getData']
+            );
             $item
                 ->expects($this->any())
                 ->method('getData')
@@ -163,10 +167,9 @@ protected function _getQuoteMock($items, $total)
             $quoteItems[] = $item;
         }
 
-        $quote = $this->getMock(
-            'Magento\Quote\Model\Quote',
-            ['getAllVisibleItems', 'getData'],
-            [], '', false
+        $quote = $this->createPartialMock(
+            \Magento\Quote\Model\Quote::class,
+            ['getAllVisibleItems', 'getData']
         );
         $quote
             ->expects($this->any())
diff --git a/Test/Unit/Model/TrackerTest.php b/Test/Unit/Model/TrackerTest.php
index 33e33a9..a500854 100644
--- a/Test/Unit/Model/TrackerTest.php
+++ b/Test/Unit/Model/TrackerTest.php
@@ -27,7 +27,7 @@
  * Test for \Henhed\Piwik\Model\Tracker
  *
  */
-class TrackerTest extends \PHPUnit_Framework_TestCase
+class TrackerTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -51,12 +51,14 @@ class TrackerTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = '\Henhed\Piwik\Model\Tracker';
+        $className = \Henhed\Piwik\Model\Tracker::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className, [
-            'actionFactory' => $this->getMock(
+            'actionFactory' => $this->createPartialMock(
+                // @codingStandardsIgnoreStart
                 'Henhed\Piwik\Model\Tracker\ActionFactory',
-                ['create'], [], '', false
+                // @codingStandardsIgnoreEnd
+                ['create']
             )
         ]);
         $this->_tracker = $objectManager->getObject($className, $arguments);
@@ -101,7 +103,9 @@ public function testMagicPush($name, $args)
             ])
             ->will($this->returnValue(new Tracker\Action($name, $args)));
 
-        call_user_func_array(array($this->_tracker, $name), $args);
+        // @codingStandardsIgnoreStart
+        call_user_func_array([$this->_tracker, $name], $args);
+        // @codingStandardsIgnoreEnd
 
         $this->assertEquals(
             [array_merge([$name], $args)],
diff --git a/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php b/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
index 062c6fc..8178d97 100644
--- a/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
+++ b/Test/Unit/Observer/BeforeTrackPageViewObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\BeforeTrackPageViewObserver
  *
  */
-class BeforeTrackPageViewObserverTest extends \PHPUnit_Framework_TestCase
+class BeforeTrackPageViewObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -71,21 +71,21 @@ class BeforeTrackPageViewObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\Observer\BeforeTrackPageViewObserver';
+        $className = \Henhed\Piwik\Observer\BeforeTrackPageViewObserver::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
         $this->_observer = $objectManager->getObject($className, $arguments);
         $this->_dataHelperMock = $arguments['dataHelper'];
-        $this->_trackerMock = $this->getMock(
-            'Henhed\Piwik\Model\Tracker',
-            ['enableLinkTracking', 'setLinkTrackingTimer'],
-            [], '', false
+        $this->_trackerMock = $this->createPartialMock(
+            \Henhed\Piwik\Model\Tracker::class,
+            ['enableLinkTracking', 'setLinkTrackingTimer']
         );
-        $this->_eventMock = $this->getMock(
-            'Magento\Framework\Event', ['getTracker'], [], '', false
+        $this->_eventMock = $this->createPartialMock(
+            \Magento\Framework\Event::class,
+            ['getTracker']
         );
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
     }
 
@@ -115,8 +115,11 @@ public function executeDataProvider()
      * @return void
      * @dataProvider executeDataProvider
      */
-    public function testExecute($linkTrackingEnabled, $linkTrackingDelay,
-        $enableLinkTrackingMatcher, $setLinkTrackingTimerMatcher
+    public function testExecute(
+        $linkTrackingEnabled,
+        $linkTrackingDelay,
+        $enableLinkTrackingMatcher,
+        $setLinkTrackingTimerMatcher
     ) {
         // Prepare observer mock
         $this->_eventObserverMock
diff --git a/Test/Unit/Observer/CartViewObserverTest.php b/Test/Unit/Observer/CartViewObserverTest.php
index 973a866..b7848ab 100644
--- a/Test/Unit/Observer/CartViewObserverTest.php
+++ b/Test/Unit/Observer/CartViewObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\CartViewObserver
  *
  */
-class CartViewObserverTest extends \PHPUnit_Framework_TestCase
+class CartViewObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -46,14 +46,14 @@ class CartViewObserverTest extends \PHPUnit_Framework_TestCase
     /**
      * Tracker mock object
      *
-     * @var \PHPUnit_Framework_MockObject_MockObject $_eventObserverMock
+     * @var \PHPUnit_Framework_MockObject_MockObject $_trackerMock
      */
     protected $_trackerMock;
 
     /**
      * Tracker helper mock object
      *
-     * @var \PHPUnit_Framework_MockObject_MockObject $_eventObserverMock
+     * @var \PHPUnit_Framework_MockObject_MockObject $_trackerHelperMock
      */
     protected $_trackerHelperMock;
 
@@ -67,14 +67,14 @@ class CartViewObserverTest extends \PHPUnit_Framework_TestCase
     /**
      * Checkout session mock object
      *
-     * @var \PHPUnit_Framework_MockObject_MockObject $_eventObserverMock
+     * @var \PHPUnit_Framework_MockObject_MockObject $_checkoutSessionMock
      */
     protected $_checkoutSessionMock;
 
     /**
      * Quote mock object
      *
-     * @var \PHPUnit_Framework_MockObject_MockObject $_eventObserverMock
+     * @var \PHPUnit_Framework_MockObject_MockObject $_quoteMock
      */
     protected $_quoteMock;
 
@@ -85,7 +85,7 @@ class CartViewObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\Observer\CartViewObserver';
+        $className = \Henhed\Piwik\Observer\CartViewObserver::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
         $this->_observer = $objectManager->getObject($className, $arguments);
@@ -93,11 +93,11 @@ public function setUp()
         $this->_trackerHelperMock = $arguments['trackerHelper'];
         $this->_dataHelperMock = $arguments['dataHelper'];
         $this->_checkoutSessionMock = $arguments['checkoutSession'];
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
-        $this->_quoteMock = $this->getMock(
-            'Magento\Quote\Model\Quote', [], [], '', false
+        $this->_quoteMock = $this->createMock(
+            \Magento\Quote\Model\Quote::class
         );
     }
 
diff --git a/Test/Unit/Observer/CategoryViewObserverTest.php b/Test/Unit/Observer/CategoryViewObserverTest.php
index 104b626..0bf1993 100644
--- a/Test/Unit/Observer/CategoryViewObserverTest.php
+++ b/Test/Unit/Observer/CategoryViewObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\CategoryViewObserver
  *
  */
-class CategoryViewObserverTest extends \PHPUnit_Framework_TestCase
+class CategoryViewObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -78,23 +78,26 @@ class CategoryViewObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\Observer\CategoryViewObserver';
+        $className = \Henhed\Piwik\Observer\CategoryViewObserver::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
-        $this->_trackerMock = $this->getMock(
-            'Henhed\Piwik\Model\Tracker', ['setEcommerceView'], [], '', false
+        $this->_trackerMock = $this->createPartialMock(
+            \Henhed\Piwik\Model\Tracker::class,
+            ['setEcommerceView']
         );
         $arguments['piwikTracker'] = $this->_trackerMock;
         $this->_observer = $objectManager->getObject($className, $arguments);
         $this->_dataHelperMock = $arguments['dataHelper'];
-        $this->_eventMock = $this->getMock(
-            'Magento\Framework\Event', ['getCategory'], [], '', false
+        $this->_eventMock = $this->createPartialMock(
+            \Magento\Framework\Event::class,
+            ['getCategory']
         );
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
-        $this->_categoryMock = $this->getMock(
-            'Magento\Catalog\Model\Category', ['getName'], [], '', false
+        $this->_categoryMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Category::class,
+            ['getName']
         );
     }
 
diff --git a/Test/Unit/Observer/CheckoutSuccessObserverTest.php b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
index c1d5530..c2970f3 100644
--- a/Test/Unit/Observer/CheckoutSuccessObserverTest.php
+++ b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\CheckoutSuccessObserver
  *
  */
-class CheckoutSuccessObserverTest extends \PHPUnit_Framework_TestCase
+class CheckoutSuccessObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -81,11 +81,13 @@ public function setUp()
         $objectMgr = new ObjectManager($this);
 
         // Create tracker
-        $trackerClass = 'Henhed\Piwik\Model\Tracker';
+        $trackerClass = \Henhed\Piwik\Model\Tracker::class;
         $trackerArgs = $objectMgr->getConstructArguments($trackerClass, [
-            'actionFactory' => $this->getMock(
+            'actionFactory' => $this->createPartialMock(
+                // @codingStandardsIgnoreStart
                 'Henhed\Piwik\Model\Tracker\ActionFactory',
-                ['create'], [], '', false
+                // @codingStandardsIgnoreEnd
+                ['create']
             )
         ]);
         $trackerArgs['actionFactory']
@@ -100,11 +102,13 @@ public function setUp()
         $this->_tracker = $objectMgr->getObject($trackerClass, $trackerArgs);
 
         // Create test subject
-        $className = 'Henhed\Piwik\Observer\CheckoutSuccessObserver';
+        $className = \Henhed\Piwik\Observer\CheckoutSuccessObserver::class;
         $arguments = $objectMgr->getConstructArguments($className, [
-            'orderCollectionFactory' => $this->getMock(
+            'orderCollectionFactory' => $this->createPartialMock(
+                // @codingStandardsIgnoreStart
                 'Magento\Sales\Model\ResourceModel\Order\CollectionFactory',
-                ['create'], [], '', false
+                // @codingStandardsIgnoreEnd
+                ['create']
             )
         ]);
         $arguments['piwikTracker'] = $this->_tracker;
@@ -112,19 +116,19 @@ public function setUp()
         $this->_dataHelperMock = $arguments['dataHelper'];
 
         // Create event observer mock objects
-        $this->_orderCollectionMock = $this->getMock(
-            'Magento\Sales\Model\ResourceModel\Order\Collection',
-            [], [], '', false
+        $this->_orderCollectionMock = $this->createMock(
+            \Magento\Sales\Model\ResourceModel\Order\Collection::class
         );
         $arguments['orderCollectionFactory']
             ->expects($this->any())
             ->method('create')
             ->willReturn($this->_orderCollectionMock);
-        $this->_eventMock = $this->getMock(
-            'Magento\Framework\Event', ['getOrderIds'], [], '', false
+        $this->_eventMock = $this->createPartialMock(
+            \Magento\Framework\Event::class,
+            ['getOrderIds']
         );
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
         $this->_eventObserverMock
             ->expects($this->any())
@@ -149,12 +153,9 @@ protected function _getOrderItemMock($sku, $name, $price, $qty)
             'getBasePriceInclTax' => $price,
             'getQtyOrdered'       => $qty
         ];
-        $itemMock = $this->getMock(
-            'Magento\Sales\Model\Order\Item',
-            array_keys($methodMap),
-            [],
-            '',
-            false
+        $itemMock = $this->createPartialMock(
+            \Magento\Sales\Model\Order\Item::class,
+            array_keys($methodMap)
         );
         foreach ($methodMap as $method => $returnValue) {
             $itemMock
@@ -177,8 +178,14 @@ protected function _getOrderItemMock($sku, $name, $price, $qty)
      * @param array $itemsData
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
-    protected function _getOrderMock($incrementId, $grandTotal, $subTotal, $tax,
-        $shipping, $discount, $itemsData
+    protected function _getOrderMock(
+        $incrementId,
+        $grandTotal,
+        $subTotal,
+        $tax,
+        $shipping,
+        $discount,
+        $itemsData
     ) {
         $items = [];
         foreach ($itemsData as $itemData) {
@@ -194,12 +201,9 @@ protected function _getOrderMock($incrementId, $grandTotal, $subTotal, $tax,
             'getBaseDiscountAmount'  => $discount,
             'getAllVisibleItems'     => $items
         ];
-        $orderMock = $this->getMock(
-            'Magento\Sales\Model\Order',
-            array_keys($methodMap),
-            [],
-            '',
-            false
+        $orderMock = $this->createPartialMock(
+            \Magento\Sales\Model\Order::class,
+            array_keys($methodMap)
         );
         foreach ($methodMap as $method => $returnValue) {
             $orderMock
@@ -286,9 +290,15 @@ public function testExecuteWithTrackingEnabled($ordersData, $expectedResult)
             list($entityId, $incrementId, $grandTotal, $subTotal, $tax,
                  $shipping, $discount, $itemsData) = $orderData;
             $orderIds[] = $entityId;
-            $orders[] = $this->_getOrderMock($incrementId, $grandTotal,
-                                             $subTotal, $tax, $shipping,
-                                             $discount, $itemsData);
+            $orders[] = $this->_getOrderMock(
+                $incrementId,
+                $grandTotal,
+                $subTotal,
+                $tax,
+                $shipping,
+                $discount,
+                $itemsData
+            );
         }
 
         $this->_dataHelperMock
diff --git a/Test/Unit/Observer/ProductViewObserverTest.php b/Test/Unit/Observer/ProductViewObserverTest.php
index ef4d4b2..01d24fb 100644
--- a/Test/Unit/Observer/ProductViewObserverTest.php
+++ b/Test/Unit/Observer/ProductViewObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\ProductViewObserver
  *
  */
-class ProductViewObserverTest extends \PHPUnit_Framework_TestCase
+class ProductViewObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -85,28 +85,30 @@ class ProductViewObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\Observer\ProductViewObserver';
+        $className = \Henhed\Piwik\Observer\ProductViewObserver::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
-        $this->_trackerMock = $this->getMock(
-            'Henhed\Piwik\Model\Tracker', ['setEcommerceView'], [], '', false
+        $this->_trackerMock = $this->createPartialMock(
+            \Henhed\Piwik\Model\Tracker::class,
+            ['setEcommerceView']
         );
         $arguments['piwikTracker'] = $this->_trackerMock;
         $this->_observer = $objectManager->getObject($className, $arguments);
         $this->_dataHelperMock = $arguments['dataHelper'];
-        $this->_eventMock = $this->getMock(
-            'Magento\Framework\Event', ['getProduct'], [], '', false
+        $this->_eventMock = $this->createPartialMock(
+            \Magento\Framework\Event::class,
+            ['getProduct']
         );
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
-        $this->_productMock = $this->getMock(
-            'Magento\Catalog\Model\Product',
-            ['getCategory', 'getSku', 'getName', 'getFinalPrice'],
-            [], '', false
+        $this->_productMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Product::class,
+            ['getCategory', 'getSku', 'getName', 'getFinalPrice']
         );
-        $this->_categoryMock = $this->getMock(
-            'Magento\Catalog\Model\Category', ['getName'], [], '', false
+        $this->_categoryMock = $this->createPartialMock(
+            \Magento\Catalog\Model\Category::class,
+            ['getName']
         );
     }
 
@@ -134,7 +136,10 @@ public function executeDataProvider()
      * @return void
      * @dataProvider executeDataProvider
      */
-    public function testExecuteWithTrackingEnabled($sku, $name, $price,
+    public function testExecuteWithTrackingEnabled(
+        $sku,
+        $name,
+        $price,
         $category = null
     ) {
         // Enable tracking
@@ -167,7 +172,7 @@ public function testExecuteWithTrackingEnabled($sku, $name, $price,
         }
 
         // Prepare category mock if category name was provided
-        if (!is_null($category)) {
+        if ($category !== null) {
             $this->_productMock
                 ->expects($this->once())
                 ->method('getCategory')
@@ -186,7 +191,7 @@ public function testExecuteWithTrackingEnabled($sku, $name, $price,
                 $sku,
                 $name,
                 // Category should be FALSE if product has no category
-                is_null($category) ? false : $category,
+                ($category === null) ? false : $category,
                 (float) $price
             )
             ->willReturn($this->_trackerMock);
diff --git a/Test/Unit/Observer/SearchResultObserverTest.php b/Test/Unit/Observer/SearchResultObserverTest.php
index 765c18d..40f16ff 100644
--- a/Test/Unit/Observer/SearchResultObserverTest.php
+++ b/Test/Unit/Observer/SearchResultObserverTest.php
@@ -26,7 +26,7 @@
  * Test for \Henhed\Piwik\Observer\SearchResultObserver
  *
  */
-class SearchResultObserverTest extends \PHPUnit_Framework_TestCase
+class SearchResultObserverTest extends \PHPUnit\Framework\TestCase
 {
 
     /**
@@ -92,28 +92,28 @@ class SearchResultObserverTest extends \PHPUnit_Framework_TestCase
      */
     public function setUp()
     {
-        $className = 'Henhed\Piwik\Observer\SearchResultObserver';
+        $className = \Henhed\Piwik\Observer\SearchResultObserver::class;
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className);
 
-        $this->_trackerMock = $this->getMock(
-            'Henhed\Piwik\Model\Tracker', ['trackSiteSearch'], [], '', false
+        $this->_trackerMock = $this->createPartialMock(
+            \Henhed\Piwik\Model\Tracker::class,
+            ['trackSiteSearch']
         );
         $arguments['piwikTracker'] = $this->_trackerMock;
         $this->_dataHelperMock = $arguments['dataHelper'];
 
-        $this->_layoutMock = $this->getMock(
-            'Magento\Framework\View\Layout', [], [], '', false
+        $this->_layoutMock = $this->createMock(
+            \Magento\Framework\View\Layout::class
         );
         $arguments['view']
             ->expects($this->any())
             ->method('getLayout')
             ->willReturn($this->_layoutMock);
 
-        $this->_queryMock = $this->getMock(
-            'Magento\Search\Model\Query',
-            ['getQueryText', 'getNumResults'],
-            [], '', false
+        $this->_queryMock = $this->createPartialMock(
+            \Magento\Search\Model\Query::class,
+            ['getQueryText', 'getNumResults']
         );
         $arguments['queryFactory']
             ->expects($this->any())
@@ -121,14 +121,15 @@ public function setUp()
             ->willReturn($this->_queryMock);
 
         $this->_observer = $objectManager->getObject($className, $arguments);
-        $this->_piwikBlockMock = $this->getMock(
-            'Henhed\Piwik\Block\Piwik', ['setSkipTrackPageView'], [], '', false
+        $this->_piwikBlockMock = $this->createPartialMock(
+            \Henhed\Piwik\Block\Piwik::class,
+            ['setSkipTrackPageView']
         );
-        $this->_searchResultBlockMock = $this->getMock(
-            'Magento\CatalogSearch\Block\Result', [], [], '', false
+        $this->_searchResultBlockMock = $this->createMock(
+            \Magento\CatalogSearch\Block\Result::class
         );
-        $this->_eventObserverMock = $this->getMock(
-            'Magento\Framework\Event\Observer', [], [], '', false
+        $this->_eventObserverMock = $this->createMock(
+            \Magento\Framework\Event\Observer::class
         );
     }
 

From 76b9dce911ee9b3a5ab87edb8ec0f32ee920953c Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sat, 20 Jan 2018 15:45:26 +0100
Subject: [PATCH 05/10] Refactor checkout success observer

---
 Helper/Tracker.php                            | 113 +++++++
 Observer/CheckoutSuccessObserver.php          | 125 +++-----
 Test/Unit/Helper/TrackerTest.php              | 144 +++++++++
 .../Observer/CheckoutSuccessObserverTest.php  | 285 +++++-------------
 4 files changed, 367 insertions(+), 300 deletions(-)

diff --git a/Helper/Tracker.php b/Helper/Tracker.php
index 593e1cc..9d23886 100644
--- a/Helper/Tracker.php
+++ b/Helper/Tracker.php
@@ -22,6 +22,8 @@
 
 use Henhed\Piwik\Model\Tracker as TrackerModel;
 use Magento\Quote\Model\Quote;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
 
 /**
  * Piwik tracker helper
@@ -80,4 +82,115 @@ public function addQuote(Quote $quote, TrackerModel $tracker)
         $this->addQuoteTotal($quote, $tracker);
         return $this;
     }
+
+    /**
+     * Push order contents to given tracker
+     *
+     * @param \Magento\Sales\Api\Data\OrderInterface[]|\Traversable $orders
+     * @param \Henhed\Piwik\Model\Tracker $tracker
+     * @return \Henhed\Piwik\Helper\Tracker
+     */
+    public function addOrders($orders, TrackerModel $tracker)
+    {
+        $piwikItems = [];
+        $piwikOrder = [];
+
+        // Collect tracking data
+        foreach ($orders as $order) {
+            foreach ($order->getItems() as $item) {
+                if (!$item->getParentItemId()) {
+                    $this->_appendOrderItemData($item, $piwikItems);
+                }
+            }
+            $this->_appendOrderData($order, $piwikOrder);
+        }
+
+        // Push `addEcommerceItem'
+        foreach ($piwikItems as $piwikItem) {
+            list($sku, $name, $rowTotal, $qty) = $piwikItem;
+
+            $tracker->addEcommerceItem(
+                $sku,
+                $name,
+                false,
+                ($qty > 0) // div-by-zero protection
+                    ? $rowTotal / $qty // restore to unit price
+                    : 0,
+                $qty
+            );
+        }
+
+        // Push `trackEcommerceOrder'
+        if (!empty($piwikOrder)) {
+            list($orderId, $grandTotal, $subTotal, $tax, $shipping, $discount)
+                = $piwikOrder;
+
+            $tracker->trackEcommerceOrder(
+                $orderId,
+                $grandTotal,
+                $subTotal,
+                $tax,
+                $shipping,
+                ($discount > 0)
+                    ? $discount
+                    : false
+            );
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param OrderItemInterface $item
+     * @param array &$data
+     * @return void
+     */
+    protected function _appendOrderItemData(OrderItemInterface $item, &$data)
+    {
+        $sku   = $item->getSku();
+        $name  = $item->getName();
+        $price = (float) $item->getBasePriceInclTax();
+        $qty   = (float) $item->getQtyOrdered();
+
+        // Group order items by SKU since Piwik doesn't seem to handle multiple
+        // `addEcommerceItem' with the same SKU.
+        if (!isset($data[$sku])) {
+            $data[$sku] = [$sku, $name, $price * $qty, $qty];
+        } else {
+            // Aggregate row total instead of unit price in case there
+            // are different prices for the same SKU.
+            $data[$sku][2] += $price * $qty;
+            $data[$sku][3] += $qty;
+        }
+    }
+
+    /**
+     * @param OrderInterface $order
+     * @param array &$data
+     * @return void
+     */
+    protected function _appendOrderData(OrderInterface $order, &$data)
+    {
+        $orderId    = $order->getIncrementId();
+        $grandTotal = (float) $order->getBaseGrandTotal();
+        $subTotal   = (float) $order->getBaseSubtotalInclTax();
+        $tax        = (float) $order->getBaseTaxAmount();
+        $shipping   = (float) $order->getBaseShippingInclTax();
+        $discount   = abs((float) $order->getBaseDiscountAmount());
+
+        // Aggregate all placed orders into one since Piwik seems to only
+        // register one `trackEcommerceOrder' per request. (For multishipping)
+        if (empty($data)) {
+            $data = [
+                $orderId, $grandTotal, $subTotal, $tax, $shipping, $discount
+            ];
+        } else {
+            $data[0] .= ', ' . $orderId;
+            $data[1] += $grandTotal;
+            $data[2] += $subTotal;
+            $data[3] += $tax;
+            $data[4] += $shipping;
+            $data[5] += $discount;
+        }
+    }
 }
diff --git a/Observer/CheckoutSuccessObserver.php b/Observer/CheckoutSuccessObserver.php
index d3dd351..22581c4 100644
--- a/Observer/CheckoutSuccessObserver.php
+++ b/Observer/CheckoutSuccessObserver.php
@@ -33,7 +33,7 @@ class CheckoutSuccessObserver implements ObserverInterface
     /**
      * Piwik tracker instance
      *
-     * @var \Henhed\Piwik\Model\Tracker
+     * @var \Henhed\Piwik\Model\Tracker $_piwikTracker
      */
     protected $_piwikTracker;
 
@@ -45,27 +45,47 @@ class CheckoutSuccessObserver implements ObserverInterface
     protected $_dataHelper;
 
     /**
-     * Sales order collection factory
+     * Piwik tracker helper
      *
-     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $_orderCollectionFactory
+     * @var \Henhed\Piwik\Helper\Tracker $_trackerHelper
      */
-    protected $_orderCollectionFactory;
+    protected $_trackerHelper;
+
+    /**
+     * Sales order repository
+     *
+     * @var \Magento\Sales\Api\OrderRepositoryInterface $_orderRepository
+     */
+    protected $_orderRepository;
+
+    /**
+     * Search criteria builder
+     *
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder $_searchCriteriaBuilder
+     */
+    protected $_searchCriteriaBuilder;
 
     /**
      * Constructor
      *
      * @param \Henhed\Piwik\Model\Tracker $piwikTracker
      * @param \Henhed\Piwik\Helper\Data $dataHelper
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+     * @param \Henhed\Piwik\Helper\Tracker $trackerHelper
+     * @param \Magento\Sales\Api\OrderRepositoryInterface $orderRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         \Henhed\Piwik\Model\Tracker $piwikTracker,
         \Henhed\Piwik\Helper\Data $dataHelper,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+        \Henhed\Piwik\Helper\Tracker $trackerHelper,
+        \Magento\Sales\Api\OrderRepositoryInterface $orderRepository,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->_piwikTracker = $piwikTracker;
         $this->_dataHelper = $dataHelper;
-        $this->_orderCollectionFactory = $orderCollectionFactory;
+        $this->_trackerHelper = $trackerHelper;
+        $this->_orderRepository = $orderRepository;
+        $this->_searchCriteriaBuilder = $searchCriteriaBuilder;
     }
 
     /**
@@ -83,91 +103,16 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
 
-        $collection = $this->_orderCollectionFactory->create();
-        $collection->addFieldToFilter('entity_id', ['in' => $orderIds]);
-
-        // Group order items by SKU since Piwik doesn't seem to handle multiple
-        // `addEcommerceItem' with the same SKU.
-        $piwikItems = [];
-        // Aggregate all placed orders into one since Piwik seems to only
-        // register one `trackEcommerceOrder' per request. (For multishipping)
-        $piwikOrder = [];
-
-        foreach ($collection as $order) {
-            /* @var $order \Magento\Sales\Model\Order */
-
-            foreach ($order->getAllVisibleItems() as $item) {
-                /* @var $item \Magento\Sales\Model\Order\Item */
-
-                $sku   = $item->getSku();
-                $name  = $item->getName();
-                $price = (float) $item->getBasePriceInclTax();
-                $qty   = (float) $item->getQtyOrdered();
-
-                if (!isset($piwikItems[$sku])) {
-                    $piwikItems[$sku] = [$sku, $name, $price * $qty, $qty];
-                } else {
-                    // Aggregate row total instead of unit price in case there
-                    // are different prices for the same SKU.
-                    $piwikItems[$sku][2] += $price * $qty;
-                    $piwikItems[$sku][3] += $qty;
-                }
-            }
-
-            $orderId    = $order->getIncrementId();
-            $grandTotal = (float) $order->getBaseGrandTotal();
-            $subTotal   = (float) $order->getBaseSubtotalInclTax();
-            $tax        = (float) $order->getBaseTaxAmount();
-            $shipping   = (float) $order->getBaseShippingInclTax();
-            $discount   = abs((float) $order->getBaseDiscountAmount());
-
-            if (empty($piwikOrder)) {
-                $piwikOrder = [
-                    $orderId, $grandTotal, $subTotal, $tax, $shipping, $discount
-                ];
-            } else {
-                $piwikOrder[0] .= ', ' . $orderId;
-                $piwikOrder[1] += $grandTotal;
-                $piwikOrder[2] += $subTotal;
-                $piwikOrder[3] += $tax;
-                $piwikOrder[4] += $shipping;
-                $piwikOrder[5] += $discount;
-            }
-        }
-
-        // Push `addEcommerceItem'
-        foreach ($piwikItems as $piwikItem) {
+        $searchCriteria = $this->_searchCriteriaBuilder
+            ->addFilter('entity_id', $orderIds, 'in')
+            ->create();
 
-            list($sku, $name, $rowTotal, $qty) = $piwikItem;
+        $searchResult = $this->_orderRepository->getList($searchCriteria);
 
-            $this->_piwikTracker->addEcommerceItem(
-                $sku,
-                $name,
-                false,
-                ($qty > 0) // div-by-zero protection
-                    ? $rowTotal / $qty // restore to unit price
-                    : 0,
-                $qty
-            );
-        }
-
-        // Push `trackEcommerceOrder'
-        if (!empty($piwikOrder)) {
-
-            list($orderId, $grandTotal, $subTotal, $tax, $shipping, $discount)
-                = $piwikOrder;
-
-            $this->_piwikTracker->trackEcommerceOrder(
-                $orderId,
-                $grandTotal,
-                $subTotal,
-                $tax,
-                $shipping,
-                ($discount > 0)
-                    ? $discount
-                    : false
-            );
-        }
+        $this->_trackerHelper->addOrders(
+            $searchResult->getItems(),
+            $this->_piwikTracker
+        );
 
         return $this;
     }
diff --git a/Test/Unit/Helper/TrackerTest.php b/Test/Unit/Helper/TrackerTest.php
index 834b2e6..6342137 100644
--- a/Test/Unit/Helper/TrackerTest.php
+++ b/Test/Unit/Helper/TrackerTest.php
@@ -139,6 +139,100 @@ public function testAddQuote($items, $total)
         $this->assertSame($expectedResult, $this->_tracker->toArray());
     }
 
+    /**
+     * Order collection data provider
+     *
+     * @return array
+     */
+    public function addOrdersDataProvider()
+    {
+        return [
+            [
+                // Sample orders data
+                [
+                    [
+                        '100001', 123.45, 101, 10, 15, -5,
+                        [
+                            ['sku1', 'Name 1', 50, 2, null],
+                            ['sku2', 'Name 2', 50, 3, null]
+                        ]
+                    ],
+                    [
+                        '100002', '234.56', '201', '15', '20', '-50',
+                        [
+                            ['sku2', 'Name 2 (2)', '60', '1', null],
+                            ['sku3', 'Name 3',     '70', '2', null],
+                            ['sku4', 'Name 4',      '0', '1',    1]
+                        ]
+                    ]
+                ],
+                // Expected tracker data
+                [
+                    // Same as `sku1' from `100001'
+                    ['addEcommerceItem', 'sku1', 'Name 1', false, 50.0, 2.0],
+
+                    // Aggregated data for `sku2' from `100001' *and* `100002'
+                    [
+                        'addEcommerceItem',
+                        'sku2',
+                        'Name 2', // Name from first occurance of `sku2'
+                        false,    // No category name
+                        52.5,     // Sum of price / sum of qty (50*3 + 60)/4
+                        4.0       // Sum of qty
+                    ],
+
+                    // Same as `sku3' from `100002'
+                    ['addEcommerceItem', 'sku3', 'Name 3', false, 70.0, 2.0],
+
+                    // `sku4' should be skipped as it's a child item
+
+                    // Aggregated order data from `100001' and `100002'
+                    [
+                        'trackEcommerceOrder',
+                        '100001, 100002', // Concat increment IDs
+                        358.01,           // 123.45 + 234.56
+                        302.0,            // 101 + 201
+                        25.0,             // 10 + 15
+                        35.0,             // 15 + 20
+                        55.0              // abs(-5 + -50)
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Test for \Henhed\Piwik\Helper\Tracker::addOrders
+     *
+     * @param array $ordersData
+     * @param array $expectedResult
+     * @return void
+     * @dataProvider addOrdersDataProvider
+     */
+    public function testAddOrders($ordersData, $expectedResult)
+    {
+        $orders = [];
+        foreach ($ordersData as $orderData) {
+            list($incrementId, $grandTotal, $subTotal, $tax, $shipping,
+                 $discount, $itemsData) = $orderData;
+             $orders[] = $this->_getOrderMock(
+                 $incrementId,
+                 $grandTotal,
+                 $subTotal,
+                 $tax,
+                 $shipping,
+                 $discount,
+                 $itemsData
+             );
+        }
+
+        $this->assertSame(
+            $this->_helper,
+            $this->_helper->addOrders($orders, $this->_tracker)
+        );
+        $this->assertEquals($expectedResult, $this->_tracker->toArray());
+    }
+
     /**
      * Create a mock quote object with given data
      *
@@ -183,4 +277,54 @@ protected function _getQuoteMock($items, $total)
 
         return $quote;
     }
+
+    /**
+     * Create order mock object
+     *
+     * @param string $incrementId
+     * @param float $grandTotal
+     * @param float $subTotal
+     * @param float $tax
+     * @param float $shipping
+     * @param float $discount
+     * @param array $itemsData
+     * @return \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function _getOrderMock(
+        $incrementId,
+        $grandTotal,
+        $subTotal,
+        $tax,
+        $shipping,
+        $discount,
+        $itemsData
+    ) {
+        $items = [];
+        foreach ($itemsData as $itemData) {
+            list($sku, $name, $price, $qty, $parentId) = $itemData;
+            $items[] = $this->createConfiguredMock(
+                \Magento\Sales\Api\Data\OrderItemInterface::class,
+                [
+                    'getSku'              => $sku,
+                    'getName'             => $name,
+                    'getBasePriceInclTax' => $price,
+                    'getQtyOrdered'       => $qty,
+                    'getParentItemId'     => $parentId
+                ]
+            );
+        }
+        $orderMock = $this->createConfiguredMock(
+            \Magento\Sales\Api\Data\OrderInterface::class,
+            [
+                'getIncrementId'         => $incrementId,
+                'getBaseGrandTotal'      => $grandTotal,
+                'getBaseSubtotalInclTax' => $subTotal,
+                'getBaseTaxAmount'       => $tax,
+                'getBaseShippingInclTax' => $shipping,
+                'getBaseDiscountAmount'  => $discount,
+                'getItems'               => $items
+            ]
+        );
+        return $orderMock;
+    }
 }
diff --git a/Test/Unit/Observer/CheckoutSuccessObserverTest.php b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
index c2970f3..a4f6201 100644
--- a/Test/Unit/Observer/CheckoutSuccessObserverTest.php
+++ b/Test/Unit/Observer/CheckoutSuccessObserverTest.php
@@ -39,9 +39,9 @@ class CheckoutSuccessObserverTest extends \PHPUnit\Framework\TestCase
     /**
      * Tracker instance
      *
-     * @var \Henhed\Piwik\Model\Tracker $_tracker
+     * @var \PHPUnit_Framework_MockObject_MockObject $_trackerMock
      */
-    protected $_tracker;
+    protected $_trackerMock;
 
     /**
      * Piwik data helper mock object
@@ -51,11 +51,25 @@ class CheckoutSuccessObserverTest extends \PHPUnit\Framework\TestCase
     protected $_dataHelperMock;
 
     /**
-     * Order collection mock object
+     * Piwik tracker helper mock object
      *
-     * @var \PHPUnit_Framework_MockObject_MockObject $_orderCollectionMock
+     * @var \PHPUnit_Framework_MockObject_MockObject $_trackerHelperMock
      */
-    protected $_orderCollectionMock;
+    protected $_trackerHelperMock;
+
+    /**
+     * Sales order repository mock object
+     *
+     * @var \PHPUnit_Framework_MockObject_MockObject $_orderRepositoryMock
+     */
+    protected $_orderRepositoryMock;
+
+    /**
+     * Search criteria builder mock object
+     *
+     * @var \PHPUnit_Framework_MockObject_MockObject $_searchCriteriaBuilderMock
+     */
+    protected $_searchCriteriaBuilderMock;
 
     /**
      * Event observer mock object
@@ -80,49 +94,16 @@ public function setUp()
     {
         $objectMgr = new ObjectManager($this);
 
-        // Create tracker
-        $trackerClass = \Henhed\Piwik\Model\Tracker::class;
-        $trackerArgs = $objectMgr->getConstructArguments($trackerClass, [
-            'actionFactory' => $this->createPartialMock(
-                // @codingStandardsIgnoreStart
-                'Henhed\Piwik\Model\Tracker\ActionFactory',
-                // @codingStandardsIgnoreEnd
-                ['create']
-            )
-        ]);
-        $trackerArgs['actionFactory']
-            ->expects($this->any())
-            ->method('create')
-            ->willReturnCallback(function ($data) {
-                return new \Henhed\Piwik\Model\Tracker\Action(
-                    $data['name'],
-                    $data['args']
-                );
-            });
-        $this->_tracker = $objectMgr->getObject($trackerClass, $trackerArgs);
-
         // Create test subject
         $className = \Henhed\Piwik\Observer\CheckoutSuccessObserver::class;
-        $arguments = $objectMgr->getConstructArguments($className, [
-            'orderCollectionFactory' => $this->createPartialMock(
-                // @codingStandardsIgnoreStart
-                'Magento\Sales\Model\ResourceModel\Order\CollectionFactory',
-                // @codingStandardsIgnoreEnd
-                ['create']
-            )
-        ]);
-        $arguments['piwikTracker'] = $this->_tracker;
+        $arguments = $objectMgr->getConstructArguments($className);
         $this->_testSubject = $objectMgr->getObject($className, $arguments);
+        $this->_trackerMock = $arguments['piwikTracker'];
         $this->_dataHelperMock = $arguments['dataHelper'];
+        $this->_trackerHelperMock = $arguments['trackerHelper'];
+        $this->_orderRepositoryMock = $arguments['orderRepository'];
+        $this->_searchCriteriaBuilderMock = $arguments['searchCriteriaBuilder'];
 
-        // Create event observer mock objects
-        $this->_orderCollectionMock = $this->createMock(
-            \Magento\Sales\Model\ResourceModel\Order\Collection::class
-        );
-        $arguments['orderCollectionFactory']
-            ->expects($this->any())
-            ->method('create')
-            ->willReturn($this->_orderCollectionMock);
         $this->_eventMock = $this->createPartialMock(
             \Magento\Framework\Event::class,
             ['getOrderIds']
@@ -136,170 +117,18 @@ public function setUp()
             ->willReturn($this->_eventMock);
     }
 
-    /**
-     * Create order item mock object
-     *
-     * @param string $sku
-     * @param string $name
-     * @param float $price
-     * @param float $qty
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function _getOrderItemMock($sku, $name, $price, $qty)
-    {
-        $methodMap = [
-            'getSku'              => $sku,
-            'getName'             => $name,
-            'getBasePriceInclTax' => $price,
-            'getQtyOrdered'       => $qty
-        ];
-        $itemMock = $this->createPartialMock(
-            \Magento\Sales\Model\Order\Item::class,
-            array_keys($methodMap)
-        );
-        foreach ($methodMap as $method => $returnValue) {
-            $itemMock
-                ->expects($this->any())
-                ->method($method)
-                ->willReturn($returnValue);
-        }
-        return $itemMock;
-    }
-
-    /**
-     * Create order mock object
-     *
-     * @param string $incrementId
-     * @param float $grandTotal
-     * @param float $subTotal
-     * @param float $tax
-     * @param float $shipping
-     * @param float $discount
-     * @param array $itemsData
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected function _getOrderMock(
-        $incrementId,
-        $grandTotal,
-        $subTotal,
-        $tax,
-        $shipping,
-        $discount,
-        $itemsData
-    ) {
-        $items = [];
-        foreach ($itemsData as $itemData) {
-            list($sku, $name, $price, $qty) = $itemData;
-            $items[] = $this->_getOrderItemMock($sku, $name, $price, $qty);
-        }
-        $methodMap = [
-            'getIncrementId'         => $incrementId,
-            'getBaseGrandTotal'      => $grandTotal,
-            'getBaseSubtotalInclTax' => $subTotal,
-            'getBaseTaxAmount'       => $tax,
-            'getBaseShippingInclTax' => $shipping,
-            'getBaseDiscountAmount'  => $discount,
-            'getAllVisibleItems'     => $items
-        ];
-        $orderMock = $this->createPartialMock(
-            \Magento\Sales\Model\Order::class,
-            array_keys($methodMap)
-        );
-        foreach ($methodMap as $method => $returnValue) {
-            $orderMock
-                ->expects($this->any())
-                ->method($method)
-                ->willReturn($returnValue);
-        }
-        return $orderMock;
-    }
-
-    /**
-     * Order collection data provider
-     *
-     * @return array
-     */
-    public function executeDataProvider()
-    {
-        return [
-            [
-                // Sample orders data
-                [
-                    [
-                        1, '100001', 123.45, 101, 10, 15, -5,
-                        [
-                            ['sku1', 'Name 1', 50, 2],
-                            ['sku2', 'Name 2', 50, 3]
-                        ]
-                    ],
-                    [
-                        '2', '100002', '234.56', '201', '15', '20', '-50',
-                        [
-                            ['sku2', 'Name 2 (2)', '60', '1'],
-                            ['sku3', 'Name 3',     '70', '2']
-                        ]
-                    ]
-                ],
-                // Expected tracker data
-                [
-                    // Same as `sku1' from `100001'
-                    ['addEcommerceItem', 'sku1', 'Name 1', false, 50.0, 2.0],
-
-                    // Aggregated data for `sku2' from `100001' *and* `100002'
-                    [
-                        'addEcommerceItem',
-                        'sku2',
-                        'Name 2', // Name from first occurance of `sku2'
-                        false,    // No category name
-                        52.5,     // Sum of price / sum of qty (50*3 + 60)/4
-                        4.0       // Sum of qty
-                    ],
-
-                    // Same as `sku3' from `100002'
-                    ['addEcommerceItem', 'sku3', 'Name 3', false, 70.0, 2.0],
-
-                    // Aggregated order data from `100001' and `100002'
-                    [
-                        'trackEcommerceOrder',
-                        '100001, 100002', // Concat increment IDs
-                        358.01,           // 123.45 + 234.56
-                        302.0,            // 101 + 201
-                        25.0,             // 10 + 15
-                        35.0,             // 15 + 20
-                        55.0              // abs(-5 + -50)
-                    ]
-                ]
-            ]
-        ];
-    }
-
     /**
      * Test for \Henhed\Piwik\Observer\CheckoutSuccessObserver::execute where
      * tracking is enabled.
      *
-     * @param array $ordersData
-     * @param array $expectedResult
      * @return void
-     * @dataProvider executeDataProvider
      */
-    public function testExecuteWithTrackingEnabled($ordersData, $expectedResult)
+    public function testExecuteWithTrackingEnabled()
     {
-        $orderIds = [];
-        $orders = [];
-        foreach ($ordersData as $orderData) {
-            list($entityId, $incrementId, $grandTotal, $subTotal, $tax,
-                 $shipping, $discount, $itemsData) = $orderData;
-            $orderIds[] = $entityId;
-            $orders[] = $this->_getOrderMock(
-                $incrementId,
-                $grandTotal,
-                $subTotal,
-                $tax,
-                $shipping,
-                $discount,
-                $itemsData
-            );
-        }
+        $orders = [
+            1 => new \stdClass(),
+            2 => new \stdClass()
+        ];
 
         $this->_dataHelperMock
             ->expects($this->once())
@@ -309,18 +138,44 @@ public function testExecuteWithTrackingEnabled($ordersData, $expectedResult)
         $this->_eventMock
             ->expects($this->atLeastOnce())
             ->method('getOrderIds')
-            ->willReturn($orderIds);
+            ->willReturn(array_keys($orders));
 
-        $this->_orderCollectionMock
-            ->expects($this->any())
-            ->method('getIterator')
-            ->willReturn(new \ArrayIterator($orders));
+        $this->_searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('addFilter')
+            ->with('entity_id', array_keys($orders), 'in')
+            ->willReturn($this->_searchCriteriaBuilderMock);
+
+        $searchCriteriaMock = $this->createMock(
+            \Magento\Framework\Api\SearchCriteriaInterface::class
+        );
+
+        $this->_searchCriteriaBuilderMock
+            ->expects($this->once())
+            ->method('create')
+            ->willReturn($searchCriteriaMock);
+
+        $searchResultMock = $this->createConfiguredMock(
+            \Magento\Sales\Api\Data\OrderSearchResultInterface::class,
+            ['getItems' => $orders]
+        );
+
+        $this->_orderRepositoryMock
+            ->expects($this->once())
+            ->method('getList')
+            ->with($searchCriteriaMock)
+            ->willReturn($searchResultMock);
+
+        $this->_trackerHelperMock
+            ->expects($this->once())
+            ->method('addOrders')
+            ->with($orders, $this->_trackerMock)
+            ->willReturn($this->_trackerHelperMock);
 
         $this->assertSame(
             $this->_testSubject,
             $this->_testSubject->execute($this->_eventObserverMock)
         );
-        $this->assertEquals($expectedResult, $this->_tracker->toArray());
     }
 
     /**
@@ -341,15 +196,25 @@ public function testExecuteWithTrackingDisabled()
             ->method('getOrderIds')
             ->willReturn([1]);
 
-        $this->_orderCollectionMock
+        $this->_searchCriteriaBuilderMock
             ->expects($this->never())
-            ->method('getIterator');
+            ->method('addFilter');
+
+        $this->_searchCriteriaBuilderMock
+            ->expects($this->never())
+            ->method('create');
+
+        $this->_orderRepositoryMock
+            ->expects($this->never())
+            ->method('getList');
+
+        $this->_trackerHelperMock
+            ->expects($this->never())
+            ->method('addOrders');
 
         $this->assertSame(
             $this->_testSubject,
             $this->_testSubject->execute($this->_eventObserverMock)
         );
-
-        $this->assertEquals([], $this->_tracker->toArray());
     }
 }

From 1793b1eba66a8a217402710c60dd8ad62b79dcbc Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 21 Jan 2018 01:13:32 +0100
Subject: [PATCH 06/10] Fix eslint warnings

---
 view/frontend/web/js/tracker.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/view/frontend/web/js/tracker.js b/view/frontend/web/js/tracker.js
index b6efc5f..614946c 100644
--- a/view/frontend/web/js/tracker.js
+++ b/view/frontend/web/js/tracker.js
@@ -138,6 +138,7 @@ define([
      */
     function getPiwikPromise() {
         var deferred = $.Deferred();
+
         if (piwik === null || !defaultSiteId || !defaultTrackerUrl) {
             piwikPromises.push(deferred);
         } else if (piwik === false) {
@@ -156,9 +157,10 @@ define([
     function getAsyncTrackerPromise()
     {
         var deferred = $.Deferred();
+
         getPiwikPromise()
-            .done(function (piwik) {
-                deferred.resolve(piwik.getAsyncTracker());
+            .done(function (piwikObject) {
+                deferred.resolve(piwikObject.getAsyncTracker());
             })
             .fail(function () {
                 deferred.reject();
@@ -175,9 +177,10 @@ define([
      */
     function getTrackerPromise(trackerUrl, siteId) {
         var deferred = $.Deferred();
+
         getPiwikPromise()
-            .done(function (piwik) {
-                deferred.resolve(piwik.getTracker(
+            .done(function (piwikObject) {
+                deferred.resolve(piwikObject.getTracker(
                     trackerUrl || defaultTrackerUrl,
                     siteId || defaultSiteId
                 ));
@@ -197,6 +200,8 @@ define([
      */
     function pushAction(action, tracker) {
 
+        var event, actionName;
+
         if (!_.isArray(action) || _.isEmpty(action)) {
             return;
         } else if (_.isArray(_.first(action))) {
@@ -208,7 +213,7 @@ define([
 
         if (/^track/.test(_.first(action))) {
             // Trigger event before tracking
-            var event = $.Event('piwik:beforeTrack');
+            event = $.Event('piwik:beforeTrack');
             $(exports).triggerHandler(event, [action, tracker]);
             if (event.isDefaultPrevented()) {
                 // Skip tracking if event listener prevented default
@@ -220,7 +225,7 @@ define([
         }
 
         if (_.isObject(tracker)) {
-            var actionName = action.shift();
+            actionName = action.shift();
             if (_.isFunction(tracker[actionName])) {
                 tracker[actionName].apply(tracker, action);
             }
@@ -241,9 +246,8 @@ define([
         if (_.has(cart, 'data_id')) {
             if (storage.get('cart-data-id') === cart.data_id) {
                 return;
-            } else {
-                storage.set('cart-data-id', cart.data_id);
             }
+            storage.set('cart-data-id', cart.data_id);
         }
 
         if (_.has(cart, 'piwikActions')) {
@@ -271,7 +275,7 @@ define([
         if (_.has(customer, 'piwikUserId')) {
             pushAction(['setUserId', customer.piwikUserId], tracker);
         }
-    };
+    }
 
     /**
      * Initialzie this component with given options

From 4734e5f210d27ab4081b6db24f35683a866390c6 Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 21 Jan 2018 01:21:40 +0100
Subject: [PATCH 07/10] Fix MEQP2 suggestions

---
 CustomerData/Checkout/CartPlugin.php          |  4 +--
 Observer/CartViewObserver.php                 |  4 +--
 .../CustomerData/Checkout/CartPluginTest.php  |  9 ++++---
 Test/Unit/Observer/CartViewObserverTest.php   |  8 +++++-
 UserId/Provider/Pool.php                      | 25 ++++++++-----------
 5 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/CustomerData/Checkout/CartPlugin.php b/CustomerData/Checkout/CartPlugin.php
index afd6360..67b9e44 100644
--- a/CustomerData/Checkout/CartPlugin.php
+++ b/CustomerData/Checkout/CartPlugin.php
@@ -58,13 +58,13 @@ class CartPlugin
     /**
      * Constructor
      *
-     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Checkout\Model\Session\Proxy $checkoutSession
      * @param \Henhed\Piwik\Helper\Data $dataHelper
      * @param \Henhed\Piwik\Helper\Tracker $trackerHelper
      * @param \Henhed\Piwik\Model\TrackerFactory $trackerFactory
      */
     public function __construct(
-        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Checkout\Model\Session\Proxy $checkoutSession,
         \Henhed\Piwik\Helper\Data $dataHelper,
         \Henhed\Piwik\Helper\Tracker $trackerHelper,
         \Henhed\Piwik\Model\TrackerFactory $trackerFactory
diff --git a/Observer/CartViewObserver.php b/Observer/CartViewObserver.php
index 167753b..0308833 100644
--- a/Observer/CartViewObserver.php
+++ b/Observer/CartViewObserver.php
@@ -63,13 +63,13 @@ class CartViewObserver implements ObserverInterface
      * @param \Henhed\Piwik\Model\Tracker $piwikTracker
      * @param \Henhed\Piwik\Helper\Tracker $trackerHelper
      * @param \Henhed\Piwik\Helper\Data $dataHelper
-     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Checkout\Model\Session\Proxy $checkoutSession
      */
     public function __construct(
         \Henhed\Piwik\Model\Tracker $piwikTracker,
         \Henhed\Piwik\Helper\Tracker $trackerHelper,
         \Henhed\Piwik\Helper\Data $dataHelper,
-        \Magento\Checkout\Model\Session $checkoutSession
+        \Magento\Checkout\Model\Session\Proxy $checkoutSession
     ) {
         $this->_piwikTracker = $piwikTracker;
         $this->_trackerHelper = $trackerHelper;
diff --git a/Test/Unit/CustomerData/Checkout/CartPluginTest.php b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
index 0758e78..33db40a 100644
--- a/Test/Unit/CustomerData/Checkout/CartPluginTest.php
+++ b/Test/Unit/CustomerData/Checkout/CartPluginTest.php
@@ -80,11 +80,14 @@ public function setUp()
     {
         $className = \Henhed\Piwik\CustomerData\Checkout\CartPlugin::class;
         $objectManager = new ObjectManager($this);
+        $sessionProxyClass = \Magento\Checkout\Model\Session\Proxy::class;
         $arguments = $objectManager->getConstructArguments($className, [
+            'checkoutSession' => $this->getMockBuilder($sessionProxyClass)
+                ->disableOriginalConstructor()
+                ->setMethods(['getQuote'])
+                ->getMock(),
             'trackerFactory' => $this->createPartialMock(
-                // @codingStandardsIgnoreStart
-                'Henhed\Piwik\Model\TrackerFactory',
-                // @codingStandardsIgnoreEnd
+                \Henhed\Piwik\Model\TrackerFactory::class,
                 ['create']
             )
         ]);
diff --git a/Test/Unit/Observer/CartViewObserverTest.php b/Test/Unit/Observer/CartViewObserverTest.php
index b7848ab..0fd635b 100644
--- a/Test/Unit/Observer/CartViewObserverTest.php
+++ b/Test/Unit/Observer/CartViewObserverTest.php
@@ -87,7 +87,13 @@ public function setUp()
     {
         $className = \Henhed\Piwik\Observer\CartViewObserver::class;
         $objectManager = new ObjectManager($this);
-        $arguments = $objectManager->getConstructArguments($className);
+        $sessionProxyClass = \Magento\Checkout\Model\Session\Proxy::class;
+        $arguments = $objectManager->getConstructArguments($className, [
+            'checkoutSession' => $this->getMockBuilder($sessionProxyClass)
+                ->disableOriginalConstructor()
+                ->setMethods(['getQuote'])
+                ->getMock()
+        ]);
         $this->_observer = $objectManager->getObject($className, $arguments);
         $this->_trackerMock = $arguments['piwikTracker'];
         $this->_trackerHelperMock = $arguments['trackerHelper'];
diff --git a/UserId/Provider/Pool.php b/UserId/Provider/Pool.php
index 7384fe5..27c9ce9 100644
--- a/UserId/Provider/Pool.php
+++ b/UserId/Provider/Pool.php
@@ -38,20 +38,10 @@ class Pool
      * Constructor
      *
      * @param ProviderInterface[] $providers
-     * @throws \LogicException
      */
     public function __construct(array $providers = [])
     {
-        foreach ($providers as $code => $provider) {
-            if ($provider instanceof ProviderInterface) {
-                $this->_providers[$code] = $provider;
-            } else {
-                throw new \LogicException(sprintf(
-                    '%s must implement %s',
-                    get_class($provider), ProviderInterface::class
-                ));
-            }
-        }
+        $this->_providers = $providers;
     }
 
     /**
@@ -62,9 +52,12 @@ public function __construct(array $providers = [])
      */
     public function getProviderByCode($code)
     {
-        return isset($this->_providers[$code])
-            ? $this->_providers[$code]
-            : null;
+        if (isset($this->_providers[$code])
+            && ($this->_providers[$code] instanceof ProviderInterface)
+        ) {
+            return $this->_providers[$code];
+        }
+        return null;
     }
 
     /**
@@ -74,6 +67,8 @@ public function getProviderByCode($code)
      */
     public function getAllProviders()
     {
-        return $this->_providers;
+        return array_filter($this->_providers, function ($provider) {
+            return $provider instanceof ProviderInterface;
+        });
     }
 }

From e91125cfdbf33299b6d9697860b660964219e62a Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 21 Jan 2018 01:25:33 +0100
Subject: [PATCH 08/10] Code style / annotation fixes

---
 Block/Piwik.php                          |  4 ++--
 CustomerData/Checkout/CartPlugin.php     |  1 +
 CustomerData/Customer/CustomerPlugin.php |  1 +
 Helper/Data.php                          |  2 +-
 Helper/Tracker.php                       |  2 +-
 Model/Tracker.php                        |  2 +-
 Observer/BeforeTrackPageViewObserver.php |  2 +-
 Observer/CartViewObserver.php            |  1 +
 Observer/CategoryViewObserver.php        |  2 +-
 Observer/CheckoutSuccessObserver.php     |  2 +-
 Observer/ProductViewObserver.php         |  2 +-
 Observer/SearchResultObserver.php        | 13 +++++++------
 README.md                                |  2 +-
 Test/Unit/Helper/DataTest.php            |  2 +-
 Test/Unit/Helper/TrackerTest.php         |  4 +---
 Test/Unit/Model/TrackerTest.php          |  4 +---
 view/frontend/templates/piwik.phtml      | 12 ++++++------
 17 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Block/Piwik.php b/Block/Piwik.php
index 96ee73f..a67b5fc 100644
--- a/Block/Piwik.php
+++ b/Block/Piwik.php
@@ -156,11 +156,11 @@ public function getSiteId()
      */
     public function getTrackingPixelUrl()
     {
-        $params = array(
+        $params = [
             'idsite' => $this->getSiteId(),
             'rec'    => 1,
             'url'    => $this->_urlBuilder->getCurrentUrl()
-        );
+        ];
         return $this->getTrackerUrl() . '?' . http_build_query($params);
     }
 
diff --git a/CustomerData/Checkout/CartPlugin.php b/CustomerData/Checkout/CartPlugin.php
index 67b9e44..e1ebb8b 100644
--- a/CustomerData/Checkout/CartPlugin.php
+++ b/CustomerData/Checkout/CartPlugin.php
@@ -81,6 +81,7 @@ public function __construct(
      * @param \Magento\Checkout\CustomerData\Cart $subject
      * @param array $result
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetSectionData(
         \Magento\Checkout\CustomerData\Cart $subject,
diff --git a/CustomerData/Customer/CustomerPlugin.php b/CustomerData/Customer/CustomerPlugin.php
index 6ba69e9..c7649cb 100644
--- a/CustomerData/Customer/CustomerPlugin.php
+++ b/CustomerData/Customer/CustomerPlugin.php
@@ -96,6 +96,7 @@ protected function _getUserId()
      * @param \Magento\Customer\CustomerData\Customer $subject
      * @param array $result
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterGetSectionData(
         \Magento\Customer\CustomerData\Customer $subject,
diff --git a/Helper/Data.php b/Helper/Data.php
index fa67250..29f87cb 100644
--- a/Helper/Data.php
+++ b/Helper/Data.php
@@ -98,7 +98,7 @@ public function getCdnHostname($store = null)
      */
     protected function _getBaseUrl($host, $secure = null)
     {
-        if (is_null($secure)) {
+        if ($secure === null) {
             $secure = $this->_getRequest()->isSecure();
         }
         if (false !== ($scheme = strpos($host, '://'))) {
diff --git a/Helper/Tracker.php b/Helper/Tracker.php
index 9d23886..9b3295f 100644
--- a/Helper/Tracker.php
+++ b/Helper/Tracker.php
@@ -28,7 +28,7 @@
 /**
  * Piwik tracker helper
  *
- * @link http://piwik.org/docs/ecommerce-analytics/
+ * @see http://piwik.org/docs/ecommerce-analytics/
  */
 class Tracker extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/Model/Tracker.php b/Model/Tracker.php
index fae638b..c3a43b4 100644
--- a/Model/Tracker.php
+++ b/Model/Tracker.php
@@ -249,7 +249,7 @@
  * @method Tracker setSessionCookieTimeout(int $seconds)
  * The default is 30 minutes
  *
- * @link http://developer.piwik.org/api-reference/tracking-javascript
+ * @see http://developer.piwik.org/api-reference/tracking-javascript
  */
 class Tracker
 {
diff --git a/Observer/BeforeTrackPageViewObserver.php b/Observer/BeforeTrackPageViewObserver.php
index 9d4d34f..df77154 100644
--- a/Observer/BeforeTrackPageViewObserver.php
+++ b/Observer/BeforeTrackPageViewObserver.php
@@ -55,7 +55,7 @@ public function __construct(\Henhed\Piwik\Helper\Data $dataHelper)
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
         $tracker = $observer->getEvent()->getTracker();
-        /* @var $tracker \Henhed\Piwik\Model\Tracker */
+        /** @var \Henhed\Piwik\Model\Tracker $tracker */
 
         $this->_pushLinkTracking($tracker);
 
diff --git a/Observer/CartViewObserver.php b/Observer/CartViewObserver.php
index 0308833..9dae7ce 100644
--- a/Observer/CartViewObserver.php
+++ b/Observer/CartViewObserver.php
@@ -82,6 +82,7 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return \Henhed\Piwik\Observer\CartViewObserver
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
diff --git a/Observer/CategoryViewObserver.php b/Observer/CategoryViewObserver.php
index 0d0688e..6c388cf 100644
--- a/Observer/CategoryViewObserver.php
+++ b/Observer/CategoryViewObserver.php
@@ -70,7 +70,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $category = $observer->getEvent()->getCategory();
-        /* @var $category \Magento\Catalog\Model\Category */
+        /** @var \Magento\Catalog\Model\Category $category */
 
         $this->_piwikTracker->setEcommerceView(
             false,
diff --git a/Observer/CheckoutSuccessObserver.php b/Observer/CheckoutSuccessObserver.php
index 22581c4..18b55aa 100644
--- a/Observer/CheckoutSuccessObserver.php
+++ b/Observer/CheckoutSuccessObserver.php
@@ -25,7 +25,7 @@
 /**
  * Observer for `controller_action_predispatch_checkout_cart_index'
  *
- * @link http://piwik.org/docs/ecommerce-analytics/#tracking-ecommerce-orders-items-purchased-required
+ * @see http://piwik.org/docs/ecommerce-analytics/#tracking-ecommerce-orders-items-purchased-required
  */
 class CheckoutSuccessObserver implements ObserverInterface
 {
diff --git a/Observer/ProductViewObserver.php b/Observer/ProductViewObserver.php
index 11512b8..8fc50fd 100644
--- a/Observer/ProductViewObserver.php
+++ b/Observer/ProductViewObserver.php
@@ -70,7 +70,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         }
 
         $product = $observer->getEvent()->getProduct();
-        /* @var $product \Magento\Catalog\Model\Product */
+        /** @var \Magento\Catalog\Model\Product $product */
 
         $category = $product->getCategory();
         $this->_piwikTracker->setEcommerceView(
diff --git a/Observer/SearchResultObserver.php b/Observer/SearchResultObserver.php
index 48939b7..add4457 100644
--- a/Observer/SearchResultObserver.php
+++ b/Observer/SearchResultObserver.php
@@ -25,7 +25,7 @@
 /**
  * Observer for `controller_action_layout_render_before_catalogsearch_result_index'
  *
- * @link http://developer.piwik.org/guides/tracking-javascript-guide#internal-search-tracking
+ * @see http://developer.piwik.org/guides/tracking-javascript-guide#internal-search-tracking
  */
 class SearchResultObserver implements ObserverInterface
 {
@@ -83,6 +83,7 @@ public function __construct(
      *
      * @param \Magento\Framework\Event\Observer $observer
      * @return \Henhed\Piwik\Observer\SearchResultObserver
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
@@ -92,23 +93,23 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         $query = $this->_queryFactory->get();
         $piwikBlock = $this->_view->getLayout()->getBlock('piwik.tracker');
-        /* @var $query \Magento\Search\Model\Query */
-        /* @var $piwikBlock \Henhed\Piwik\Block\Piwik */
+        /** @var \Magento\Search\Model\Query $query */
+        /** @var \Henhed\Piwik\Block\Piwik $piwikBlock */
 
         $keyword = $query->getQueryText();
         $resultsCount = $query->getNumResults();
 
-        if (is_null($resultsCount)) {
+        if ($resultsCount === null) {
             // If this is a new search query the result count hasn't been saved
             // yet so we have to fetch it from the search result block instead.
             $resultBock = $this->_view->getLayout()->getBlock('search.result');
-            /* @var $resultBock \Magento\CatalogSearch\Block\Result */
+            /** @var \Magento\CatalogSearch\Block\Result $resultBock */
             if ($resultBock) {
                 $resultsCount = $resultBock->getResultCount();
             }
         }
 
-        if (is_null($resultsCount)) {
+        if ($resultsCount === null) {
             $this->_piwikTracker->trackSiteSearch($keyword);
         } else {
             $this->_piwikTracker->trackSiteSearch(
diff --git a/README.md b/README.md
index 29a6777..bce484c 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ A tracker instance will be passed along with the event object to your observer's
 public function execute(\Magento\Framework\Event\Observer $observer)
 {
     $tracker = $observer->getEvent()->getTracker();
-    /* @var $tracker \Henhed\Piwik\Model\Tracker */
+    /** @var \Henhed\Piwik\Model\Tracker $tracker */
     $tracker->setDocumentTitle('My Custom Title');
 }
 ```
diff --git a/Test/Unit/Helper/DataTest.php b/Test/Unit/Helper/DataTest.php
index cff1038..a8e53e8 100644
--- a/Test/Unit/Helper/DataTest.php
+++ b/Test/Unit/Helper/DataTest.php
@@ -63,7 +63,7 @@ public function setUp()
         $arguments = $objectManager->getConstructArguments($className);
         $this->_helper = $objectManager->getObject($className, $arguments);
         $context = $arguments['context'];
-        /* @var $context \Magento\Framework\App\Helper\Context */
+        /** @var \Magento\Framework\App\Helper\Context $context */
         $this->_scopeConfigMock = $context->getScopeConfig();
         $this->_requestMock = $context->getRequest();
     }
diff --git a/Test/Unit/Helper/TrackerTest.php b/Test/Unit/Helper/TrackerTest.php
index 6342137..b4be4b3 100644
--- a/Test/Unit/Helper/TrackerTest.php
+++ b/Test/Unit/Helper/TrackerTest.php
@@ -61,9 +61,7 @@ public function setUp()
         $class = \Henhed\Piwik\Model\Tracker::class;
         $arguments = $objectManager->getConstructArguments($class, [
             'actionFactory' => $this->createPartialMock(
-                // @codingStandardsIgnoreStart
-                'Henhed\Piwik\Model\Tracker\ActionFactory',
-                // @codingStandardsIgnoreEnd
+                \Henhed\Piwik\Model\Tracker\ActionFactory::class,
                 ['create']
             )
         ]);
diff --git a/Test/Unit/Model/TrackerTest.php b/Test/Unit/Model/TrackerTest.php
index a500854..e6dba1e 100644
--- a/Test/Unit/Model/TrackerTest.php
+++ b/Test/Unit/Model/TrackerTest.php
@@ -55,9 +55,7 @@ public function setUp()
         $objectManager = new ObjectManager($this);
         $arguments = $objectManager->getConstructArguments($className, [
             'actionFactory' => $this->createPartialMock(
-                // @codingStandardsIgnoreStart
-                'Henhed\Piwik\Model\Tracker\ActionFactory',
-                // @codingStandardsIgnoreEnd
+                \Henhed\Piwik\Model\Tracker\ActionFactory::class,
                 ['create']
             )
         ]);
diff --git a/view/frontend/templates/piwik.phtml b/view/frontend/templates/piwik.phtml
index cc72ced..c21f9a0 100644
--- a/view/frontend/templates/piwik.phtml
+++ b/view/frontend/templates/piwik.phtml
@@ -19,9 +19,9 @@
  */
 
 ?>
-<?php /* @var $block \Henhed\Piwik\Block\Piwik */ ?>
+<?php /** @var \Henhed\Piwik\Block\Piwik $block */ ?>
 <script type="text/x-magento-init">
-<?php echo $block->jsonEncode([
+<?= $block->jsonEncode([
     '*' => [
         'Henhed_Piwik/js/tracker' => $block->getJsOptions()
     ]
@@ -36,14 +36,14 @@
 <script type="text/javascript">
 (function (w, d) {
     w._paq = w._paq || [];
-    w._paq.push(['setTrackerUrl', '<?php echo $block->escapeJsQuote($block->getTrackerUrl()); ?>']);
-    w._paq.push(['setSiteId', <?php echo (int) $block->getSiteId(); ?>]);
+    w._paq.push(['setTrackerUrl', '<?= $block->escapeJsQuote($block->getTrackerUrl()); ?>']);
+    w._paq.push(['setSiteId', <?= (int) $block->getSiteId(); ?>]);
     var g = d.createElement('script'),
         s = d.getElementsByTagName('script')[0];
     g.type = 'text/javascript';
     g.async = true;
     g.defer = true;
-    g.src = '<?php echo $block->escapeJsQuote($block->getScriptUrl()); ?>';
+    g.src = '<?= $block->escapeJsQuote($block->getScriptUrl()); ?>';
     s.parentNode.insertBefore(g, s);
 })(window, document);
 </script>
@@ -85,7 +85,7 @@
 </script>
 <noscript>
     <p>
-        <img src="<?php echo $block->getTrackingPixelUrl(); ?>"
+        <img src="<?= $block->getTrackingPixelUrl(); ?>"
              style="border: 0;"
              alt="" />
     </p>

From 28bcee41255eccd6efd1169ebe82d8134d26b78f Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 28 Jan 2018 13:58:51 +0100
Subject: [PATCH 09/10] Fix setUserId timing issue (caused by 844e81b)

---
 view/frontend/web/js/tracker.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/view/frontend/web/js/tracker.js b/view/frontend/web/js/tracker.js
index 614946c..5110991 100644
--- a/view/frontend/web/js/tracker.js
+++ b/view/frontend/web/js/tracker.js
@@ -260,20 +260,30 @@ define([
         }
     }
 
+    /**
+     * Callback for customer data subscriber
+     *
+     * @param {Object} customer
+     * @see \Henhed\Piwik\CustomerData\Customer\CustomerPlugin
+     */
+    function customerUpdated(customer) {
+        if (_.has(customer, 'piwikUserId')) {
+            storage.set('user-id', customer.piwikUserId);
+        } else {
+            storage.remove('user-id');
+        }
+    }
+
     /**
      * Event listener for `piwik:beforeTrack'. Adds visitor data to tracker.
      *
      * @param {jQuery.Event} event
      * @param {Array} action
      * @param {Tracker|undefined} tracker
-     * @see \Henhed\Piwik\CustomerData\Customer\CustomerPlugin
      */
     function addVisitorDataBeforeTrack(event, action, tracker) {
-
-        var customer = customerObservable();
-
-        if (_.has(customer, 'piwikUserId')) {
-            pushAction(['setUserId', customer.piwikUserId], tracker);
+        if (storage.isSet('user-id')) {
+            pushAction(['setUserId', storage.get('user-id')], tracker);
         }
     }
 
@@ -305,6 +315,8 @@ define([
     exports.piwikAsyncInit = onPiwikLoaded;
     // Subscribe to cart updates
     cartObservable.subscribe(cartUpdated);
+    // Subscribe to customer updates
+    customerObservable.subscribe(customerUpdated);
     // Listen for track actions to inject visitor data
     $(exports).on('piwik:beforeTrack', addVisitorDataBeforeTrack);
 

From cd288ac90bfc62b0d3cadec76d6559106c8a9cba Mon Sep 17 00:00:00 2001
From: Henrik Hedelund <henrik@improove.se>
Date: Sun, 28 Jan 2018 14:59:04 +0100
Subject: [PATCH 10/10] Update README.md

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index bce484c..1366db5 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,11 @@ Finally, enable the module with the Magento CLI tool.
 php bin/magento module:enable Henhed_Piwik --clear-static-content
 ```
 
+NOTE: If you're using a Magento version prior to 2.2 you'll need to stick to the
+1.x releases of Henhed_Piwik. For manual installation, check out the
+[Release archive][releases]. For installation using Composer, you can use the
+*tilde* or *caret* version constraint operators (e.g. `~1.3` or `^1.3.1`).
+
 
 Configuration
 -------------
@@ -131,3 +136,5 @@ Affero General Public License][agpl] for more details.
     "Free Web Analytics Software"
 [piwik-tracking-api]: http://developer.piwik.org/api-reference/tracking-javascript
     "JavaScript Tracking Client"
+[releases]: https://github.com/henkelund/magento2-henhed-piwik/releases
+    "Henhed_Piwik Releases"