Code refactoring

elgentos · May 10, 2020 · 167dfdb · 167dfdb
1 parent 685d3c4
commit 167dfdb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 34 deletions.
diff --git a/CustomerData/JsDataLayer.php b/CustomerData/JsDataLayer.php
@@ -11,10 +11,6 @@
 use MagePal\GoogleTagManager\Model\Cart as GtmCartModel;
 use MagePal\GoogleTagManager\Model\Customer as GtmCustomerModel;
 
-/**
- * Class JsDataLayer
- * @package MagePal\GoogleTagManager\CustomerData
- */
 class JsDataLayer implements SectionSourceInterface
 {
     /**

diff --git a/DataLayer/CategoryData/CategoryAbstract.php b/DataLayer/CategoryData/CategoryAbstract.php
@@ -9,10 +9,6 @@
 
 use Magento\Catalog\Model\Category;
 
-/**
- * Class CategoryPageProvider
- * @package MagePal\GoogleTagManager\Model\DataLayer
- */
 abstract class CategoryAbstract
 {
     /**

diff --git a/DataLayer/CategoryData/CategoryProvider.php b/DataLayer/CategoryData/CategoryProvider.php
@@ -7,15 +7,10 @@
 
 namespace MagePal\GoogleTagManager\DataLayer\CategoryData;
 
-/**
- * Class CategoryProvider
- * @package MagePal\GoogleTagManager\DataLayer
- */
 class CategoryProvider extends CategoryAbstract
 {
     /**
      * @param array $categoryProviders
-     * @codeCoverageIgnore
      */
     public function __construct(
         array $categoryProviders = []
@@ -29,12 +24,14 @@ public function __construct(
     public function getData()
     {
         $data =  $this->getcategoryData();
+        $arraysToMerge = [];
+
         /** @var CategoryProvider $categoryProvider */
         foreach ($this->getCategoryProviders() as $categoryProvider) {
             $categoryProvider->setCategory($this->getCategory())->setCategoryData($data);
-            $data = array_merge($data, $categoryProvider->getData());
+            $arraysToMerge[] = $categoryProvider->getData();
         }
 
-        return $data;
+        return empty($arraysToMerge) ? $data : array_merge($data, ...$arraysToMerge);
     }
 }
diff --git a/view/frontend/templates/iframe.phtml b/view/frontend/templates/iframe.phtml
@@ -4,10 +4,12 @@
  * See COPYING.txt for license details.
  * http://www.magepal.com | [email protected]
  */
+
+/** @var $block MagePal\GoogleTagManager\Block\GtmCode **/
+$accountId = $block->getAccountId();
 ?>
-<?php /** @var $block MagePal\GoogleTagManager\Block\GtmCode **/ ?>
 
 <!-- Google Tag Manager by MagePal -->
-<noscript><iframe src="<?= '/' . '/' ?>www.googletagmanager.com/ns.html?id=<?php echo $block->getAccountId() ?>"
+<noscript><iframe src="<?= '/' . '/' ?>www.googletagmanager.com/ns.html?id=<?= /* @noEscape */ $accountId ?>"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <!-- End Google Tag Manager by MagePal -->
diff --git a/view/frontend/templates/js.phtml b/view/frontend/templates/js.phtml
@@ -4,36 +4,40 @@
  * See COPYING.txt for license details.
  * http://www.magepal.com | [email protected]
  */
+
+/** @var $block MagePal\GoogleTagManager\Block\DataLayer **/
+$dataLayerName = $block->getDataLayerName();
+$accountId = $block->getAccountId();
 ?>
-<?php /** @var $block MagePal\GoogleTagManager\Block\DataLayer **/ ?>
+
 <!-- Google Tag Manager by MagePal -->
 <script type="text/javascript">
-    window.<?= $block->getDataLayerName() ?> = window.<?= $block->getDataLayerName() ?> || [];
+    window.<?= /* @noEscape */ $dataLayerName ?> = window.<?= /* @noEscape */ $dataLayerName ?> || [];
 
-    <?php if (!$block->isGdprEnabled() && $block->addJsInHead()) : ?>
-    <?= $block->getDataLayerJs() ?>
+<?php if (!$block->isGdprEnabled() && $block->addJsInHead()): ?>
+    <?= /* @noEscape */ $block->getDataLayerJs() ?>
     (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
             new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-        j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+        j=d.createElement(s),dl=l!='<?= /* @noEscape */ $dataLayerName ?>'?'&l='+l:'';j.async=true;j.src=
         'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','<?= $block->getDataLayerName() ?>','<?= $block->getAccountId() ?>');
-    <?php endif; ?>
+    })(window,document,'script','<?= /* @noEscape */ $dataLayerName ?>','<?= /* @noEscape */ $accountId ?>');
+<?php endif; ?>
 </script>
 
-<?php if ($block->isGdprEnabled() || !$block->addJsInHead()) : ?>
+<?php if ($block->isGdprEnabled() || !$block->addJsInHead()): ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "magepalGtmDatalayer": {
-                "isCookieRestrictionModeEnabled": <?= $block->isCookieRestrictionModeEnabled() ?>,
-                "currentWebsite": <?= $block->getCurrentWebsiteId() ?>,
-                "cookieName": "<?= $block->getCookieRestrictionName() ?>",
-                "dataLayer": "<?= $block->getDataLayerName() ?>",
-                "accountId": "<?= $block->getAccountId() ?>",
-                "data": <?= $block->getDataLayerJson() ?>,
-                "isGdprEnabled": <?= $block->isGdprEnabled() ?>,
-                "gdprOption": <?= $block->getGdprOption() ?>,
-                "addJsInHeader": <?= $block->addJsInHead() ?>
+                "isCookieRestrictionModeEnabled": <?= /* @noEscape */ $block->isCookieRestrictionModeEnabled() ?>,
+                "currentWebsite": <?= /* @noEscape */ $block->getCurrentWebsiteId() ?>,
+                "cookieName": "<?= /* @noEscape */ $block->getCookieRestrictionName() ?>",
+                "dataLayer": "<?= /* @noEscape */ $block->getDataLayerName() ?>",
+                "accountId": "<?= /* @noEscape */ $block->getAccountId() ?>",
+                "data": <?= /* @noEscape */ $block->getDataLayerJson() ?>,
+                "isGdprEnabled": <?= /* @noEscape */ $block->isGdprEnabled() ?>,
+                "gdprOption": <?= /* @noEscape */ $block->getGdprOption() ?>,
+                "addJsInHeader": <?= /* @noEscape */ $block->addJsInHead() ?>
             }
         }
     }