From 1013bb676ac8d071e1bd3c7542bde173c5dc08f8 Mon Sep 17 00:00:00 2001 From: "Paolo Cunti @codencode" Date: Sun, 6 Sep 2026 11:26:03 +0200 Subject: [PATCH 1/2] Fix redundant array check in purchase event --- classes/GoogleAnalyticsTools.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/classes/GoogleAnalyticsTools.php b/classes/GoogleAnalyticsTools.php index bba2987..5d873df 100644 --- a/classes/GoogleAnalyticsTools.php +++ b/classes/GoogleAnalyticsTools.php @@ -35,10 +35,6 @@ class GoogleAnalyticsTools */ public function renderPurchaseEvent($orderProducts, $orderData, $callbackUrl) { - if (!is_array($orderProducts)) { - return; - } - $callbackData = [ 'orderid' => $orderData['transaction_id'], 'customer' => $orderData['customer'], From 2fbadcb1636f9acf067d7eebe30b9c9a5c8dbc00 Mon Sep 17 00:00:00 2001 From: "Paolo Cunti @codencode" Date: Sun, 6 Sep 2026 11:40:19 +0200 Subject: [PATCH 2/2] Add native types to GoogleAnalyticsTools methods --- classes/GoogleAnalyticsTools.php | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/classes/GoogleAnalyticsTools.php b/classes/GoogleAnalyticsTools.php index 5d873df..7a8b7c1 100644 --- a/classes/GoogleAnalyticsTools.php +++ b/classes/GoogleAnalyticsTools.php @@ -31,10 +31,13 @@ class GoogleAnalyticsTools * @param array $orderData * @param string $callbackUrl * - * @return string|void + * @return string */ - public function renderPurchaseEvent($orderProducts, $orderData, $callbackUrl) - { + public function renderPurchaseEvent( + array $orderProducts, + array $orderData, + string $callbackUrl + ): string { $callbackData = [ 'orderid' => $orderData['transaction_id'], 'customer' => $orderData['customer'], @@ -68,8 +71,10 @@ public function renderPurchaseEvent($orderProducts, $orderData, $callbackUrl) * * @return string json encoded data */ - public function jsonEncodeWithBlacklist($data, $ignoredKeys = []) - { + public function jsonEncodeWithBlacklist( + array $data, + array $ignoredKeys = [] + ): string { $return = []; foreach ($data as $k => $v) { @@ -93,8 +98,11 @@ public function jsonEncodeWithBlacklist($data, $ignoredKeys = []) * * @return string render gtag event for output */ - public function renderEvent($eventName, $eventData, $ignoredKeys = []) - { + public function renderEvent( + string $eventName, + array $eventData, + array $ignoredKeys = [] + ): string { // Automatically add send_to parameter to all events to avoid sending extra events // to other gtag configs (Ads for example). $eventData = array_merge(