From bb3d16d273bb3e4552e4869dd22cb2c2d81f5387 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 26 Aug 2018 02:54:52 +0200
Subject: Added Twig template renderer, closes #338

---
 config/app.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/app.php')

diff --git a/config/app.php b/config/app.php
index 9af35eb4..13d4d22b 100644
--- a/config/app.php
+++ b/config/app.php
@@ -10,6 +10,7 @@ return [
         \Engelsystem\Config\ConfigServiceProvider::class,
         \Engelsystem\Http\UrlGeneratorServiceProvider::class,
         \Engelsystem\Renderer\RendererServiceProvider::class,
+        \Engelsystem\Renderer\TwigServiceProvider::class,
         \Engelsystem\Database\DatabaseServiceProvider::class,
         \Engelsystem\Http\RequestServiceProvider::class,
         \Engelsystem\Http\SessionServiceProvider::class,
-- 
cgit v1.2.3-54-g00ecf


From 427315195bdd379a0207fc9b2aaf69a5b5b86c79 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 28 Aug 2018 22:23:59 +0200
Subject: Moved translation/internationalization to Helpers\Translator class

---
 config/app.php                                     |   2 +
 includes/engelsystem.php                           |   6 --
 includes/helper/email_helper.php                   |   8 +-
 includes/helper/internationalization_helper.php    |  80 ----------------
 includes/includes.php                              |   1 -
 includes/sys_form.php                              |   5 +-
 includes/sys_menu.php                              |  26 ++++-
 src/Helpers/TranslationServiceProvider.php         |  58 ++++++++++++
 src/Helpers/Translator.php                         | 105 +++++++++++++++++++++
 src/Middleware/SetLocale.php                       |  49 ++++++++++
 src/helpers.php                                    |  35 +++++++
 .../Helpers/TranslationServiceProviderTest.php     |  86 +++++++++++++++++
 tests/Unit/Helpers/TranslatorTest.php              |  69 ++++++++++++++
 tests/Unit/HelpersTest.php                         |  26 ++++-
 tests/Unit/Middleware/SetLocaleTest.php            |  71 ++++++++++++++
 15 files changed, 534 insertions(+), 93 deletions(-)
 delete mode 100644 includes/helper/internationalization_helper.php
 create mode 100644 src/Helpers/TranslationServiceProvider.php
 create mode 100644 src/Helpers/Translator.php
 create mode 100644 src/Middleware/SetLocale.php
 create mode 100644 tests/Unit/Helpers/TranslationServiceProviderTest.php
 create mode 100644 tests/Unit/Helpers/TranslatorTest.php
 create mode 100644 tests/Unit/Middleware/SetLocaleTest.php

(limited to 'config/app.php')

diff --git a/config/app.php b/config/app.php
index 13d4d22b..ea394b8e 100644
--- a/config/app.php
+++ b/config/app.php
@@ -14,6 +14,7 @@ return [
         \Engelsystem\Database\DatabaseServiceProvider::class,
         \Engelsystem\Http\RequestServiceProvider::class,
         \Engelsystem\Http\SessionServiceProvider::class,
+        \Engelsystem\Helpers\TranslationServiceProvider::class,
         \Engelsystem\Http\ResponseServiceProvider::class,
         \Engelsystem\Http\Psr7ServiceProvider::class,
         \Engelsystem\Middleware\RouteDispatcherServiceProvider::class,
@@ -24,6 +25,7 @@ return [
     'middleware' => [
         \Engelsystem\Middleware\SendResponseHandler::class,
         \Engelsystem\Middleware\ExceptionHandler::class,
+        \Engelsystem\Middleware\SetLocale::class,
         \Engelsystem\Middleware\RouteDispatcher::class,
         \Engelsystem\Middleware\RequestHandler::class,
     ],
diff --git a/includes/engelsystem.php b/includes/engelsystem.php
index eb5b220a..4c096b43 100644
--- a/includes/engelsystem.php
+++ b/includes/engelsystem.php
@@ -21,12 +21,6 @@ if ($app->get('config')->get('maintenance')) {
 }
 
 
-/**
- * Init translations
- */
-gettext_init();
-
-
 /**
  * Init authorization
  */
diff --git a/includes/helper/email_helper.php b/includes/helper/email_helper.php
index c223d026..8d1cb794 100644
--- a/includes/helper/email_helper.php
+++ b/includes/helper/email_helper.php
@@ -15,14 +15,16 @@ function engelsystem_email_to_user($recipient_user, $title, $message, $not_if_it
         return true;
     }
 
-    gettext_locale($recipient_user['Sprache']);
+    /** @var \Engelsystem\Helpers\Translator $translator */
+    $translator = app()->get('translator');
+    $locale = $translator->getLocale();
 
+    $translator->setLocale($recipient_user['Sprache']);
     $message = sprintf(_('Hi %s,'), $recipient_user['Nick']) . "\n\n"
         . _('here is a message for you from the engelsystem:') . "\n\n"
         . $message . "\n\n"
         . _('This email is autogenerated and has not been signed. You got this email because you are registered in the engelsystem.');
-
-    gettext_locale();
+    $translator->setLocale($locale);
 
     return engelsystem_email($recipient_user['email'], $title, $message);
 }
diff --git a/includes/helper/internationalization_helper.php b/includes/helper/internationalization_helper.php
deleted file mode 100644
index bb6d0abd..00000000
--- a/includes/helper/internationalization_helper.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * Return currently active locale
- *
- * @return string
- */
-function locale()
-{
-    return session()->get('locale');
-}
-
-/**
- * Returns two letter language code from currently active locale
- *
- * @return string
- */
-function locale_short()
-{
-    return substr(locale(), 0, 2);
-}
-
-/**
- * Initializes gettext for internationalization and updates the sessions locale to use for translation.
- */
-function gettext_init()
-{
-    $locales = config('locales');
-    $request = request();
-    $session = session();
-
-    if ($request->has('set_locale') && isset($locales[$request->input('set_locale')])) {
-        $session->set('locale', $request->input('set_locale'));
-    } elseif (!$session->has('locale')) {
-        $session->set('locale', config('default_locale'));
-    }
-
-    gettext_locale();
-    bindtextdomain('default', app('path.lang'));
-    bind_textdomain_codeset('default', 'UTF-8');
-    textdomain('default');
-}
-
-/**
- * Swich gettext locale.
- *
- * @param string $locale
- */
-function gettext_locale($locale = null)
-{
-    if (empty($locale)) {
-        $locale = session()->get('locale');
-    }
-
-    putenv('LC_ALL=' . $locale);
-    setlocale(LC_ALL, $locale);
-}
-
-/**
- * Renders language selection.
- *
- * @return array
- */
-function make_langselect()
-{
-    $request = app('request');
-
-    $items = [];
-    foreach (config('locales') as $locale => $name) {
-        $url = url($request->getPathInfo(), ['set_locale' => $locale]);
-
-        $items[] = toolbar_item_link(
-            htmlspecialchars($url),
-            '',
-            $name,
-            $locale == locale()
-        );
-    }
-    return $items;
-}
diff --git a/includes/includes.php b/includes/includes.php
index e316e550..7a68c3c9 100644
--- a/includes/includes.php
+++ b/includes/includes.php
@@ -61,7 +61,6 @@ $includeFiles = [
     __DIR__ . '/../includes/controller/user_worklog_controller.php',
 
     __DIR__ . '/../includes/helper/graph_helper.php',
-    __DIR__ . '/../includes/helper/internationalization_helper.php',
     __DIR__ . '/../includes/helper/message_helper.php',
     __DIR__ . '/../includes/helper/error_helper.php',
     __DIR__ . '/../includes/helper/email_helper.php',
diff --git a/includes/sys_form.php b/includes/sys_form.php
index 05df4c15..9cb6f38d 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -66,6 +66,9 @@ function form_date($name, $label, $value, $start_date = '', $end_date = '')
     $value = is_numeric($value) ? date('Y-m-d', $value) : '';
     $start_date = is_numeric($start_date) ? date('Y-m-d', $start_date) : '';
     $end_date = is_numeric($end_date) ? date('Y-m-d', $end_date) : '';
+    $locale = $locale = session()->get('locale');
+    $shortLocale = substr($locale, 0, 2);
+
     return form_element($label, '
     <div class="input-group date" id="' . $dom_id . '">
       <input name="' . $name . '" class="form-control" value="' . htmlspecialchars($value) . '">'
@@ -74,7 +77,7 @@ function form_date($name, $label, $value, $start_date = '', $end_date = '')
     <script type="text/javascript">
 			$(function(){
         $("#' . $dom_id . '").datepicker({
-				  language: "' . locale_short() . '",
+				  language: "' . $shortLocale . '",
           todayBtn: "linked",
           format: "yyyy-mm-dd",
           startDate: "' . $start_date . '",
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 85ef1287..58d4bab3 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -110,7 +110,7 @@ function make_user_submenu()
 {
     global $privileges, $page;
 
-    $user_submenu = make_langselect();
+    $user_submenu = make_language_select();
 
     if (in_array('user_settings', $privileges) || in_array('logout', $privileges)) {
         $user_submenu[] = toolbar_item_divider();
@@ -227,6 +227,30 @@ function make_room_navigation($menu)
     return $menu;
 }
 
+/**
+ * Renders language selection.
+ *
+ * @return array
+ */
+function make_language_select()
+{
+    $request = app('request');
+    $activeLocale = session()->get('locale');
+
+    $items = [];
+    foreach (config('locales') as $locale => $name) {
+        $url = url($request->getPathInfo(), ['set-locale' => $locale]);
+
+        $items[] = toolbar_item_link(
+            htmlspecialchars($url),
+            '',
+            $name,
+            $locale == $activeLocale
+        );
+    }
+    return $items;
+}
+
 /**
  * @return string
  */
diff --git a/src/Helpers/TranslationServiceProvider.php b/src/Helpers/TranslationServiceProvider.php
new file mode 100644
index 00000000..9d86df7d
--- /dev/null
+++ b/src/Helpers/TranslationServiceProvider.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Engelsystem\Helpers;
+
+use Engelsystem\Config\Config;
+use Engelsystem\Container\ServiceProvider;
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class TranslationServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        /** @var Config $config */
+        $config = $this->app->get('config');
+        /** @var Session $session */
+        $session = $this->app->get('session');
+
+        $locales = $config->get('locales');
+        $locale = $config->get('default_locale');
+
+        $sessionLocale = $session->get('locale', $locale);
+        if (isset($locales[$sessionLocale])) {
+            $locale = $sessionLocale;
+        }
+
+        $this->initGettext();
+        $session->set('locale', $locale);
+
+        $translator = $this->app->make(
+            Translator::class,
+            ['locale' => $locale, 'locales' => $locales, 'localeChangeCallback' => [$this, 'setLocale']]
+        );
+        $this->app->instance(Translator::class, $translator);
+        $this->app->instance('translator', $translator);
+    }
+
+    /**
+     * @param string $textDomain
+     * @param string $encoding
+     * @codeCoverageIgnore
+     */
+    protected function initGettext($textDomain = 'default', $encoding = 'UTF-8')
+    {
+        bindtextdomain($textDomain, $this->app->get('path.lang'));
+        bind_textdomain_codeset($textDomain, $encoding);
+        textdomain($textDomain);
+    }
+
+    /**
+     * @param string $locale
+     * @codeCoverageIgnore
+     */
+    public function setLocale($locale)
+    {
+        putenv('LC_ALL=' . $locale);
+        setlocale(LC_ALL, $locale);
+    }
+}
diff --git a/src/Helpers/Translator.php b/src/Helpers/Translator.php
new file mode 100644
index 00000000..1e953a21
--- /dev/null
+++ b/src/Helpers/Translator.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Engelsystem\Helpers;
+
+class Translator
+{
+    /** @var string[] */
+    protected $locales;
+
+    /** @var string */
+    protected $locale;
+
+    /** @var callable */
+    protected $localeChangeCallback;
+
+    /**
+     * Translator constructor.
+     *
+     * @param string   $locale
+     * @param string[] $locales
+     * @param callable $localeChangeCallback
+     */
+    public function __construct(string $locale, array $locales = [], callable $localeChangeCallback = null)
+    {
+        $this->localeChangeCallback = $localeChangeCallback;
+
+        $this->setLocale($locale);
+        $this->setLocales($locales);
+    }
+
+    /**
+     * Get the translation for a given key
+     *
+     * @param string $key
+     * @param array  $replace
+     * @return string
+     */
+    public function translate(string $key, array $replace = []): string
+    {
+        $translated = $this->translateGettext($key);
+
+        if (!empty($replace)) {
+            $translated = call_user_func_array('sprintf', array_merge([$translated], $replace));
+        }
+
+        return $translated;
+    }
+
+    /**
+     * Translate the key via gettext
+     *
+     * @param string $key
+     * @return string
+     * @codeCoverageIgnore
+     */
+    protected function translateGettext(string $key): string
+    {
+        return _($key);
+    }
+
+    /**
+     * @return string
+     */
+    public function getLocale(): string
+    {
+        return $this->locale;
+    }
+
+    /**
+     * @param string $locale
+     */
+    public function setLocale(string $locale)
+    {
+        $this->locale = $locale;
+
+        if (is_callable($this->localeChangeCallback)) {
+            call_user_func_array($this->localeChangeCallback, [$locale]);
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getLocales(): array
+    {
+        return $this->locales;
+    }
+
+    /**
+     * @param string $locale
+     * @return bool
+     */
+    public function hasLocale(string $locale): bool
+    {
+        return isset($this->locales[$locale]);
+    }
+
+    /**
+     * @param string[] $locales
+     */
+    public function setLocales(array $locales)
+    {
+        $this->locales = $locales;
+    }
+}
diff --git a/src/Middleware/SetLocale.php b/src/Middleware/SetLocale.php
new file mode 100644
index 00000000..86fa0b7f
--- /dev/null
+++ b/src/Middleware/SetLocale.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Engelsystem\Middleware;
+
+use Engelsystem\Helpers\Translator;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class SetLocale implements MiddlewareInterface
+{
+    /** @var Translator */
+    protected $translator;
+
+    /** @var Session */
+    protected $session;
+
+    /**
+     * @param Translator $translator
+     * @param Session    $session
+     */
+    public function __construct(Translator $translator, Session $session)
+    {
+        $this->translator = $translator;
+        $this->session = $session;
+    }
+
+    /**
+     * Process an incoming server request and setting the locale if required
+     *
+     * @param ServerRequestInterface  $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        $query = $request->getQueryParams();
+        if (isset($query['set-locale']) && $this->translator->hasLocale($query['set-locale'])) {
+            $locale = $query['set-locale'];
+
+            $this->translator->setLocale($locale);
+            $this->session->set('locale', $locale);
+        }
+
+        return $handler->handle($request);
+    }
+}
diff --git a/src/helpers.php b/src/helpers.php
index 336f81fe..3a182bf7 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -3,6 +3,7 @@
 
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
+use Engelsystem\Helpers\Translator;
 use Engelsystem\Http\Request;
 use Engelsystem\Http\Response;
 use Engelsystem\Http\UrlGenerator;
@@ -118,6 +119,40 @@ function session($key = null, $default = null)
     return $session->get($key, $default);
 }
 
+/**
+ * Translate the given message
+ *
+ * @param  string $key
+ * @param  array  $replace
+ * @return string|Translator
+ */
+function trans($key = null, $replace = [])
+{
+    /** @var Translator $translator */
+    $translator = app('translator');
+
+    if (is_null($key)) {
+        return $translator;
+    }
+
+    return $translator->translate($key, $replace);
+}
+
+/**
+ * Translate the given message
+ *
+ * @param  string $key
+ * @param  array  $replace
+ * @return string
+ */
+function __($key, $replace = [])
+{
+    /** @var Translator $translator */
+    $translator = app('translator');
+
+    return $translator->translate($key, $replace);
+}
+
 /**
  * @param string $path
  * @param array  $parameters
diff --git a/tests/Unit/Helpers/TranslationServiceProviderTest.php b/tests/Unit/Helpers/TranslationServiceProviderTest.php
new file mode 100644
index 00000000..c5ba7386
--- /dev/null
+++ b/tests/Unit/Helpers/TranslationServiceProviderTest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Helpers;
+
+use Engelsystem\Config\Config;
+use Engelsystem\Helpers\TranslationServiceProvider;
+use Engelsystem\Helpers\Translator;
+use Engelsystem\Test\Unit\ServiceProviderTest;
+use PHPUnit\Framework\MockObject\MockObject;
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class TranslationServiceProviderTest extends ServiceProviderTest
+{
+    /**
+     * @covers \Engelsystem\Helpers\TranslationServiceProvider::register()
+     */
+    public function testRegister()
+    {
+        $app = $this->getApp(['make', 'instance', 'get']);
+        /** @var Config|MockObject $config */
+        $config = $this->createMock(Config::class);
+        /** @var Session|MockObject $session */
+        $session = $this->createMock(Session::class);
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+
+        /** @var TranslationServiceProvider|MockObject $serviceProvider */
+        $serviceProvider = $this->getMockBuilder(TranslationServiceProvider::class)
+            ->setConstructorArgs([$app])
+            ->setMethods(['initGettext', 'setLocale'])
+            ->getMock();
+
+        $serviceProvider->expects($this->once())
+            ->method('initGettext');
+
+        $app->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(['config'], ['session'])
+            ->willReturnOnConsecutiveCalls($config, $session);
+
+        $defaultLocale = 'fo_OO';
+        $locale = 'te_ST.WTF-9';
+        $locales = ['fo_OO' => 'Foo', 'fo_OO.BAR' => 'Foo (Bar)', 'te_ST.WTF-9' => 'WTF\'s Testing?'];
+        $config->expects($this->exactly(2))
+            ->method('get')
+            ->withConsecutive(
+                ['locales'],
+                ['default_locale']
+            )
+            ->willReturnOnConsecutiveCalls(
+                $locales,
+                $defaultLocale
+            );
+
+        $session->expects($this->once())
+            ->method('get')
+            ->with('locale', $defaultLocale)
+            ->willReturn($locale);
+        $session->expects($this->once())
+            ->method('set')
+            ->with('locale', $locale);
+
+        $app->expects($this->once())
+            ->method('make')
+            ->with(
+                Translator::class,
+                [
+                    'locale'               => $locale,
+                    'locales'              => $locales,
+                    'localeChangeCallback' => [$serviceProvider, 'setLocale']
+                ]
+            )
+            ->willReturn($translator);
+
+        $app->expects($this->exactly(2))
+            ->method('instance')
+            ->withConsecutive(
+                [Translator::class, $translator],
+                ['translator', $translator]
+            );
+
+        $serviceProvider->register();
+    }
+}
+
+
diff --git a/tests/Unit/Helpers/TranslatorTest.php b/tests/Unit/Helpers/TranslatorTest.php
new file mode 100644
index 00000000..396d2b65
--- /dev/null
+++ b/tests/Unit/Helpers/TranslatorTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Helpers;
+
+use Engelsystem\Helpers\Translator;
+use Engelsystem\Test\Unit\ServiceProviderTest;
+use PHPUnit\Framework\MockObject\MockObject;
+use stdClass;
+
+class TranslatorTest extends ServiceProviderTest
+{
+    /**
+     * @covers \Engelsystem\Helpers\Translator::__construct()
+     * @covers \Engelsystem\Helpers\Translator::setLocale()
+     * @covers \Engelsystem\Helpers\Translator::setLocales()
+     * @covers \Engelsystem\Helpers\Translator::getLocale()
+     * @covers \Engelsystem\Helpers\Translator::getLocales()
+     * @covers \Engelsystem\Helpers\Translator::hasLocale()
+     */
+    public function testInit()
+    {
+        $locales = ['te_ST.ER-01' => 'Tests', 'fo_OO' => 'SomeFOO'];
+        $locale = 'te_ST.ER-01';
+
+        /** @var callable|MockObject $callable */
+        $callable = $this->getMockBuilder(stdClass::class)
+            ->setMethods(['__invoke'])
+            ->getMock();
+        $callable->expects($this->exactly(2))
+            ->method('__invoke')
+            ->withConsecutive(['te_ST.ER-01'], ['fo_OO']);
+
+        $translator = new Translator($locale, $locales, $callable);
+
+        $this->assertEquals($locales, $translator->getLocales());
+        $this->assertEquals($locale, $translator->getLocale());
+
+        $translator->setLocale('fo_OO');
+        $this->assertEquals('fo_OO', $translator->getLocale());
+
+        $newLocales = ['lo_RM' => 'Lorem', 'ip_SU-M' => 'Ipsum'];
+        $translator->setLocales($newLocales);
+        $this->assertEquals($newLocales, $translator->getLocales());
+
+        $this->assertTrue($translator->hasLocale('ip_SU-M'));
+        $this->assertFalse($translator->hasLocale('te_ST.ER-01'));
+    }
+
+    /**
+     * @covers \Engelsystem\Helpers\Translator::translate()
+     */
+    public function testTranslate()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->getMockBuilder(Translator::class)
+            ->setConstructorArgs(['de_DE.UTF-8', ['de_DE.UTF-8' => 'Deutsch']])
+            ->setMethods(['translateGettext'])
+            ->getMock();
+        $translator->expects($this->once())
+            ->method('translateGettext')
+            ->with('My favourite number is %u!')
+            ->willReturn('Meine Lieblingszahl ist die %u!');
+
+        $return = $translator->translate('My favourite number is %u!', [3]);
+        $this->assertEquals('Meine Lieblingszahl ist die 3!', $return);
+    }
+}
+
+
diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php
index b59b11ee..20d3c2de 100644
--- a/tests/Unit/HelpersTest.php
+++ b/tests/Unit/HelpersTest.php
@@ -5,10 +5,11 @@ namespace Engelsystem\Test\Unit;
 use Engelsystem\Application;
 use Engelsystem\Config\Config;
 use Engelsystem\Container\Container;
+use Engelsystem\Helpers\Translator;
 use Engelsystem\Http\Request;
 use Engelsystem\Http\Response;
-use Engelsystem\Renderer\Renderer;
 use Engelsystem\Http\UrlGenerator;
+use Engelsystem\Renderer\Renderer;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
@@ -194,6 +195,29 @@ class HelpersTest extends TestCase
         $this->assertEquals('rendered template', view('template.name', ['template' => 'data']));
     }
 
+    /**
+     * @covers \__
+     * @covers \trans
+     */
+    public function testTrans()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->getMockBuilder(Translator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->getAppMock('translator', $translator);
+
+        $translator->expects($this->exactly(2))
+            ->method('translate')
+            ->with('Lorem %s Ipsum', ['foo'])
+            ->willReturn('Lorem foo Ipsum');
+
+        $this->assertEquals($translator, trans());
+        $this->assertEquals('Lorem foo Ipsum', trans('Lorem %s Ipsum', ['foo']));
+        $this->assertEquals('Lorem foo Ipsum', __('Lorem %s Ipsum', ['foo']));
+    }
+
     /**
      * @covers \url
      */
diff --git a/tests/Unit/Middleware/SetLocaleTest.php b/tests/Unit/Middleware/SetLocaleTest.php
new file mode 100644
index 00000000..c4e9d2a4
--- /dev/null
+++ b/tests/Unit/Middleware/SetLocaleTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Middleware;
+
+use Engelsystem\Helpers\Translator;
+use Engelsystem\Middleware\SetLocale;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Session;
+
+class SetLocaleTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Middleware\SetLocale::__construct
+     * @covers \Engelsystem\Middleware\SetLocale::process
+     */
+    public function testRegister()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+        /** @var Session|MockObject $session */
+        $session = $this->createMock(Session::class);
+        /** @var ServerRequestInterface|MockObject $request */
+        $request = $this->getMockForAbstractClass(ServerRequestInterface::class);
+        /** @var RequestHandlerInterface|MockObject $handler */
+        $handler = $this->getMockForAbstractClass(RequestHandlerInterface::class);
+        /** @var ResponseInterface|MockObject $response */
+        $response = $this->getMockForAbstractClass(ResponseInterface::class);
+
+        $locale = 'te_ST.UTF8';
+
+        $request->expects($this->exactly(3))
+            ->method('getQueryParams')
+            ->willReturnOnConsecutiveCalls(
+                [],
+                ['set-locale' => 'en_US.UTF8'],
+                ['set-locale' => $locale]
+            );
+
+        $translator->expects($this->exactly(2))
+            ->method('hasLocale')
+            ->withConsecutive(
+                ['en_US.UTF8'],
+                [$locale]
+            )
+            ->willReturnOnConsecutiveCalls(
+                false,
+                true
+            );
+        $translator->expects($this->once())
+            ->method('setLocale')
+            ->with($locale);
+
+        $session->expects($this->once())
+            ->method('set')
+            ->with('locale', $locale);
+
+        $handler->expects($this->exactly(3))
+            ->method('handle')
+            ->with($request)
+            ->willReturn($response);
+
+        $middleware = new SetLocale($translator, $session);
+        $middleware->process($request, $handler);
+        $middleware->process($request, $handler);
+        $middleware->process($request, $handler);
+    }
+}
-- 
cgit v1.2.3-54-g00ecf


From a2c47304d8230f1937c2a4f019aba89fa74203bc Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 29 Aug 2018 13:58:50 +0200
Subject: Added generic error pages

---
 config/app.php                                     |  1 +
 src/Http/Response.php                              | 41 ++++++++++
 src/Middleware/ErrorHandler.php                    | 80 ++++++++++++++++++++
 src/Middleware/LegacyMiddleware.php                | 10 +--
 src/Renderer/RendererServiceProvider.php           |  2 +
 templates/errors/default.twig                      |  7 ++
 tests/Unit/Http/ResponseTest.php                   | 37 ++++++++-
 tests/Unit/Middleware/ErrorHandlerTest.php         | 88 ++++++++++++++++++++++
 .../Stub/ReturnResponseMiddlewareHandler.php       | 10 +++
 .../Unit/Renderer/RendererServiceProviderTest.php  |  4 +-
 10 files changed, 272 insertions(+), 8 deletions(-)
 create mode 100644 src/Middleware/ErrorHandler.php
 create mode 100644 templates/errors/default.twig
 create mode 100644 tests/Unit/Middleware/ErrorHandlerTest.php

(limited to 'config/app.php')

diff --git a/config/app.php b/config/app.php
index ea394b8e..19118f1d 100644
--- a/config/app.php
+++ b/config/app.php
@@ -26,6 +26,7 @@ return [
         \Engelsystem\Middleware\SendResponseHandler::class,
         \Engelsystem\Middleware\ExceptionHandler::class,
         \Engelsystem\Middleware\SetLocale::class,
+        \Engelsystem\Middleware\ErrorHandler::class,
         \Engelsystem\Middleware\RouteDispatcher::class,
         \Engelsystem\Middleware\RequestHandler::class,
     ],
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 9db6fa83..d79ab98b 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -2,6 +2,7 @@
 
 namespace Engelsystem\Http;
 
+use Engelsystem\Renderer\Renderer;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
@@ -9,6 +10,25 @@ class Response extends SymfonyResponse implements ResponseInterface
 {
     use MessageTrait;
 
+    /** @var Renderer */
+    protected $view;
+
+    /**
+     * @param string   $content
+     * @param int      $status
+     * @param array    $headers
+     * @param Renderer $view
+     */
+    public function __construct(
+        $content = '',
+        int $status = 200,
+        array $headers = array(),
+        Renderer $view = null
+    ) {
+        $this->view = $view;
+        parent::__construct($content, $status, $headers);
+    }
+
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
      *
@@ -72,4 +92,25 @@ class Response extends SymfonyResponse implements ResponseInterface
 
         return $new;
     }
+
+    /**
+     * Return an instance with the rendered content.
+     *
+     * THis method retains the immutability of the message and returns
+     * an instance with the updated status and headers
+     *
+     * @param string              $view
+     * @param array               $data
+     * @param int                 $status
+     * @param string[]|string[][] $headers
+     * @return Response
+     */
+    public function withView($view, $data = [], $status = 200, $headers = [])
+    {
+        if (!$this->view instanceof Renderer) {
+            throw new \InvalidArgumentException('Renderer not defined');
+        }
+
+        return $this->create($this->view->render($view, $data), $status, $headers);
+    }
 }
diff --git a/src/Middleware/ErrorHandler.php b/src/Middleware/ErrorHandler.php
new file mode 100644
index 00000000..a7c4cfe6
--- /dev/null
+++ b/src/Middleware/ErrorHandler.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Engelsystem\Middleware;
+
+use Engelsystem\Http\Response;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use Twig_LoaderInterface as TwigLoader;
+
+class ErrorHandler implements MiddlewareInterface
+{
+    /** @var TwigLoader */
+    protected $loader;
+
+    /** @var string */
+    protected $viewPrefix = 'errors/';
+
+    /**
+     * @param TwigLoader $loader
+     */
+    public function __construct(TwigLoader $loader)
+    {
+        $this->loader = $loader;
+    }
+
+    /**
+     * Handles any error messages
+     *
+     * Should be added at the beginning
+     *
+     * @param ServerRequestInterface  $request
+     * @param RequestHandlerInterface $handler
+     * @return ResponseInterface
+     */
+    public function process(
+        ServerRequestInterface $request,
+        RequestHandlerInterface $handler
+    ): ResponseInterface {
+        $response = $handler->handle($request);
+
+        $statusCode = $response->getStatusCode();
+        if ($statusCode < 400 || !$response instanceof Response) {
+            return $response;
+        }
+
+        $view = $this->selectView($statusCode);
+
+        return $response->withView(
+            $this->viewPrefix . $view,
+            [
+                'status'  => $statusCode,
+                'content' => $response->getContent(),
+            ],
+            $statusCode,
+            $response->getHeaders()
+        );
+    }
+
+    /**
+     * Select a view based on the given status code
+     *
+     * @param int $statusCode
+     * @return string
+     */
+    protected function selectView(int $statusCode): string
+    {
+        $hundreds = intdiv($statusCode, 100);
+
+        $viewsList = [$statusCode, $hundreds, $hundreds * 100];
+        foreach ($viewsList as $view) {
+            if ($this->loader->exists($this->viewPrefix . $view)) {
+                return $view;
+            }
+        }
+
+        return 'default';
+    }
+}
diff --git a/src/Middleware/LegacyMiddleware.php b/src/Middleware/LegacyMiddleware.php
index bf849611..78132815 100644
--- a/src/Middleware/LegacyMiddleware.php
+++ b/src/Middleware/LegacyMiddleware.php
@@ -83,7 +83,7 @@ class LegacyMiddleware implements MiddlewareInterface
         }
 
         if (empty($title) and empty($content)) {
-            $page = '404';
+            $page = 404;
             $title = _('Page not found');
             $content = _('This page could not be found or you don\'t have permission to view it. You probably have to sign in or register in order to gain access!');
         }
@@ -277,10 +277,8 @@ class LegacyMiddleware implements MiddlewareInterface
             $parameters['meetings'] = 1;
         }
 
-        $status = 200;
-        if ($page == '404') {
-            $status = 404;
-            $content = info($content, true);
+        if (!empty($page) && is_int($page)) {
+            return response($content, (int)$page);
         }
 
         return response(view('layouts/app', [
@@ -290,6 +288,6 @@ class LegacyMiddleware implements MiddlewareInterface
             'content'        => msg() . $content,
             'header_toolbar' => header_toolbar(),
             'event_info'     => EventConfig_info($event_config) . ' <br />'
-        ]), $status);
+        ]), 200);
     }
 }
