Improvements based on static tests

Author: ishakhsuvarov

app/code/Magento/GoogleGtag/Block/Ga.php

@@ -83,20 +83,6 @@ public function getPageName(): ?string
         return $this->_getData('page_name');
     }
 
-    /**
-     * Render GA tracking scripts
-     *
-     * @return string
-     */
-    protected function _toHtml()
-    {
-        if (!$this->googleGtagConfig->isGoogleAnalyticsAvailable()) {
-            return '';
-        }
-
-        return parent::_toHtml();
-    }
-
     /**
      * Return cookie restriction mode value.
      *
@@ -206,7 +192,8 @@ public function getAnalyticsData()
             'currentWebsite' => $this->getCurrentWebsiteId(),
             'cookieName' => Cookie::IS_USER_ALLOWED_SAVE_COOKIE,
             'pageTrackingData' => $this->getPageTrackingData($this->googleGtagConfig->getMeasurementId()),
-            'ordersTrackingData' => $this->getOrdersTrackingData()
+            'ordersTrackingData' => $this->getOrdersTrackingData(),
+            'googleAnalyticsAvailable' => $this->googleGtagConfig->isGoogleAnalyticsAvailable()
         ];
         return $this->serializer->serialize($analyticData);
     }

app/code/Magento/GoogleGtag/view/frontend/templates/ga.phtml

@@ -3,15 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+/** @var $block \Magento\GoogleGtag\Block\Ga */
+/** @var \Magento\Framework\Escaper $escaper */
+
+$analyticsData = $block->getAnalyticsData();
 ?>
-<?php /** @var $block \Magento\GoogleGtag\Block\Ga */ ?>
-<?php /** @var \Magento\Framework\Escaper $escaper */ ?>
-<!-- BEGIN GOOGLE ANALYTICS 4 CODE -->
-<script type="text/x-magento-init">
-{
-    "*": {
-        "Magento_GoogleGtag/js/google-analytics": <?= /* @noEscape */ $block->getAnalyticsData() ?>
+
+<?php if ($analyticsData['googleAnalyticsAvailable']): ?>
+    <!-- BEGIN GOOGLE ANALYTICS 4 CODE -->
+    <script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_GoogleGtag/js/google-analytics": <?= /* @noEscape */ $block->getAnalyticsData() ?>
+        }
     }
-}
-</script>
-<!-- END GOOGLE ANALYTICS 4 CODE -->
+    </script>
+    <!-- END GOOGLE ANALYTICS 4 CODE -->
+<?php endif; ?>