Added template_suffix configuration to twig engine. (#6402)

chenkby · sy-records · web-flow · commit f4ebe41d947a · 2023-12-21T20:34:18.000+08:00
Co-authored-by: sy-records &lt;52o@qq52o.cn&gt;
diff --git a/src/Engine/TwigEngine.php b/src/Engine/TwigEngine.php
@@ -21,6 +21,10 @@ public function render(string $template, array $data, array $config): string
         $loader = new FilesystemLoader($config['view_path']);
         $twig = new Environment($loader, ['cache' => $config['cache_path']]);
 
+        if ($suffix = $config['template_suffix'] ?? '') {
+            $template .= $suffix;
+        }
+
         return $twig->render($template, $data);
     }
 }
diff --git a/tests/TwigTest.php b/tests/TwigTest.php
@@ -41,6 +41,29 @@ public function testRender()
 <body>
 Hello, Hyperf. You are using twig template now.
 </body>
+</html>', $res);
+    }
+
+    public function testConfig()
+    {
+        $config = [
+            'view_path' => __DIR__ . '/tpl',
+            'cache_path' => __DIR__ . '/runtime',
+            'template_suffix' => '.twig',
+        ];
+
+        $engine = new TwigEngine();
+        $res = $engine->render('index', ['name' => 'Hyperf'], $config);
+
+        $this->assertEquals('<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Hyperf</title>
+</head>
+<body>
+Hello, Hyperf. You are using twig template now.
+</body>
 </html>', $res);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ public function render(string $template, array $data, array $config): string`
`21`	`21`	`$loader = new FilesystemLoader($config['view_path']);`
`22`	`22`	`$twig = new Environment($loader, ['cache' => $config['cache_path']]);`
`23`	`23`
	`24`	`+ if ($suffix = $config['template_suffix'] ?? '') {`
	`25`	`+ $template .= $suffix;`
	`26`	`+ }`
	`27`	`+`
`24`	`28`	`return $twig->render($template, $data);`
`25`	`29`	`}`
`26`	`30`	`}`