ENGCOM-7780: PageCache / Layout: Avoid multiple calls and config fetch #28992

magento-engcom-team · magento-engcom-team · commit 1a8da55d5b3f · 2020-07-24T08:27:16.000-05:00
- Merge Pull Request #28992 from lbajsarowicz/magento2:improvement/layout-plugin - Merged commits: 1. b59dc72
diff --git a/app/code/Magento/PageCache/Model/Config.php b/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);
     }
 
     /**
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -85,10 +85,11 @@ public function afterGetOutput(Layout $subject, $result)
     {
         if ($subject->isCacheable() && $this->config->isEnabled()) {
             $tags = [[]];
+            $isVarnish = $this->config->getType() === Config::VARNISH;
+
             foreach ($subject->getAllBlocks() as $block) {
                 if ($block instanceof IdentityInterface) {
                     $isEsiBlock = $block->getTtl() > 0;
-                    $isVarnish = $this->config->getType() == Config::VARNISH;
                     if ($isVarnish && $isEsiBlock) {
                         continue;
                     }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function __construct(`
`121`	`121`	`*/`
`122`	`122`	`public function getType()`
`123`	`123`	`{`
`124`		`- return $this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);`
	`124`	`+ return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -85,10 +85,11 @@ public function afterGetOutput(Layout $subject, $result)`
`85`	`85`	`{`
`86`	`86`	`if ($subject->isCacheable() && $this->config->isEnabled()) {`
`87`	`87`	`$tags = [[]];`
	`88`	`+ $isVarnish = $this->config->getType() === Config::VARNISH;`
	`89`	`+`
`88`	`90`	`foreach ($subject->getAllBlocks() as $block) {`
`89`	`91`	`if ($block instanceof IdentityInterface) {`
`90`	`92`	`$isEsiBlock = $block->getTtl() > 0;`
`91`		`- $isVarnish = $this->config->getType() == Config::VARNISH;`
`92`	`93`	`if ($isVarnish && $isEsiBlock) {`
`93`	`94`	`continue;`
`94`	`95`	`}`