Merge branch 'MAGETWO-34276' of github.corp.ebay.com:magento-troll/magento2ce into MAGETWO-34276

Author: Roman Ganin

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

@@ -16,6 +16,22 @@ class ProcessLayoutRenderElement
     protected $_config;
 
     /**
+     * Is varnish enabled flag
+     *
+     * @var bool
+     */
+    protected $isVarnishEnabled;
+
+    /**
+     * Is full page cache enabled flag
+     *
+     * @var bool
+     */
+    protected $isFullPageCacheEnabled;
+
+    /**
+     * Class constructor
+     *
      * @param \Magento\PageCache\Model\Config $config
      */
     public function __construct(\Magento\PageCache\Model\Config $config)
@@ -44,6 +60,32 @@ protected function _wrapEsi(
         return sprintf('<esi:include src="%s" />', $url);
     }
 
+    /**
+     * Is full page cache enabled
+     *
+     * @return bool
+     */
+    protected function isFullPageCacheEnabled()
+    {
+        if ($this->isFullPageCacheEnabled === null) {
+            $this->isFullPageCacheEnabled = $this->_config->isEnabled();
+        }
+        return $this->isFullPageCacheEnabled;
+    }
+
+    /**
+     * Is varnish cache engine enabled
+     *
+     * @return bool
+     */
+    protected function isVarnishEnabled()
+    {
+        if ($this->isVarnishEnabled === null) {
+            $this->isVarnishEnabled = ($this->_config->getType() == \Magento\PageCache\Model\Config::VARNISH);
+        }
+        return $this->isVarnishEnabled;
+    }
+
     /**
      * Add comment cache containers to private blocks
      * Blocks are wrapped only if page is cacheable
@@ -56,15 +98,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $event = $observer->getEvent();
         /** @var \Magento\Framework\View\Layout $layout */
         $layout = $event->getLayout();
-        if ($layout->isCacheable() && $this->_config->isEnabled()) {
+        if ($this->isFullPageCacheEnabled() && $layout->isCacheable()) {
             $name = $event->getElementName();
+            /** @var \Magento\Framework\View\Element\AbstractBlock $block */
             $block = $layout->getBlock($name);
             $transport = $event->getTransport();
             if ($block instanceof \Magento\Framework\View\Element\AbstractBlock) {
                 $blockTtl = $block->getTtl();
-                $varnishIsEnabledFlag = ($this->_config->getType() == \Magento\PageCache\Model\Config::VARNISH);
                 $output = $transport->getData('output');
-                if ($varnishIsEnabledFlag && isset($blockTtl)) {
+                if (isset($blockTtl) && $this->isVarnishEnabled()) {
                     $output = $this->_wrapEsi($block, $layout);
                 } elseif ($block->isScopePrivate()) {
                     $output = sprintf(

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

@@ -99,19 +99,29 @@ public function testExecute(
         $this->_configMock->expects($this->any())->method('isEnabled')->will($this->returnValue($cacheState));
 
         if ($cacheState) {
-            $eventMock->expects($this->once())->method('getElementName')->will($this->returnValue('blockName'));
-            $eventMock->expects($this->once())->method('getTransport')->will($this->returnValue($this->_transport));
-            $this->_layoutMock->expects($this->once())->method('isCacheable')->will($this->returnValue(true));
-
-            $this->_layoutMock->expects($this->any())->method('getUpdate')->will($this->returnSelf());
-            $this->_layoutMock->expects($this->any())->method('getHandles')->will($this->returnValue([]));
-            $this->_layoutMock->expects(
-                $this->once()
-            )->method(
-                    'getBlock'
-                )->will(
-                    $this->returnValue($this->_blockMock)
-                );
+            $eventMock->expects($this->once())
+                ->method('getElementName')
+                ->will($this->returnValue('blockName'));
+
+            $eventMock->expects($this->once())
+                ->method('getTransport')
+                ->will($this->returnValue($this->_transport));
+
+            $this->_layoutMock->expects($this->once())
+                ->method('isCacheable')
+                ->will($this->returnValue(true));
+
+            $this->_layoutMock->expects($this->any())
+                ->method('getUpdate')
+                ->will($this->returnSelf());
+
+            $this->_layoutMock->expects($this->any())
+                ->method('getHandles')
+                ->will($this->returnValue([]));
+            
+            $this->_layoutMock->expects($this->once())
+                ->method('getBlock')
+                ->will($this->returnValue($this->_blockMock));
 
             if ($varnishIsEnabled) {
                 $this->_blockMock->expects($this->once())
@@ -123,20 +133,12 @@ public function testExecute(
                     ->will($this->returnValue('page_cache/block/wrapesi/with/handles/and/other/stuff'));
             }
             if ($scopeIsPrivate) {
-                $this->_blockMock->expects(
-                    $this->once()
-                )->method(
-                        'getNameInLayout'
-                    )->will(
-                        $this->returnValue('testBlockName')
-                    );
-                $this->_blockMock->expects(
-                    $this->once()
-                )->method(
-                        'isScopePrivate'
-                    )->will(
-                        $this->returnValue($scopeIsPrivate)
-                    );
+                $this->_blockMock->expects($this->once())
+                    ->method('getNameInLayout')
+                    ->will($this->returnValue('testBlockName'));
+                $this->_blockMock->expects($this->once())
+                    ->method('isScopePrivate')
+                    ->will($this->returnValue($scopeIsPrivate));
             }
             $this->_configMock->expects($this->any())->method('getType')->will($this->returnValue($varnishIsEnabled));
         }