ENGCOM-9207: 33465 Varnish cache adding top menu category ids to all page cache tags #33468

Author: sidolov

app/code/Magento/PageCache/Model/App/CacheIdentifierPlugin.php

@@ -55,7 +55,7 @@ public function __construct(
      */
     public function afterGetValue(\Magento\Framework\App\PageCache\Identifier $identifier, $result)
     {
-        if ($this->config->getType() == \Magento\PageCache\Model\Config::BUILT_IN && $this->config->isEnabled()) {
+        if ($this->config->getType() === \Magento\PageCache\Model\Config::BUILT_IN && $this->config->isEnabled()) {
             $identifierPrefix = '';
 
             $ruleDesignException = $this->designExceptions->getThemeByRequest($this->request);

app/code/Magento/PageCache/Model/App/FrontController/BuiltinPlugin.php

@@ -67,7 +67,7 @@ public function aroundDispatch(
         \Magento\Framework\App\RequestInterface $request
     ) {
         $this->version->process();
-        if (!$this->config->isEnabled() || $this->config->getType() != \Magento\PageCache\Model\Config::BUILT_IN) {
+        if (!$this->config->isEnabled() || $this->config->getType() !== \Magento\PageCache\Model\Config::BUILT_IN) {
             return $proceed($request);
         }
         $result = $this->kernel->load();

app/code/Magento/PageCache/Model/App/FrontController/VarnishPlugin.php

@@ -56,7 +56,7 @@ public function __construct(Config $config, Version $version, AppState $state)
      */
     public function afterDispatch(FrontControllerInterface $subject, $result)
     {
-        if ($this->config->getType() == Config::VARNISH && $this->config->isEnabled()
+        if ($this->config->getType() === Config::VARNISH && $this->config->isEnabled()
             && $result instanceof ResponseHttp
         ) {
             $this->version->process();

app/code/Magento/PageCache/Model/Config.php

@@ -121,7 +121,7 @@ public function __construct(
      */
     public function getType()
     {
-        return $this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
+        return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
     }
 
     /**

app/code/Magento/PageCache/Model/Controller/Result/BuiltinPlugin.php

@@ -69,7 +69,7 @@ public function afterRenderResult(ResultInterface $subject, ResultInterface $res
     {
         $usePlugin = $this->registry->registry('use_page_cache_plugin');
 
-        if (!$usePlugin || !$this->config->isEnabled() || $this->config->getType() != Config::BUILT_IN) {
+        if (!$usePlugin || !$this->config->isEnabled() || $this->config->getType() !== Config::BUILT_IN) {
             return $result;
         }
 

app/code/Magento/PageCache/Model/Controller/Result/VarnishPlugin.php

@@ -65,7 +65,7 @@ public function afterRenderResult(ResultInterface $subject, ResultInterface $res
     {
         $usePlugin = $this->registry->registry('use_page_cache_plugin');
 
-        if ($this->config->getType() == Config::VARNISH && $this->config->isEnabled() && $usePlugin) {
+        if ($this->config->getType() === Config::VARNISH && $this->config->isEnabled() && $usePlugin) {
             $this->version->process();
 
             if ($this->state->getMode() == AppState::MODE_DEVELOPER) {

app/code/Magento/PageCache/Observer/FlushAllCache.php

@@ -62,7 +62,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        if ($this->_config->getType() == Config::BUILT_IN) {
+        if ($this->_config->getType() === Config::BUILT_IN) {
             $this->fullPageCache->clean();
         }
     }

app/code/Magento/PageCache/Observer/FlushCacheByTags.php

@@ -73,7 +73,7 @@ public function __construct(
      */
     public function execute(Observer $observer)
     {
-        if ($this->_config->getType() == Config::BUILT_IN && $this->_config->isEnabled()) {
+        if ($this->_config->getType() === Config::BUILT_IN && $this->_config->isEnabled()) {
             $object = $observer->getEvent()->getObject();
             if (!is_object($object)) {
                 return;

app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php

@@ -120,7 +120,7 @@ private function isFullPageCacheEnabled()
     private function isVarnishEnabled()
     {
         if ($this->isVarnishEnabled === null) {
-            $this->isVarnishEnabled = ($this->_config->getType() == \Magento\PageCache\Model\Config::VARNISH);
+            $this->isVarnishEnabled = ($this->_config->getType() === \Magento\PageCache\Model\Config::VARNISH);
         }
         return $this->isVarnishEnabled;
     }

app/code/Magento/PageCache/Test/Unit/Observer/ProcessLayoutRenderElementTest.php

@@ -151,7 +151,7 @@ public function testExecute(
                     ->method('isScopePrivate')
                     ->willReturn($scopeIsPrivate);
             }
-            $this->_configMock->expects($this->any())->method('getType')->willReturn($varnishIsEnabled);
+            $this->_configMock->expects($this->any())->method('getType')->willReturn(Config::VARNISH);
         }
         $this->_model->execute($this->_observerMock);
 
@@ -210,7 +210,7 @@ public function testExecuteWithBase64Encode()
             ->method('getNameInLayout')
             ->willReturn('testBlockName');
 
-        $this->_configMock->expects($this->any())->method('getType')->willReturn(true);
+        $this->_configMock->expects($this->any())->method('getType')->willReturn(Config::VARNISH);
 
         $this->_model->execute($this->_observerMock);