MAGETWO-58265: [Github][Cloud][Customer]Fix Varnish X-Header

- Stabilization fixes

Author: Andrey Konosov

app/code/Magento/CacheInvalidate/Observer/InvalidateVarnishObserver.php

@@ -25,7 +25,7 @@ class InvalidateVarnishObserver implements ObserverInterface
     /**
      * Invalidation tags resolver
      *
-     * @var \Magento\PageCache\Model\Cache\Tag\Resolver
+     * @var \Magento\Framework\App\Cache\Tag\Resolver
      */
     private $tagResolver;
 
@@ -39,7 +39,6 @@ public function __construct(
     ) {
         $this->config = $config;
         $this->purgeCache = $purgeCache;
-        $this->tagResolver = $this->getTagResolver();
     }
 
     /**
@@ -56,7 +55,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
         if ($this->config->getType() == \Magento\PageCache\Model\Config::VARNISH && $this->config->isEnabled()) {
-            $bareTags = $this->tagResolver->getTags($object);
+            $bareTags = $this->getTagResolver()->getTags($object);
 
             $tags = [];
             $pattern = "((^|,)%s(,|$))";
@@ -76,6 +75,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      */
     private function getTagResolver()
     {
-        return ObjectManager::getInstance()->get(\Magento\Framework\App\Cache\Tag\Resolver::class);
+        if ($this->tagResolver === null) {
+            $this->tagResolver = \Magento\Framework\App\ObjectManager::getInstance()
+                ->get(\Magento\Framework\App\Cache\Tag\Resolver::class);
+        }
+        return $this->tagResolver;
     }
 }

app/code/Magento/CacheInvalidate/Test/Unit/Observer/InvalidateVarnishObserverTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\CacheInvalidate\Test\Unit\Observer;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
 class InvalidateVarnishObserverTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\CacheInvalidate\Observer\InvalidateVarnishObserver */
@@ -22,11 +24,16 @@ class InvalidateVarnishObserverTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\DataObject\ */
     protected $observerObject;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Cache\Tag\Resolver */
+    private $tagResolver;
+
     /**
      * Set up all mocks and data for test
      */
     protected function setUp()
     {
+        $helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+
         $this->configMock = $this->getMock(
             \Magento\PageCache\Model\Config::class,
             ['getType', 'isEnabled'],
@@ -39,6 +46,10 @@ protected function setUp()
             $this->configMock,
             $this->purgeCache
         );
+
+        $this->tagResolver = $this->getMock(\Magento\Framework\App\Cache\Tag\Resolver::class, [], [], '', false);
+        $helper->setBackwardCompatibleProperty($this->model, 'tagResolver', $this->tagResolver);
+
         $this->observerMock = $this->getMock(
             \Magento\Framework\Event\Observer::class,
             ['getEvent'],
@@ -65,10 +76,12 @@ public function testInvalidateVarnish()
         )->will(
             $this->returnValue(\Magento\PageCache\Model\Config::VARNISH)
         );
+
         $eventMock = $this->getMock(\Magento\Framework\Event::class, ['getObject'], [], '', false);
         $eventMock->expects($this->once())->method('getObject')->will($this->returnValue($this->observerObject));
         $this->observerMock->expects($this->once())->method('getEvent')->will($this->returnValue($eventMock));
-        $this->observerObject->expects($this->once())->method('getIdentities')->will($this->returnValue($tags));
+        $this->tagResolver->expects($this->once())->method('getTags')->with($this->observerObject)
+            ->will($this->returnValue($tags));
         $this->purgeCache->expects($this->once())->method('sendPurgeRequest')->with($pattern);
 
         $this->model->execute($this->observerMock);

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Cache/Tag/ConfigurableTest.php

@@ -4,15 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\Test\Unit\Cache\Tag\Strategy;
+namespace Magento\Framework\App\Test\Unit\Model\Product\Cache\Tag;
 
 use \Magento\ConfigurableProduct\Model\Product\Cache\Tag\Configurable;
 
 class ConfigurableTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable
+     * @var \PHPUnit_Framework_MockObject_MockObject|Configurable
      */
     private $typeResource;
 
@@ -24,7 +24,11 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->typeResource = $this->getMock(
-            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable::class, [], [], '', false
+            \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $this->model = new Configurable($this->typeResource);

lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php

@@ -37,6 +37,7 @@ class FlushCacheByTags
      * @param Type\FrontendPool $cachePool
      * @param StateInterface $cacheState
      * @param array $cacheList
+     * @param Tag\Resolver $tagResolver
      */
     public function __construct(
         \Magento\Framework\App\Cache\Type\FrontendPool $cachePool,

lib/internal/Magento/Framework/App/Cache/Tag/Resolver.php

@@ -17,6 +17,11 @@ class Resolver
      */
     private $strategyFactory;
 
+    /**
+     * Resolver constructor.
+     *
+     * @param Strategy\Factory $factory
+     */
     public function __construct(\Magento\Framework\App\Cache\Tag\Strategy\Factory $factory)
     {
         $this->strategyFactory = $factory;
@@ -37,4 +42,4 @@ public function getTags($object)
 
         return $this->strategyFactory->getStrategy($object)->getTags($object);
     }
-}
+}

lib/internal/Magento/Framework/App/Cache/Tag/Strategy/Factory.php

@@ -33,6 +33,13 @@ class Factory
      */
     private $customStrategies = [];
 
+    /**
+     * Factory constructor.
+     *
+     * @param Identifier $identifierStrategy
+     * @param Dummy $dummyStrategy
+     * @param array $customStrategies
+     */
     public function __construct(
         \Magento\Framework\App\Cache\Tag\Strategy\Identifier $identifierStrategy,
         \Magento\Framework\App\Cache\Tag\Strategy\Dummy $dummyStrategy,
@@ -73,4 +80,4 @@ class_implements($object)
 
         return $this->dummyStrategy;
     }
-}
+}

lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/ResolverTest.php

@@ -28,7 +28,11 @@ class ResolverTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->strategyFactory = $this->getMock(
-            \Magento\Framework\App\Cache\Tag\Strategy\Factory::class, [], [], '', false
+            \Magento\Framework\App\Cache\Tag\Strategy\Factory::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $this->strategy = $this->getMockForAbstractClass(\Magento\Framework\App\Cache\Tag\StrategyInterface::class);

lib/internal/Magento/Framework/App/Test/Unit/Cache/Tag/Strategy/FactoryTest.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\App\Test\Unit\Cache\Tag;
+namespace Magento\Framework\App\Test\Unit\Cache\Tag\Strategy;
 
 use \Magento\Framework\App\Cache\Tag\Strategy\Factory;
 
@@ -33,11 +33,19 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->identifierStrategy = $this->getMock(
-            \Magento\Framework\App\Cache\Tag\Strategy\Identifier::class, [], [], '', false
+            \Magento\Framework\App\Cache\Tag\Strategy\Identifier::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $this->dummyStrategy = $this->getMock(
-            \Magento\Framework\App\Cache\Tag\Strategy\Dummy::class, [], [], '', false
+            \Magento\Framework\App\Cache\Tag\Strategy\Dummy::class,
+            [],
+            [],
+            '',
+            false
         );
 
         $this->customStrategy = $this->getMockForAbstractClass(