diff --git a/src/Renderer/RendererServiceProvider.php b/src/Renderer/RendererServiceProvider.php
index 3e8d69bc..2e41837b 100644
--- a/src/Renderer/RendererServiceProvider.php
+++ b/src/Renderer/RendererServiceProvider.php
@@ -24,12 +24,14 @@ class RendererServiceProvider extends ServiceProvider
     protected function registerRenderer()
     {
         $renderer = $this->app->make(Renderer::class);
+        $this->app->instance(Renderer::class, $renderer);
         $this->app->instance('renderer', $renderer);
     }
 
     protected function registerHtmlEngine()
     {
         $htmlEngine = $this->app->make(HtmlEngine::class);
+        $this->app->instance(HtmlEngine::class, $htmlEngine);
         $this->app->instance('renderer.htmlEngine', $htmlEngine);
         $this->app->tag('renderer.htmlEngine', ['renderer.engine']);
     }
diff --git a/templates/errors/default.twig b/templates/errors/default.twig
new file mode 100644
index 00000000..a04afc4e
--- /dev/null
+++ b/templates/errors/default.twig
@@ -0,0 +1,7 @@
+{% extends "layouts/app.twig" %}
+
+{% block title %}Error {{ status }}{% endblock %}
+
+{% block content %}
+    <div class="alert alert-info">{{ content }}</div>
+{% endblock %}
diff --git a/tests/Unit/Http/ResponseTest.php b/tests/Unit/Http/ResponseTest.php
index f6c24767..d7dc37c0 100644
--- a/tests/Unit/Http/ResponseTest.php
+++ b/tests/Unit/Http/ResponseTest.php
@@ -3,6 +3,8 @@
 namespace Engelsystem\Test\Unit\Http;
 
 use Engelsystem\Http\Response;
