From 768318b43af3611e452694dffa083ce6a735b325 Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Wed, 31 May 2023 16:22:03 +0100 Subject: [PATCH] Fixed extension clashes --- src/Controller/TaskController.php | 2 +- src/ServicesProvider/ServicesProvider.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Controller/TaskController.php b/src/Controller/TaskController.php index 348c5fe..913de16 100644 --- a/src/Controller/TaskController.php +++ b/src/Controller/TaskController.php @@ -107,4 +107,4 @@ class TaskController extends SimpleController 'tasks' => $tasks ]); } -} +} \ No newline at end of file diff --git a/src/ServicesProvider/ServicesProvider.php b/src/ServicesProvider/ServicesProvider.php index c999de6..71cd22e 100644 --- a/src/ServicesProvider/ServicesProvider.php +++ b/src/ServicesProvider/ServicesProvider.php @@ -50,7 +50,9 @@ class ServicesProvider $container->extend('view', function ($view, $c) { $twig = $view->getEnvironment(); - $twig->addExtension(new IntlExtension()); + if (!$twig->hasExtension('Twig\Extra\Intl\IntlExtension')) { + $twig->addExtension(new IntlExtension()); + } $twig->addExtension(new FormatCronExtension($c)); return $view;