Merge branch '6.7' into 6.13

ezecosystem · Jul 5, 2018 · 6a378a2 · 6a378a2
2 parents 6421ddd + 16636e2
commit 6a378a2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Imagine/Cache/AliasGeneratorDecorator.php b/eZ/Bundle/EzPublishCoreBundle/Imagine/Cache/AliasGeneratorDecorator.php
@@ -9,14 +9,15 @@
 use eZ\Publish\API\Repository\Values\Content\Field;
 use eZ\Publish\API\Repository\Values\Content\VersionInfo;
 use eZ\Publish\Core\MVC\Symfony\SiteAccess;
+use eZ\Publish\Core\MVC\Symfony\SiteAccess\SiteAccessAware;
 use eZ\Publish\SPI\Variation\VariationHandler;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Routing\RequestContext;
 
 /**
  * Persistence Cache layer for AliasGenerator.
  */
-class AliasGeneratorDecorator implements VariationHandler
+class AliasGeneratorDecorator implements VariationHandler, SiteAccessAware
 {
     /**
      * @var \eZ\Publish\SPI\Variation\VariationHandler
@@ -41,14 +42,12 @@ class AliasGeneratorDecorator implements VariationHandler
     /**
      * @param \eZ\Publish\SPI\Variation\VariationHandler $aliasGenerator
      * @param \Psr\Cache\CacheItemPoolInterface $cache
-     * @param \eZ\Publish\Core\MVC\Symfony\SiteAccess $siteAccess
      * @param \Symfony\Component\Routing\RequestContext $requestContext
      */
-    public function __construct(VariationHandler $aliasGenerator, CacheItemPoolInterface $cache, SiteAccess $siteAccess, RequestContext $requestContext)
+    public function __construct(VariationHandler $aliasGenerator, CacheItemPoolInterface $cache, RequestContext $requestContext)
     {
         $this->aliasGenerator = $aliasGenerator;
         $this->cache = $cache;
-        $this->siteAccess = $siteAccess;
         $this->requestContext = $requestContext;
     }
 
@@ -74,6 +73,14 @@ public function getVariation(Field $field, VersionInfo $versionInfo, $variationN
         return $image;
     }
 
+    /**
+     * @param \eZ\Publish\Core\MVC\Symfony\SiteAccess $siteAccess
+     */
+    public function setSiteAccess(SiteAccess $siteAccess = null)
+    {
+        $this->siteAccess = $siteAccess;
+    }
+
     /**
      * @param \eZ\Publish\API\Repository\Values\Content\Field $field
      * @param \eZ\Publish\API\Repository\Values\Content\VersionInfo $versionInfo
@@ -85,7 +92,7 @@ private function getCacheKey(Field $field, VersionInfo $versionInfo, $variationN
     {
         return sprintf(
             'ez-image-variation-%s-%s-%s-%d-%d-%d-%s-%s',
-            $this->siteAccess->name,
+            $this->siteAccess ? $this->siteAccess->name : 'default',
             $this->requestContext->getScheme(),
             $this->requestContext->getHost(),
             $this->requestContext->getScheme() === 'https' ? $this->requestContext->getHttpsPort() : $this->requestContext->getHttpPort(),

diff --git a/eZ/Bundle/EzPublishCoreBundle/Resources/config/image.yml b/eZ/Bundle/EzPublishCoreBundle/Resources/config/image.yml
@@ -88,8 +88,9 @@ services:
         arguments:
             - '@ezpublish.image_alias.imagine.variation.imagine_alias_generator'
             - '@ezpublish.cache_pool'
-            - '@ezpublish.siteaccess'
             - '@router.request_context'
+        calls:
+            - [setSiteAccess, ['@ezpublish.siteaccess']]
 
     ezpublish.image_alias.imagine.variation.imagine_alias_generator:
         class: '%ezpublish.image_alias.imagine.variation.imagine_alias_generator.class%'