+use Engelsystem\Renderer\Renderer;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
@@ -46,4 +48,37 @@ class ResponseTest extends TestCase
         $this->assertNotEquals($response, $newResponse);
         $this->assertEquals('Lorem Ipsum?', $newResponse->getContent());
     }
-}
+
+    /**
+     * @covers \Engelsystem\Http\Response::withView
+     */
+    public function testWithView()
+    {
+        /** @var REnderer|MockObject $renderer */
+        $renderer = $this->createMock(Renderer::class);
+
+        $renderer->expects($this->once())
+            ->method('render')
+            ->with('foo', ['lorem' => 'ipsum'])
+            ->willReturn('Foo ipsum!');
+
+        $response = new Response('', 200, [], $renderer);
+        $newResponse = $response->withView('foo', ['lorem' => 'ipsum'], 505, ['test' => 'er']);
+
+        $this->assertNotEquals($response, $newResponse);
+        $this->assertEquals('Foo ipsum!', $newResponse->getContent());
+        $this->assertEquals(505, $newResponse->getStatusCode());
+        $this->assertArraySubset(['test' => ['er']], $newResponse->getHeaders());
+    }
+
+    /**
+     * @covers \Engelsystem\Http\Response::withView
+     */
+    public function testWithViewNoRenderer()
+    {
+        $this->expectException(\InvalidArgumentException::class);
+
+        $response = new Response();
+        $response->withView('foo');
+    }
+}
\ No newline at end of file
diff --git a/tests/Unit/Middleware/ErrorHandlerTest.php b/tests/Unit/Middleware/ErrorHandlerTest.php
new file mode 100644
index 00000000..abf9c52f
--- /dev/null
+++ b/tests/Unit/Middleware/ErrorHandlerTest.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Middleware;
+
+use Engelsystem\Http\Response;
+use Engelsystem\Middleware\ErrorHandler;
+use Engelsystem\Test\Unit\Middleware\Stub\ReturnResponseMiddlewareHandler;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Twig_LoaderInterface as TwigLoader;
+
+class ErrorHandlerTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Middleware\ErrorHandler::__construct
+     * @covers \Engelsystem\Middleware\ErrorHandler::process
+     * @covers \Engelsystem\Middleware\ErrorHandler::selectView
+     */
+    public function testProcess()
+    {
+        /** @var TwigLoader|MockObject $twigLoader */
+        $twigLoader = $this->createMock(TwigLoader::class);
+        /** @var ServerRequestInterface|MockObject $request */
+        $request = $this->createMock(ServerRequestInterface::class);
+        /** @var ResponseInterface|MockObject $psrResponse */
+        $psrResponse = $this->getMockForAbstractClass(ResponseInterface::class);
+        $returnResponseHandler = new ReturnResponseMiddlewareHandler($psrResponse);
+
+        $psrResponse->expects($this->once())
+            ->method('getStatusCode')
+            ->willReturn(505);
+
+        $errorHandler = new ErrorHandler($twigLoader);
+
+        $return = $errorHandler->process($request, $returnResponseHandler);
+        $this->assertEquals($psrResponse, $return, 'Plain PSR-7 Response should be passed directly');
+
+        /** @var Response|MockObject $response */
+        $response = $this->createMock(Response::class);
+
+        $response->expects($this->exactly(3))
+            ->method('getStatusCode')
+            ->willReturnOnConsecutiveCalls(
+                200,
+                418,
+                505
+            );
+
+        $returnResponseHandler->setResponse($response);
+        $return = $errorHandler->process($request, $returnResponseHandler);
+        $this->assertEquals($response, $return, 'Only Responses >= 400 should be processed');
+
+        $twigLoader->expects($this->exactly(4))
+            ->method('exists')
+            ->withConsecutive(
+                ['errors/418'],
+                ['errors/4'],
+                ['errors/400'],
+                ['errors/505']
+            )
+            ->willReturnOnConsecutiveCalls(
+                false,
+                false,
+                false,
+                true
+            );
+
+        $response->expects($this->exactly(2))
+            ->method('getContent')
+            ->willReturnOnConsecutiveCalls(
+                'Teapot',
+                'Internal Error!'
+            );
+
+        $response->expects($this->exactly(2))
+            ->method('withView')
+            ->withConsecutive(
+                ['errors/default', ['status' => 418, 'content' => 'Teapot'], 418],
+                ['errors/505', ['status' => 505, 'content' => 'Internal Error!'], 505]
+            )
+            ->willReturn($response);
+
+        $errorHandler->process($request, $returnResponseHandler);
+        $errorHandler->process($request, $returnResponseHandler);
+    }
+}
diff --git a/tests/Unit/Middleware/Stub/ReturnResponseMiddlewareHandler.php b/tests/Unit/Middleware/Stub/ReturnResponseMiddlewareHandler.php
index 323e07b4..370187dd 100644
--- a/tests/Unit/Middleware/Stub/ReturnResponseMiddlewareHandler.php
+++ b/tests/Unit/Middleware/Stub/ReturnResponseMiddlewareHandler.php
@@ -27,4 +27,14 @@ class ReturnResponseMiddlewareHandler implements RequestHandlerInterface
     {
         return $this->response;
     }
