Fix type check (#483)

fastly · Sep 6, 2021 · 410489b · 410489b
1 parent 57d87e2
commit 410489b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Block/Cache/Additional.php b/Block/Cache/Additional.php
@@ -65,7 +65,7 @@ public function __construct(
      */
     public function canShowBlock()
     {
-        if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+        if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
             return true;
         }
         return false;

diff --git a/Controller/Adminhtml/FastlyCdn/Purge/ContentType.php b/Controller/Adminhtml/FastlyCdn/Purge/ContentType.php
@@ -68,7 +68,7 @@ public function __construct(
     public function execute()
     {
         try {
-            if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+            if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
                 // check if content type is given
                 $contentType = $this->getRequest()->getParam('content_types', false);
                 if (!$contentType) {

diff --git a/Controller/Adminhtml/FastlyCdn/Purge/Quick.php b/Controller/Adminhtml/FastlyCdn/Purge/Quick.php
@@ -78,7 +78,7 @@ public function __construct(
     public function execute()
     {
         try {
-            if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+            if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
                 // check if url is given
                 $url = $this->getRequest()->getParam('quick_purge_url', false);
 

diff --git a/Controller/Adminhtml/FastlyCdn/Purge/Store.php b/Controller/Adminhtml/FastlyCdn/Purge/Store.php
@@ -77,7 +77,7 @@ public function __construct(
     public function execute()
     {
         try {
-            if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+            if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
                 // check if store exists
                 $storeId = $this->getRequest()->getParam('stores', false);
                 /** @var \Magento\Store\Model\Store $store */

diff --git a/Model/Config.php b/Model/Config.php
@@ -578,7 +578,7 @@ public function __construct(
      */
     public function isFastlyEnabled()
     {
-        if ($this->getType() == Config::FASTLY) {
+        if ($this->getType() === Config::FASTLY) {
             return true;
         }
 

diff --git a/Model/Layout/LayoutPlugin.php b/Model/Layout/LayoutPlugin.php
@@ -70,7 +70,7 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject)
     {
         // if subject is cacheable, FPC cache is enabled, Fastly module is chosen and general TTL is > 0
         if ($subject->isCacheable() && $this->config->isEnabled()
-            && $this->config->getType() == Config::FASTLY && $this->config->getTtl()) {
+            && $this->config->getType() === Config::FASTLY && $this->config->getTtl()) {
             // get cache control header
             $header = $this->response->getHeader('cache-control');
             if (($header instanceof \Zend\Http\Header\HeaderInterface) && ($value = $header->getFieldValue())) {
@@ -107,7 +107,7 @@ public function afterGenerateElements(\Magento\Framework\View\Layout $subject)
      */
     public function afterGetOutput(\Magento\Framework\View\Layout $subject, $result) // @codingStandardsIgnoreLine - unused parameter
     {
-        if ($this->config->getType() == Config::FASTLY) {
+        if ($this->config->getType() === Config::FASTLY) {
             $this->response->setHeader("Fastly-Module-Enabled", "1.2.166", true);
         }
 

diff --git a/Model/PageCache/ConfigPlugin.php b/Model/PageCache/ConfigPlugin.php
@@ -79,7 +79,7 @@ public function aroundGetType(Config $config, callable $proceed)
         if ($this->_scopeConfig->getValue(Config::XML_PAGECACHE_TYPE) === 'fastly') {
             $result = \Fastly\Cdn\Model\Config::FASTLY;
         } else {
-            $result = $proceed();
+            $result = (int)$proceed();
         }
         return $result;
     }

diff --git a/Observer/FlushAllCacheObserver.php b/Observer/FlushAllCacheObserver.php
@@ -58,7 +58,7 @@ public function __construct(Config $config, PurgeCache $purgeCache)
      */
     public function execute(\Magento\Framework\Event\Observer $observer) // @codingStandardsIgnoreLine - unused parameter
     {
-        if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+        if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
             $this->purgeCache->sendPurgeRequest();
         }
     }

diff --git a/Observer/InvalidateVarnishObserver.php b/Observer/InvalidateVarnishObserver.php
@@ -72,7 +72,7 @@ public function __construct(
      */
     public function execute(\Magento\Framework\Event\Observer $observer)
     {
-        if ($this->config->getType() == Config::FASTLY && $this->config->isEnabled()) {
+        if ($this->config->getType() === Config::FASTLY && $this->config->isEnabled()) {
             $object = $observer->getEvent()->getObject();
 
             if ($object instanceof \Magento\Framework\DataObject\IdentityInterface && $this->canPurgeObject($object)) {