Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/Template/Twig.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,17 @@ public function render(): string
*/
public static function addExtension(\Twig\Extension\ExtensionInterface $extension): void
{
self::twig()->addExtension($extension);
$twig = self::twig();

if ($extension instanceof \Twig\Extension\AttributeExtension) {
$extension_class = $extension->getClass();
} else {
$extension_class = $extension::class;
}

if (!$twig->hasExtension($extension_class)) {
self::twig()->addExtension($extension);
}
}

/**
Expand Down
4 changes: 0 additions & 4 deletions src/Tests/ApplicationHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ trait ApplicationHelper
#[\PHPUnit\Framework\Attributes\BeforeClass]
public static function loadApplication(): void
{
// This avoids to register extensions multiple times (normally done in
// the Application class constructor) as it would fail.
\Minz\Template\Twig::reset();

$app_name = \Minz\Configuration::$app_name;
$application_class_name = "\\{$app_name}\\Application";
try {
Expand Down