OXDEV-9553 Draft

Author: AshrafOxid

src/Resolver/TemplateChain/DataObject/TemplateChain.php

@@ -11,6 +11,7 @@
 
 use ArrayIterator;
 use IteratorAggregate;
+use OxidEsales\Twig\Resolver\TemplateChain\TemplateType\DataObject\ModuleExtensionTemplateType;
 use OxidEsales\Twig\Resolver\TemplateChain\TemplateType\DataObject\TemplateTypeInterface;
 use Traversable;
 
@@ -94,4 +95,9 @@ public function getIterator(): Traversable
     {
         return new ArrayIterator($this->chain);
     }
+
+    public function prepend(ModuleExtensionTemplateType $templateType)
+    {
+        $this->chain = [$templateType->getFullyQualifiedName() => $templateType] + $this->chain;
+    }
 }

src/Resolver/TemplateChain/TemplateHandler/ModuleExtensions/ModuleTemplateHandler.php

@@ -32,6 +32,10 @@ public function addToChain(
             return $templateChain;
         }
         $extension = $this->getExtension($templateType, $directory);
+        if ($templateChain->hasModuleId($extension->getParentNamespace()) && $extension->getParentNamespace() !== $extension->getNamespace()) {
+            $templateChain->prepend($extension);
+            return $templateChain;
+        }
         return $this->chainAppender->addToChain($templateChain, $extension, $directory);
     }