Merge branch 'b-7.1.x' into b-8.0.x

OXID-eSales · Jan 11, 2024 · f8f170e · f8f170e
2 parents a32da5f + 16a8274
commit f8f170e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 45 deletions.
diff --git a/src/TwigEngine.php b/src/TwigEngine.php
@@ -38,16 +38,6 @@ public function __construct(
         }
     }
 
-    /**
-     * Renders a template.
-     *
-     * @param string $name    A template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The evaluated template as a string
-     *
-     * @throws \RuntimeException if the template cannot be rendered
-     */
     public function render(string $name, array $context = []): string
     {
         return $this->engine->render(
@@ -56,62 +46,35 @@ public function render(string $name, array $context = []): string
         );
     }
 
-    /**
-     * Returns true if the template exists.
-     *
-     * @param string $name A template name
-     *
-     * @return bool true if the template exists, false otherwise
-     *
-     * @throws \RuntimeException if the engine cannot handle the template name
-     */
     public function exists(string $name): bool
     {
-        return $this->engine->getLoader()->exists($name . '.' . $this->fileExtension);
+        if (!str_ends_with($name, $this->fileExtension)) {
+            $name .= ".$this->fileExtension";
+        }
+        return $this->engine->getLoader()->exists($name);
     }
 
-    /**
-     * Renders a fragment of the template.
-     *
-     * @param string $fragment   The template fragment to render
-     * @param string $fragmentId The Id of the fragment
-     * @param array  $context    An array of parameters to pass to the template
-     *
-     * @return string
-     */
     public function renderFragment(string $fragment, string $fragmentId, array $context = []): string
     {
         return $this->engine
             ->createTemplate($fragment, $fragmentId)
             ->render($context);
     }
 
-    /**
-     * @param string $name
-     * @param mixed  $value
-     */
     public function addGlobal(string $name, $value)
     {
         $this->engine->addGlobal($name, $value);
     }
 
-    /**
-     * Returns assigned globals.
-     *
-     * @return array
-     */
     public function getGlobals(): array
     {
         return $this->engine->getGlobals();
     }
 
-    /**
-     * @param EscaperInterface $escaper
-     */
     public function addEscaper(EscaperInterface $escaper)
     {
-        /** @var EscaperExtension $escaperExtension */
-        $escaperExtension = $this->engine->getExtension(EscaperExtension::class);
-        $escaperExtension->setEscaper($escaper->getStrategy(), [$escaper, 'escape']);
+        $this->engine
+            ->getExtension(EscaperExtension::class)
+            ->setEscaper($escaper->getStrategy(), [$escaper, 'escape']);
     }
 }
diff --git a/tests/Integration/TwigEngineTest.php b/tests/Integration/TwigEngineTest.php
@@ -46,6 +46,15 @@ public function testExists(): void
         $this->assertFalse($engine->exists('foo'));
     }
 
+    public function testExistsWithFileExtension(): void
+    {
+        $this->assertTrue(
+            $this
+                ->getEngine()
+                ->exists("$this->template.$this->extension")
+        );
+    }
+
     public function testAddGlobal(): void
     {
         $engine = $this->getEngine();
@@ -101,7 +110,7 @@ private function getEngine(): TwigEngine
 
     private function getTemplateName(): string
     {
-        return "{$this->template}.{$this->extension}";
+        return "$this->template.$this->extension";
     }
 
     private function getTemplateDir(): string