+
+    /**
+     * Set the response
+     *
+     * @param ResponseInterface $response
+     */
+    public function setResponse(ResponseInterface $response)
+    {
+        $this->response = $response;
+    }
 }
diff --git a/tests/Unit/Renderer/RendererServiceProviderTest.php b/tests/Unit/Renderer/RendererServiceProviderTest.php
index 3826da7e..6cdf4363 100644
--- a/tests/Unit/Renderer/RendererServiceProviderTest.php
+++ b/tests/Unit/Renderer/RendererServiceProviderTest.php
@@ -37,10 +37,12 @@ class RendererServiceProviderTest extends ServiceProviderTest
                 $htmlEngine
             );
 
-        $app->expects($this->exactly(2))
+        $app->expects($this->exactly(4))
             ->method('instance')
             ->withConsecutive(
+                [Renderer::class, $renderer],
                 ['renderer', $renderer],
+                [HtmlEngine::class, $htmlEngine],
                 ['renderer.htmlEngine', $htmlEngine]
             );
 
-- 
cgit v1.2.3-54-g00ecf


From 8257864829ffdfb410f05e0dd0a9c781f48b741a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 29 Aug 2018 15:29:48 +0200
Subject: Added translation support for twig templates

See https://twig-extensions.readthedocs.io/en/latest/i18n.html for documentation
---
 composer.json                                      |  1 +
 config/app.php                                     |  2 +-
 src/Renderer/Twig/Extensions/Translation.php       | 57 ++++++++++++++++++++
 src/Renderer/TwigServiceProvider.php               | 10 ++--
 templates/errors/default.twig                      |  2 +-
 .../Renderer/Twig/Extensions/ExtensionTest.php     | 36 +++++++++++++
 .../Renderer/Twig/Extensions/TranslationTest.php   | 60 ++++++++++++++++++++++
 7 files changed, 162 insertions(+), 6 deletions(-)
 create mode 100644 src/Renderer/Twig/Extensions/Translation.php
 create mode 100644 tests/Unit/Renderer/Twig/Extensions/TranslationTest.php

