NEXT-4137 - ignore themeplugins if the current saleschannel dont

have this theme activated - also added new themeplugin bundleclass for themerelated plugins
pweyck · Aug 7, 2019 · 7f0b4a4 · 7f0b4a4
1 parent 49941c6
commit 7f0b4a4
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 11 deletions.
diff --git a/Framework/DependencyInjection/services.xml b/Framework/DependencyInjection/services.xml
@@ -253,6 +253,13 @@
                  decorates="Shopware\Core\Framework\Routing\ApiRequestContextResolver">
             <argument type="service" id="Shopware\Core\Framework\Routing\SalesChannelRequestContextResolver.inner"/>
             <argument type="service" id="Shopware\Core\System\SalesChannel\Context\SalesChannelContextService"/>
+            <argument type="service" id="event_dispatcher"/>
+        </service>
+
+        <service id="Shopware\Core\Framework\Routing\Subscriber\SalesChannelContextResolvedSubscriber">
+            <argument type="service" id="twig"/>
+            <argument>%kernel.cache_dir%</argument>
+            <tag name="kernel.event_subscriber"/>
         </service>
 
         <service id="Shopware\Core\Framework\Api\Controller\SalesChannelProxyController" public="true">

diff --git a/Framework/Routing/Event/SalesChannelContextResolvedEvent.php b/Framework/Routing/Event/SalesChannelContextResolvedEvent.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Framework\Routing\Event;
+
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Symfony\Contracts\EventDispatcher\Event;
+
+class SalesChannelContextResolvedEvent extends Event
+{
+    /**
+     * @var SalesChannelContext
+     */
+    private $salesChannelContext;
+
+    public function __construct(SalesChannelContext $salesChannelContext)
+    {
+        $this->salesChannelContext = $salesChannelContext;
+    }
+
+    public function getSalesChannelContext(): SalesChannelContext
+    {
+        return $this->salesChannelContext;
+    }
+}
diff --git a/Framework/Routing/SalesChannelRequestContextResolver.php b/Framework/Routing/SalesChannelRequestContextResolver.php
@@ -2,9 +2,11 @@
 
 namespace Shopware\Core\Framework\Routing;
 
+use Shopware\Core\Framework\Routing\Event\SalesChannelContextResolvedEvent;
 use Shopware\Core\Framework\Util\Random;
 use Shopware\Core\PlatformRequest;
 use Shopware\Core\System\SalesChannel\Context\SalesChannelContextServiceInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
@@ -20,12 +22,19 @@ class SalesChannelRequestContextResolver implements RequestContextResolverInterf
      */
     private $contextService;
 
+    /**
+     * @var EventDispatcherInterface
+     */
+    private $eventDispatcher;
+
     public function __construct(
         RequestContextResolverInterface $decorated,
-        SalesChannelContextServiceInterface $contextService
+        SalesChannelContextServiceInterface $contextService,
+        EventDispatcherInterface $eventDispatcher
     ) {
         $this->decorated = $decorated;
         $this->contextService = $contextService;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     public function resolve(SymfonyRequest $master, SymfonyRequest $request): void
@@ -56,6 +65,10 @@ public function resolve(SymfonyRequest $master, SymfonyRequest $request): void
 
         $request->attributes->set(PlatformRequest::ATTRIBUTE_CONTEXT_OBJECT, $context->getContext());
         $request->attributes->set(PlatformRequest::ATTRIBUTE_SALES_CHANNEL_CONTEXT_OBJECT, $context);
+
+        $this->eventDispatcher->dispatch(
+            new SalesChannelContextResolvedEvent($context)
+        );
     }
 
     public function handleSalesChannelContext(Request $request, Request $master, string $salesChannelId, string $contextToken): void

diff --git a/Framework/Routing/Subscriber/SalesChannelContextResolvedSubscriber.php b/Framework/Routing/Subscriber/SalesChannelContextResolvedSubscriber.php
@@ -0,0 +1,46 @@
+<?php declare(strict_types=1);
+
+namespace Shopware\Core\Framework\Routing\Subscriber;
+
+use Shopware\Core\Framework\Routing\Event\SalesChannelContextResolvedEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Twig\Environment;
+
+class SalesChannelContextResolvedSubscriber implements EventSubscriberInterface
+{
+    /**
+     * @var Environment
+     */
+    private $twig;
+
+    /**
+     * @var string
+     */
+    private $cacheDir;
+
+    public function __construct(
+        Environment $twig,
+        string $cacheDir
+    ) {
+        $this->twig = $twig;
+        $this->cacheDir = $cacheDir;
+    }
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            SalesChannelContextResolvedEvent::class => [
+                ['resolved'],
+            ],
+        ];
+    }
+
+    public function resolved(SalesChannelContextResolvedEvent $event): void
+    {
+        // Set individual saleschannel twig cache
+        $this->twig->setCache(
+            $this->cacheDir . '/'
+            . $event->getSalesChannelContext()->getSalesChannel()->getId()
+        );
+    }
+}
diff --git a/Framework/Twig/TemplateFinder.php b/Framework/Twig/TemplateFinder.php
@@ -10,19 +10,23 @@
 class TemplateFinder
 {
     /**
-     * @var array
+     * @var FilesystemLoader
      */
-    private $bundles;
+    protected $loader;
 
     /**
-     * @var FilesystemLoader
+     * @var Kernel
+     */
+    protected $kernel;
+    /**
+     * @var array
      */
-    private $loader;
+    private $bundles;
 
     public function __construct(FilesystemLoader $loader, Kernel $kernel)
     {
         $this->loader = $loader;
-
+        $this->kernel = $kernel;
         $this->addBundles($kernel);
     }
 
@@ -66,14 +70,14 @@ public function find(string $template, $ignoreMissing = false, ?string $startAt
     {
         $template = ltrim($template, '@');
 
-        $queue = $this->bundles;
+        $filterdBundles = $queue = $this->filterBundles($this->bundles);
 
         if ($startAt) {
-            $index = array_search($startAt, $this->bundles, true);
+            $index = array_search($startAt, $filterdBundles, true);
 
             $queue = array_merge(
-                array_slice($this->bundles, $index + 1),
-                array_slice($this->bundles, 0, $index + 1)
+                array_slice($filterdBundles, $index + 1),
+                array_slice($filterdBundles, 0, $index + 1)
             );
         }
 
@@ -91,7 +95,12 @@ public function find(string $template, $ignoreMissing = false, ?string $startAt
         throw new LoaderError(sprintf('Unable to load template "%s". (Looked into: %s)', $template, implode(', ', array_values($queue))));
     }
 
-    private function addBundles(Kernel $kernel): void
+    protected function filterBundles(array $bundles)
+    {
+        return $bundles;
+    }
+
+    protected function addBundles(Kernel $kernel): void
     {
         $bundles = [];
 

diff --git a/SalesChannelRequest.php b/SalesChannelRequest.php
@@ -9,6 +9,10 @@ final class SalesChannelRequest
 
     public const ATTRIBUTE_THEME_ID = 'theme-id';
 
+    public const ATTRIBUTE_THEME_NAME = 'theme-name';
+
+    public const ATTRIBUTE_THEME_BASE_NAME = 'theme-base-name';
+
     /**
      * domain-resolved attributes
      */