backward compatiblity, review changes

Author: DominicWatts

app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php

@@ -65,7 +65,7 @@ class DebugHints
      *
      * @var string
      */
-    protected $debugHintsShowWithParameter;
+    private $debugHintsWithParam;
 
     /**
      * XPath of configuration of the debug hints URL parameter
@@ -74,7 +74,7 @@ class DebugHints
      *
      * @var string
      */
-    protected $debugHintsParameter;
+    private $debugHintsParameter;
 
     /**
      * @param ScopeConfigInterface $scopeConfig
@@ -83,7 +83,7 @@ class DebugHints
      * @param DebugHintsFactory $debugHintsFactory
      * @param string $debugHintsPath
      * @param Http $http
-     * @param string $debugHintsShowWithParameter
+     * @param string $debugHintsWithParam
      * @param string $debugHintsParameter
      */
     public function __construct(
@@ -92,17 +92,19 @@ public function __construct(
         DevHelper $devHelper,
         DebugHintsFactory $debugHintsFactory,
         $debugHintsPath,
-        Http $http,
-        $debugHintsShowWithParameter,
-        $debugHintsParameter
+        Http $http = null,
+        $debugHintsWithParam = null,
+        $debugHintsParameter = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->storeManager = $storeManager;
         $this->devHelper = $devHelper;
         $this->debugHintsFactory = $debugHintsFactory;
         $this->debugHintsPath = $debugHintsPath;
-        $this->http = $http;
-        $this->debugHintsShowWithParameter = $debugHintsShowWithParameter;
+        $this->http = $http ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Request\Http::class
+        );
+        $this->debugHintsWithParam = $debugHintsWithParam;
         $this->debugHintsParameter = $debugHintsParameter;
     }
 
@@ -122,8 +124,8 @@ public function afterCreate(
         $storeCode = $this->storeManager->getStore()->getCode();
         if ($this->scopeConfig->getValue($this->debugHintsPath, ScopeInterface::SCOPE_STORE, $storeCode)
             && $this->devHelper->isDevAllowed()) {
-            $debugHintsShowWithParameter = $this->scopeConfig->getValue(
-                $this->debugHintsShowWithParameter,
+            $debugHintsWithParam = $this->scopeConfig->getValue(
+                $this->debugHintsWithParam,
                 ScopeInterface::SCOPE_STORE,
                 $storeCode
             );
@@ -133,9 +135,16 @@ public function afterCreate(
                 $storeCode
             );
             $debugHintsParameterInUrl = $this->http->getParam('templatehints');
-            if ((!$debugHintsShowWithParameter) ||
-                ($debugHintsShowWithParameter &&
-                 $debugHintsParameter == $debugHintsParameterInUrl)) {
+
+            $showHints = false;
+            if (!$debugHintsWithParam) {
+                $showHints = true;
+            }
+            if ($debugHintsWithParam && $debugHintsParameter == $debugHintsParameterInUrl) {
+                $showHints = true;
+            }
+
+            if ($showHints) {
                 $showBlockHints = $this->scopeConfig->getValue(
                     self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
                     ScopeInterface::SCOPE_STORE,

app/code/Magento/Developer/Test/Unit/Model/TemplateEngine/Plugin/DebugHintsTest.php

@@ -63,7 +63,7 @@ protected function setUp()
     public function testAfterCreateActive(
         $debugHintsPath,
         $showBlockHints,
-        $debugHintsShowWithParameter,
+        $debugHintsWithParam,
         $debugHintsParameter
     ) {
         $this->devHelperMock->expects($this->once())
@@ -101,7 +101,7 @@ public function testAfterCreateActive(
             $this->debugHintsFactory,
             $debugHintsPath,
             $this->httpMock,
-            $debugHintsShowWithParameter,
+            $debugHintsWithParam,
             $debugHintsParameter
         );
 
@@ -132,7 +132,7 @@ public function testAfterCreateInactive(
         $debugHintsPath,
         $isDevAllowed,
         $showTemplateHints,
-        $debugHintsShowWithParameter,
+        $debugHintsWithParam,
         $debugHintsParameter
     ) {
         $this->devHelperMock->expects($this->any())
@@ -156,7 +156,7 @@ public function testAfterCreateInactive(
             $this->debugHintsFactory,
             $debugHintsPath,
             $this->httpMock,
-            $debugHintsShowWithParameter,
+            $debugHintsWithParam,
             $debugHintsParameter
         );
 

app/code/Magento/Developer/etc/adminhtml/di.xml

@@ -12,7 +12,7 @@
     <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
         <arguments>
             <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_admin</argument>
-            <argument name="debugHintsShowWithParameter" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
+            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
             <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
         </arguments>
     </type>

app/code/Magento/Developer/etc/frontend/di.xml

@@ -12,7 +12,7 @@
     <type name="Magento\Developer\Model\TemplateEngine\Plugin\DebugHints">
         <arguments>
             <argument name="debugHintsPath" xsi:type="string">dev/debug/template_hints_storefront</argument>
-            <argument name="debugHintsShowWithParameter" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
+            <argument name="debugHintsWithParam" xsi:type="string">dev/debug/template_hints_storefront_show_with_parameter</argument>
             <argument name="debugHintsParameter" xsi:type="string">dev/debug/template_hints_parameter_value</argument>
         </arguments>
     </type>