(limited to 'config/app.php')

diff --git a/composer.json b/composer.json
index 0e6ee17d..1f53e546 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,7 @@
         "symfony/http-foundation": "^3.3",
         "symfony/psr-http-message-bridge": "^1.0",
         "twbs/bootstrap": "^3.3",
+        "twig/extensions": "^1.5",
         "twig/twig": "^2.5",
         "zendframework/zend-diactoros": "^1.7"
     },
diff --git a/config/app.php b/config/app.php
index 19118f1d..e309abe4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -10,13 +10,13 @@ return [
         \Engelsystem\Config\ConfigServiceProvider::class,
         \Engelsystem\Http\UrlGeneratorServiceProvider::class,
         \Engelsystem\Renderer\RendererServiceProvider::class,
-        \Engelsystem\Renderer\TwigServiceProvider::class,
         \Engelsystem\Database\DatabaseServiceProvider::class,
         \Engelsystem\Http\RequestServiceProvider::class,
         \Engelsystem\Http\SessionServiceProvider::class,
         \Engelsystem\Helpers\TranslationServiceProvider::class,
         \Engelsystem\Http\ResponseServiceProvider::class,
         \Engelsystem\Http\Psr7ServiceProvider::class,
+        \Engelsystem\Renderer\TwigServiceProvider::class,
         \Engelsystem\Middleware\RouteDispatcherServiceProvider::class,
         \Engelsystem\Middleware\RequestHandlerServiceProvider::class,
     ],
