Merge branch 'b-7.5.x-cache-active-modules-id-OXDEV-9930' into b-8.0.x-cache-active-modules-id-OXDEV-9930

# Conflicts:
#	CHANGELOG-2.x.md

Author: moritzdemmer

src/Resolver/TemplateChain/TemplateChainResolver.php

@@ -14,6 +14,7 @@
 class TemplateChainResolver implements TemplateChainResolverInterface
 {
     private array $lastChildCache = [];
+    private array $parentCache = [];
 
     public function __construct(
         private TemplateChainBuilderInterface $templateChainBuilder,
@@ -23,11 +24,15 @@ public function __construct(
 
     public function getParent(string $templateName): string
     {
-        $templateType = $this->templateTypeFactory->createFromTemplateName($templateName);
-        return $this->templateChainBuilder
-            ->getChain($templateType)
-            ->getParent($templateType)
-            ->getFullyQualifiedName();
+        if (!isset($this->parentCache[$templateName])) {
+            $templateType = $this->templateTypeFactory->createFromTemplateName($templateName);
+            $this->parentCache[$templateName] = $this->templateChainBuilder
+                ->getChain($templateType)
+                ->getParent($templateType)
+                ->getFullyQualifiedName();
+        }
+
+        return $this->parentCache[$templateName];
     }
 
     public function getLastChild(string $templateName): string

src/Resolver/TemplateChain/TemplateChainSorter.php

@@ -9,7 +9,7 @@
 
 namespace OxidEsales\Twig\Resolver\TemplateChain;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\ShopConfigurationDaoInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\Chain\TemplateExtensionChainDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleTemplateExtensionChain;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 use OxidEsales\Twig\Resolver\TemplateChain\DataObject\TemplateChain;
@@ -18,21 +18,25 @@
 
 class TemplateChainSorter implements TemplateChainSorterInterface
 {
+    private array $templateExtensionChainCache = [];
+
     public function __construct(
         private SortingConfigurationValidatorInterface $sortingConfigurationValidator,
-        private ShopConfigurationDaoInterface $shopConfigurationDao,
+        private TemplateExtensionChainDaoInterface $templateExtensionChainDao,
         private ContextInterface $context,
         private LoggerInterface $logger,
     ) {
     }
 
     public function sort(TemplateChain $unsortedChain, TemplateTypeInterface $extendedTemplate): TemplateChain
     {
-        $sortingConfiguration = $this->shopConfigurationDao
-            ->get($this->context->getCurrentShopId())
-            ->getModuleTemplateExtensionChain();
+        $shopId = $this->context->getCurrentShopId();
+
+        if (!isset($this->templateExtensionChainCache[$shopId])) {
+            $this->templateExtensionChainCache[$shopId] = $this->templateExtensionChainDao->getChain($shopId);
+        }
 
-        return $this->getSortedChain($unsortedChain, $sortingConfiguration, $extendedTemplate);
+        return $this->getSortedChain($unsortedChain, $this->templateExtensionChainCache[$shopId], $extendedTemplate);
     }
 
     private function getSortedChain(

tests/Unit/Resolver/TemplateChain/TemplateChainResolverTest.php

@@ -18,6 +18,39 @@
 
 final class TemplateChainResolverTest extends TestCase
 {
+    public function testGetParentWithMultipleCallsWillUseCachedResult(): void
+    {
+        $templateName = 'widget/header.html.twig';
+
+        $templateTypeMock = $this->createMock(TemplateTypeInterface::class);
+        $parentMock = $this->createConfiguredMock(TemplateTypeInterface::class, [
+            'getFullyQualifiedName' => '@my_module/widget/header.html.twig'
+        ]);
+        $templateChainMock = $this->createConfiguredMock(TemplateChain::class, [
+            'getParent' => $parentMock
+        ]);
+
+        $templateTypeFactoryMock = $this->createMock(TemplateTypeFactoryInterface::class);
+        $templateTypeFactoryMock
+            ->expects($this->once())
+            ->method('createFromTemplateName')
+            ->with($templateName)
+            ->willReturn($templateTypeMock);
+
+        $templateChainBuilderMock = $this->createMock(TemplateChainBuilderInterface::class);
+        $templateChainBuilderMock
+            ->expects($this->once())
+            ->method('getChain')
+            ->with($templateTypeMock)
+            ->willReturn($templateChainMock);
+
+        $templateChainResolver = new TemplateChainResolver($templateChainBuilderMock, $templateTypeFactoryMock);
+
+        $templateChainResolver->getParent($templateName);
+        $templateChainResolver->getParent($templateName);
+        $templateChainResolver->getParent($templateName);
+    }
+
     public function testGetLastChildWithMultipleCallsWillUseCachedResult(): void
     {
         $templateName = 'widget/header.html.twig';

tests/Unit/Resolver/TemplateChain/TemplateChainSorterTest.php

@@ -9,9 +9,8 @@
 
 namespace OxidEsales\Twig\Tests\Unit\Resolver\TemplateChain;
 
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\ShopConfigurationDaoInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Dao\Chain\TemplateExtensionChainDaoInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ModuleTemplateExtensionChain;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\DataObject\ShopConfiguration;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\ContextInterface;
 use OxidEsales\Twig\Resolver\TemplateChain\DataObject\TemplateChain;
 use OxidEsales\Twig\Resolver\TemplateChain\InvalidSortingConfigurationException;
@@ -162,17 +161,49 @@ public function testSortWithADuplicatedModuleIdInConfigurationWillCallLogger():
         $this->logger->error(Argument::type('string'))->shouldHaveBeenCalled();
     }
 
+    public function testSortWithMultipleCallsWillUseCachedShopConfiguration(): void
+    {
+        $shopId = 1;
+        $templateModule1 = new ModuleTemplateType('template1', 'module1');
+        $chain = new TemplateChain();
+        $chain->append($templateModule1);
+
+        $moduleTemplateExtensionsChain = new ModuleTemplateExtensionChain([]);
+
+        $templateExtensionChainDao = $this->prophesize(TemplateExtensionChainDaoInterface::class);
+        $templateExtensionChainDao->getChain($shopId)->willReturn($moduleTemplateExtensionsChain)->shouldBeCalledOnce();
+
+        $context = $this->prophesize(ContextInterface::class);
+        $context->getCurrentShopId()->willReturn($shopId);
+
+        $this->sortingConfigurationValidator = $this->prophesize(SortingConfigurationValidatorInterface::class);
+        $this->logger = $this->prophesize(LoggerInterface::class);
+
+        $this->chainSorter = new TemplateChainSorter(
+            $this->sortingConfigurationValidator->reveal(),
+            $templateExtensionChainDao->reveal(),
+            $context->reveal(),
+            $this->logger->reveal(),
+        );
+
+        $chain1 = new TemplateChain();
+        $chain1->append($templateModule1);
+        $this->chainSorter->sort($chain1, $templateModule1);
+
+        $chain2 = new TemplateChain();
+        $chain2->append($templateModule1);
+        $this->chainSorter->sort($chain2, $templateModule1);
+    }
+
     private function prepareChainSortersConfiguration(string $templateName, array $loadOrder): void
     {
         $shopId = 1;
         $moduleTemplateExtensionsChain = new ModuleTemplateExtensionChain([$templateName => $loadOrder]);
 
-        $shopConfiguration = $this->prophesize(ShopConfiguration::class);
-        $shopConfigurationDao = $this->prophesize(ShopConfigurationDaoInterface::class);
+        $templateExtensionChainDao = $this->prophesize(TemplateExtensionChainDaoInterface::class);
         $context = $this->prophesize(ContextInterface::class);
 
-        $shopConfiguration->getModuleTemplateExtensionChain()->willReturn($moduleTemplateExtensionsChain);
-        $shopConfigurationDao->get($shopId)->willReturn($shopConfiguration);
+        $templateExtensionChainDao->getChain($shopId)->willReturn($moduleTemplateExtensionsChain);
         $context->getCurrentShopId()->willReturn($shopId);
 
         $this->logger = $this->prophesize(LoggerInterface::class);
@@ -181,7 +212,7 @@ private function prepareChainSortersConfiguration(string $templateName, array $l
 
         $this->chainSorter = new TemplateChainSorter(
             $this->sortingConfigurationValidator->reveal(),
-            $shopConfigurationDao->reveal(),
+            $templateExtensionChainDao->reveal(),
             $context->reveal(),
             $this->logger->reveal(),
         );