Merge pull request #25 from rafaelstz/bugfix/18-bug-development-mode

rafaelstz · Dec 7, 2022 · 9dab3f2 · 9dab3f2
2 parents 43d5555 + ddd2e7f
commit 9dab3f2
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 33 deletions.
diff --git a/Block/Quicklink.php b/Block/Quicklink.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Rafael Corrêa Gomes <rafaelcgstz@gmail.com>
- * @copyright Copyright (c) 2020.
+ * @copyright Copyright (c) 2023.
  */
 
 namespace Rafaelcg\Quicklink\Block;
@@ -16,19 +16,11 @@
  */
 class Quicklink extends Template
 {
+    private Template\Context $context;
 
-    /**
-     * @var Template\Context
-     */
-    private $context;
-    /**
-     * @var array
-     */
-    private $data;
-    /**
-     * @var Data
-     */
-    private $helper;
+    private array $data;
+
+    private Data $helper;
 
     /**
      * Constructor
@@ -56,7 +48,7 @@ public function __construct(
      *
      * @return array|string
      */
-    public function initConfig()
+    public function initConfig(): array|string
     {
         $initConfig = [];
         $timeout = $this->helper->getTimeout();
@@ -80,24 +72,17 @@ public function initConfig()
         return $initConfig;
     }
 
-    protected function runInDeveloperMode()
-    {
-        return $this->helper->getRunInDeveloperMode();
-    }
-
     /**
      * Render GA tracking scripts
      *
      * @return string
      */
-    protected function _toHtml()
+    protected function _toHtml(): string
     {
         $isProductionMode = $this->_appState->getMode() === State::MODE_PRODUCTION;
         $runInDeveloperMode = $this->helper->runInDeveloperMode();
-        if (!$this->helper->isQuicklinkEnabled()) {
-            if (!$runInDeveloperMode && !$isProductionMode) {
-                return '';
-            }
+        if (!$runInDeveloperMode && !$isProductionMode) {
+            return '';
         }
         return parent::_toHtml();
     }

diff --git a/Model/Helper/Data.php b/Model/Helper/Data.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @author Rafael Corrêa Gomes <rafaelcgstz@gmail.com>
- * @copyright Copyright (c) 2020.
+ * @copyright Copyright (c) 2023.
  */
 
 namespace Rafaelcg\Quicklink\Model\Helper;
@@ -32,7 +32,7 @@ class Data extends AbstractHelper
      * @param  null   $scopeCode
      * @return mixed
      */
-    public function getConfig($path, $scopeCode = null)
+    public function getConfig($path, $scopeCode = null): mixed
     {
         $config = $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $scopeCode);
         return !empty($config) ? $config : false;
@@ -43,7 +43,7 @@ public function getConfig($path, $scopeCode = null)
      *
      * @return int|mixed
      */
-    public function getTimeout()
+    public function getTimeout(): mixed
     {
         return $this->getConfig(self::XML_PATH_TIMEOUT);
     }
@@ -53,7 +53,7 @@ public function getTimeout()
      *
      * @return int|mixed
      */
-    public function getRequestLimit()
+    public function getRequestLimit(): mixed
     {
         return $this->getConfig(self::XML_PATH_REQUEST_LIMIT);
     }
@@ -63,7 +63,7 @@ public function getRequestLimit()
      *
      * @return int|mixed
      */
-    public function getConcurrencyLimit()
+    public function getConcurrencyLimit(): mixed
     {
         return $this->getConfig(self::XML_PATH_CONCURRENCY_LIMIT);
     }
@@ -73,29 +73,30 @@ public function getConcurrencyLimit()
      *
      * @return int|mixed
      */
-    public function getPriority()
+    public function getPriority(): mixed
     {
         return $this->getConfig(self::XML_PATH_PRIORITY);
     }
 
     /**
      * Whether Quicklink is ready to use
      *
+     * @deprecated 2.2.0
      * @param null $store
      * @return bool
      */
-    public function isQuicklinkEnabled($store = null)
+    public function isQuicklinkEnabled($store = null): bool
     {
         return $this->scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
-     * Check if can run in developer mode
+     * Check if you can run it in developer mode
      *
      * @param null $store
      * @return bool
      */
-    public function runInDeveloperMode($store = null)
+    public function runInDeveloperMode($store = null): bool
     {
         return $this->scopeConfig->isSetFlag(self::XML_PATH_DEVELOPER_MODE, ScopeInterface::SCOPE_STORE, $store);
     }