diff --git a/src/Renderer/Twig/Extensions/Translation.php b/src/Renderer/Twig/Extensions/Translation.php
new file mode 100644
index 00000000..63f9800e
--- /dev/null
+++ b/src/Renderer/Twig/Extensions/Translation.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Engelsystem\Renderer\Twig\Extensions;
+
+use Engelsystem\Helpers\Translator;
+use Twig_Extension as TwigExtension;
+use Twig_Extensions_TokenParser_Trans as TranslationTokenParser;
+use Twig_Filter as TwigFilter;
+use Twig_Function as TwigFunction;
+use Twig_TokenParserInterface as TwigTokenParser;
+
+class Translation extends TwigExtension
+{
+    /** @var Translator */
+    protected $translator;
+
+    /** @var TranslationTokenParser */
+    protected $tokenParser;
+
+    /**
+     * @param Translator             $translator
+     * @param TranslationTokenParser $tokenParser
+     */
+    public function __construct(Translator $translator, TranslationTokenParser $tokenParser)
+    {
+        $this->translator = $translator;
+        $this->tokenParser = $tokenParser;
+    }
+
+    /**
+     * @return array
+     */
+    public function getFilters()
+    {
+        return [
+            new TwigFilter('trans', [$this->translator, 'translate']),
+        ];
+    }
+
+    /**
+     * @return TwigFunction[]
+     */
+    public function getFunctions()
+    {
+        return [
+            new TwigFunction('__', [$this->translator, 'translate']),
+        ];
+    }
+
+    /**
+     * @return TwigTokenParser[]
+     */
+    public function getTokenParsers()
+    {
+        return [$this->tokenParser];
+    }
+}
diff --git a/src/Renderer/TwigServiceProvider.php b/src/Renderer/TwigServiceProvider.php
index 4a5b1de3..0f453989 100644
--- a/src/Renderer/TwigServiceProvider.php
+++ b/src/Renderer/TwigServiceProvider.php
@@ -6,6 +6,7 @@ use Engelsystem\Container\ServiceProvider;
 use Engelsystem\Renderer\Twig\Extensions\Config;
 use Engelsystem\Renderer\Twig\Extensions\Globals;
 use Engelsystem\Renderer\Twig\Extensions\Session;
