Avoid multiple calls and config fetch

magento · Jul 4, 2020 · b59dc72 · b59dc72
1 parent 735579d
commit b59dc72
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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
@@ -74,10 +74,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 change
@@ Expand Up / @@ -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);
         }
         /**
@@ Expand Down @@