AC-2574 updated variable scope as used in google tag manager module

Author: ishakhsuvarov

app/code/Magento/GoogleGtag/Model/Config/GtagConfig.php

@@ -16,9 +16,9 @@ class GtagConfig
     /**
      * Config paths for using throughout the code
      */
-    protected const XML_PATH_ACTIVE = 'google/gtag/analytics4/active';
+    private const XML_PATH_ACTIVE = 'google/gtag/analytics4/active';
 
-    protected const XML_PATH_MEASUREMENT_ID = 'google/gtag/analytics4/measurement_id';
+    private const XML_PATH_MEASUREMENT_ID = 'google/gtag/analytics4/measurement_id';
 
     /**
      * Google AdWords conversion src
@@ -37,7 +37,7 @@ class GtagConfig
     /**
      * @var ScopeConfigInterface
      */
-    protected $scopeConfig;
+    private $scopeConfig;
 
     /**
      * @param ScopeConfigInterface $scopeConfig

app/code/Magento/GoogleGtag/Test/Unit/Block/GaTest.php

@@ -53,9 +53,9 @@ class GaTest extends TestCase
     private $storeMock;
 
     /**
-     * @var MockObject
+     * @var GtagConfiguration|mixed|MockObject
      */
-    private $googleAnalyticsDataMock;
+    private $googleGtagConfig;
 
     /**
      * @var SearchCriteriaBuilder|mixed|MockObject

app/code/Magento/GoogleGtag/Test/Unit/Observer/SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest.php

@@ -30,21 +30,11 @@ class SetGoogleAnalyticsOnOrderSuccessPageViewObserverTest extends TestCase
      */
     private $observerMock;
 
-    /**
-     * @var GaDataHelper|MockObject
-     */
-    private $googleAnalyticsDataMock;
-
     /**
      * @var LayoutInterface|MockObject
      */
     private $layoutMock;
 
-    /**
-     * @var StoreManagerInterface|MockObject
-     */
-    private $storeManagerMock;
-
     /**
      * @var SetGoogleAnalyticsOnOrderSuccessPageViewObserver
      */

app/code/Magento/GoogleGtag/registration.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 use Magento\Framework\Component\ComponentRegistrar;
 

app/code/Magento/GoogleOptimizer/Helper/Data.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * Google Optimizer Data Helper
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -15,8 +13,6 @@
 use Magento\Store\Model\ScopeInterface;
 
 /**
- * Class Data
- *
  * @api
  * @since 100.0.2
  */
@@ -25,12 +21,12 @@ class Data extends AbstractHelper
     /**
      * Xml path google experiments enabled
      */
-    public const XML_PATH_ENABLED = 'google/analytics/experiments';
+    private const XML_PATH_ENABLED = 'google/analytics/experiments';
 
     /**
      * Xml path google experiments enabled for GA4
      */
-    public const XML_PATH_ENABLED_GA4 = 'google/gtag/analytics4/experiments';
+    private const XML_PATH_ENABLED_GA4 = 'google/gtag/analytics4/experiments';
 
     /**
      * @var bool
@@ -89,7 +85,7 @@ public function isGoogleExperimentEnabled($store = null)
      * @param string $store
      * @return bool
      */
-    public function isGoogleExperimentActive($store = null): bool
+    public function isGoogleExperimentActive($store = null)
     {
         return $this->isGoogleExperimentEnabled($store) &&
             (

app/code/Magento/GoogleOptimizer/Test/Unit/Helper/DataTest.php

@@ -20,6 +20,16 @@
  */
 class DataTest extends TestCase
 {
+    /**
+     * Xml path google experiments enabled
+     */
+    private const XML_PATH_ENABLED = 'google/analytics/experiments';
+
+    /**
+     * Xml path google experiments enabled for GA4
+     */
+    private const XML_PATH_ENABLED_GA4 = 'google/gtag/analytics4/experiments';
+
     /**
      * @var MockObject
      */
@@ -99,12 +109,12 @@ public function testGoogleExperimentIsActive($isExperimentsEnabled, $isAnalytics
             'isSetFlag'
         )->withConsecutive(
             [
-                Data::XML_PATH_ENABLED,
+                self::XML_PATH_ENABLED,
                 ScopeInterface::SCOPE_STORE,
                 $store
             ],
             [
-                Data::XML_PATH_ENABLED_GA4,
+                self::XML_PATH_ENABLED_GA4,
                 ScopeInterface::SCOPE_STORE,
                 $store
             ]