+use Engelsystem\Renderer\Twig\Extensions\Translation;
 use Engelsystem\Renderer\Twig\Extensions\Url;
 use Twig_Environment as Twig;
 use Twig_LoaderInterface as TwigLoaderInterface;
@@ -14,10 +15,11 @@ class TwigServiceProvider extends ServiceProvider
 {
     /** @var array */
     protected $extensions = [
-        'config'  => Config::class,
-        'globals' => Globals::class,
-        'session' => Session::class,
-        'url'     => Url::class,
+        'config'      => Config::class,
+        'globals'     => Globals::class,
+        'session'     => Session::class,
+        'url'         => Url::class,
+        'translation' => Translation::class,
     ];
 
     public function register()
diff --git a/templates/errors/default.twig b/templates/errors/default.twig
index a04afc4e..5fb8bcbd 100644
--- a/templates/errors/default.twig
+++ b/templates/errors/default.twig
@@ -1,6 +1,6 @@
 {% extends "layouts/app.twig" %}
 
-{% block title %}Error {{ status }}{% endblock %}
+{% block title %}{% if status == 404 %}{{ __("Page not found") }}{% else %}Error {{ status }}{% endif %}{% endblock %}
 
 {% block content %}
     <div class="alert alert-info">{{ content }}</div>
diff --git a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php
index 10f2e69a..e1c5a378 100644
--- a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php
+++ b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php
@@ -7,6 +7,27 @@ use Twig_Function as TwigFunction;
 
 abstract class ExtensionTest extends TestCase
 {
+    /**
+     * Assert that a twig filter was registered
+     *
+     * @param string         $name
+     * @param callable       $callback
+     * @param TwigFunction[] $functions
+     */
+    protected function assertFilterExists($name, $callback, $functions)
+    {
+        foreach ($functions as $function) {
+            if ($function->getName() != $name) {
+                continue;
+            }
+
+            $this->assertEquals($callback, $function->getCallable());
+            return;
+        }
+
+        $this->fail(sprintf('Filter %s not found', $name));
+    }
+
     /**
      * Assert that a twig function was registered
      *
@@ -45,4 +66,19 @@ abstract class ExtensionTest extends TestCase
 
         $this->fail(sprintf('Global %s not found', $name));
     }
+
+    /**
+     * Assert that a token parser was set
+     *
+     * @param $tokenParser
+     * @param $tokenParsers
+     */
+    protected function assertTokenParserExists($tokenParser, $tokenParsers)
+    {
+        $this->assertArraySubset(
+            [$tokenParser],
+            $tokenParsers,
+            sprintf('Token parser %s not found', get_class($tokenParser))
+        );
+    }
 }
diff --git a/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php b/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php
new file mode 100644
index 00000000..f1548604
--- /dev/null
+++ b/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Renderer\Twig\Extensions;
+
+use Engelsystem\Helpers\Translator;
+use Engelsystem\Renderer\Twig\Extensions\Translation;
+use PHPUnit\Framework\MockObject\MockObject;
+use Twig_Extensions_TokenParser_Trans as TranslationTokenParser;
+
+class TranslationTest extends ExtensionTest
+{
+    /**
+     * @covers \Engelsystem\Renderer\Twig\Extensions\Translation::__construct
+     * @covers \Engelsystem\Renderer\Twig\Extensions\Translation::getFilters
+     */
+    public function testGeFilters()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+        /** @var TranslationTokenParser|MockObject $parser */
+        $parser = $this->createMock(TranslationTokenParser::class);
+
+        $extension = new Translation($translator, $parser);
+        $filters = $extension->getFilters();
+
+        $this->assertExtensionExists('trans', [$translator, 'translate'], $filters);
+    }
+
+    /**
+     * @covers \Engelsystem\Renderer\Twig\Extensions\Translation::getFunctions
+     */
+    public function testGetFunctions()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+        /** @var TranslationTokenParser|MockObject $parser */
+        $parser = $this->createMock(TranslationTokenParser::class);
+
+        $extension = new Translation($translator, $parser);
+        $functions = $extension->getFunctions();
+
+        $this->assertExtensionExists('__', [$translator, 'translate'], $functions);
+    }
+
+    /**
+     * @covers \Engelsystem\Renderer\Twig\Extensions\Translation::getTokenParsers
+     */
+    public function testGetTokenParsers()
+    {
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+        /** @var TranslationTokenParser|MockObject $parser */
+        $parser = $this->createMock(TranslationTokenParser::class);
+
+        $extension = new Translation($translator, $parser);
+        $tokenParsers = $extension->getTokenParsers();
+
+        $this->assertTokenParserExists($parser, $tokenParsers);
+    }
+}
-- 
cgit v1.2.3-54-g00ecf