Commit 21f9bd37 authored by Ivan Doroshenko's avatar Ivan Doroshenko Committed by Kristiaan Van den Eynde
Browse files

Issue #3306650 by Matroskeen, kristiaanvandeneynde, mglaman:... 

Issue #3306650 by Matroskeen, kristiaanvandeneynde, mglaman: VariationCacheFactory constructor has incorrect parameter type
parent d531ef84

src/Cache/VariationCache.php

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Drupal\Core\Cache\CacheableDependencyInterface; 
use Drupal\Core\Cache\CacheableMetadata;

use Drupal\Core\Cache\CacheBackendInterface;

use Drupal\Core\Cache\Context\CacheContextsManager;

use Drupal\Core\Http\RequestStack;

use Symfony\Component\HttpFoundation\RequestStack;



/**

 * Wraps a regular cache backend to make it support cache contexts.
@@ -19,7 +19,7 @@ class VariationCache implements VariationCacheInterface { 
  /**

   * The request stack.

   *

   * @var \Drupal\Core\Http\RequestStack

   * @var \Symfony\Component\HttpFoundation\RequestStack

   */

  protected $requestStack;
@@ -40,7 +40,7 @@ class VariationCache implements VariationCacheInterface { 
  /**

   * Constructs a new VariationCache object.

   *

   * @param \Drupal\Core\Http\RequestStack $request_stack

   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack

   *   The request stack.

   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend

   *   The cache backend to wrap.

src/Cache/VariationCacheFactory.php

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ namespace Drupal\variationcache\Cache; 


use Drupal\Core\Cache\CacheFactoryInterface;

use Drupal\Core\Cache\Context\CacheContextsManager;

use Drupal\Core\Http\RequestStack;

use Symfony\Component\HttpFoundation\RequestStack;



/**

 * Defines the variation cache factory.
@@ -23,7 +23,7 @@ class VariationCacheFactory implements VariationCacheFactoryInterface { 
  /**

   * The request stack.

   *

   * @var \Drupal\Core\Http\RequestStack

   * @var \Symfony\Component\HttpFoundation\RequestStack

   */

  protected $requestStack;
@@ -44,7 +44,7 @@ class VariationCacheFactory implements VariationCacheFactoryInterface { 
  /**

   * Constructs a new VariationCacheFactory object.

   *

   * @param \Drupal\Core\Http\RequestStack $request_stack

   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack

   *   The request stack.

   * @param \Drupal\Core\Cache\CacheFactoryInterface $cache_factory

   *   The cache factory.

tests/src/Unit/VariationCacheTest.php

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Drupal\Core\Cache\CacheableMetadata; 
use Drupal\Core\Cache\Context\CacheContextsManager;

use Drupal\Core\Cache\Context\ContextCacheKeys;

use Drupal\Core\Cache\MemoryBackend;

use Drupal\Core\Http\RequestStack;

use Symfony\Component\HttpFoundation\RequestStack;

use Drupal\Tests\UnitTestCase;

use Drupal\variationcache\Cache\CacheRedirect;

use Drupal\variationcache\Cache\VariationCache;
@@ -21,7 +21,7 @@ class VariationCacheTest extends UnitTestCase { 
  /**

   * The prophesized request stack.

   *

   * @var \Drupal\Core\Http\RequestStack|\Prophecy\Prophecy\ProphecyInterface

   * @var \Symfony\Component\HttpFoundation\RequestStack|\Prophecy\Prophecy\ProphecyInterface

   */

  protected $requestStack;