diff --git a/app/dependencies.php b/app/dependencies.php index 8d600c27e3c9cccab0ec81b6ae66b67ba433141a..f7a2b4617b6089969708a623ce770b06645e09e4 100644 --- a/app/dependencies.php +++ b/app/dependencies.php @@ -23,9 +23,8 @@ $container['view'] = function ($c) { $c->get('request')->getUri() )); $view->addExtension(new Twig_Extension_Debug()); - $view->addExtension(new GrEduLabs\Twig\Extension\Flash( - $c->get('flash'), - 'flash.twig' + $view->addExtension(new Knlv\Slim\Views\TwigMessages( + $c->get('flash') )); return $view; diff --git a/app/src/Twig/Extension/Flash.php b/app/src/Twig/Extension/Flash.php deleted file mode 100644 index 3b6b809128870aafaf2c598a512ff2a048e3cb53..0000000000000000000000000000000000000000 --- a/app/src/Twig/Extension/Flash.php +++ /dev/null @@ -1,76 +0,0 @@ -flash = $flash; - $this->template = $template; - } - - public function getName() - { - return 'slim-flash'; - } - - public function initRuntime(Twig_Environment $environment) - { - $this->environment = $environment; - } - - public function getFunctions() - { - return [ - new Twig_SimpleFunction('flash', [$this, 'messages'], [ - 'needs_environment' => true, - 'is_safe' => ['all'], - ]), - ]; - } - - public function messages() - { - $response = ''; - $allMessages = $this->flash->getMessages(); - - if (!empty($allMessages)) { - foreach ($allMessages as $class => $messages) { - $response .= $this->environment->render($this->template, [ - 'class' => $class, - 'messages' => $messages, - ]); - } - } - - return $response; - } -} diff --git a/app/templates/flash.twig b/app/templates/flash.twig index 26135b3f14fae4d45f4cd4aa05c45a8bdaa783f5..e52d69a00620617a9518054851aded40c781c65a 100644 --- a/app/templates/flash.twig +++ b/app/templates/flash.twig @@ -1,5 +1,7 @@ -