From faf74150e9481ad9338eb6cc2428d02b24e9fc43 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 6 Oct 2019 21:03:20 +0200
Subject: [PATCH 01/17] Mailer: Use users locale for translation

---
 .../TranslationServiceProvider.php            |   6 +-
 src/Mail/EngelsystemMailer.php                |  59 +++++++++-
 .../TranslationServiceProviderTest.php        |  18 +--
 tests/Unit/Mail/EngelsystemMailerTest.php     | 107 ++++++++++++------
 tests/Unit/TestCase.php                       |   4 +-
 5 files changed, 141 insertions(+), 53 deletions(-)

diff --git a/src/Helpers/Translation/TranslationServiceProvider.php b/src/Helpers/Translation/TranslationServiceProvider.php
index 09337dad..05e782ec 100644
--- a/src/Helpers/Translation/TranslationServiceProvider.php
+++ b/src/Helpers/Translation/TranslationServiceProvider.php
@@ -40,8 +40,10 @@ class TranslationServiceProvider extends ServiceProvider
                 'localeChangeCallback'  => [$this, 'setLocale'],
             ]
         );
-        $this->app->instance(Translator::class, $translator);
-        $this->app->instance('translator', $translator);
+        $this->app->singleton(Translator::class, function () use ($translator) {
+            return $translator;
+        });
+        $this->app->alias(Translator::class, 'translator');
     }
 
     /**
diff --git a/src/Mail/EngelsystemMailer.php b/src/Mail/EngelsystemMailer.php
index 81660681..87915d67 100644
--- a/src/Mail/EngelsystemMailer.php
+++ b/src/Mail/EngelsystemMailer.php
@@ -2,6 +2,8 @@
 
 namespace Engelsystem\Mail;
 
+use Engelsystem\Helpers\Translation\Translator;
+use Engelsystem\Models\User\User;
 use Engelsystem\Renderer\Renderer;
 use Swift_Mailer as SwiftMailer;
 
@@ -10,30 +12,75 @@ class EngelsystemMailer extends Mailer
     /** @var Renderer|null */
     protected $view;
 
+    /** @var Translator|null */
+    protected $translation;
+
     /** @var string */
     protected $subjectPrefix = null;
 
     /**
      * @param SwiftMailer $mailer
      * @param Renderer    $view
+     * @param Translator  $translation
      */
-    public function __construct(SwiftMailer $mailer, Renderer $view = null)
+    public function __construct(SwiftMailer $mailer, Renderer $view = null, Translator $translation = null)
     {
         parent::__construct($mailer);
 
+        $this->translation = $translation;
         $this->view = $view;
     }
 
+    /**
+     * @param string|string[]|User $to
+     * @param string               $subject
+     * @param string               $template
+     * @param array                $data
+     * @param string|null          $locale
+     * @return int
+     */
+    public function sendViewTranslated(
+        $to,
+        string $subject,
+        string $template,
+        array $data = [],
+        ?string $locale = null
+    ): int {
+        if ($to instanceof User) {
+            $locale = $locale ?: $to->settings->language;
+            $to = $to->contact->email ? $to->contact->email : $to->email;
+        }
+
+        $activeLocale = null;
+        if (
+            $locale
+            && $this->translation
+            && isset($this->translation->getLocales()[$locale])
+        ) {
+            $activeLocale = $this->translation->getLocale();
+            $this->translation->setLocale($locale);
+        }
+
+        $subject = $this->translation ? $this->translation->translate($subject) : $subject;
+        $sentMails = $this->sendView($to, $subject, $template, $data);
+
+        if ($activeLocale) {
+            $this->translation->setLocale($activeLocale);
+        }
+
+        return $sentMails;
+    }
+
     /**
      * Send a template
      *
-     * @param string $to
-     * @param string $subject
-     * @param string $template
-     * @param array  $data
+     * @param string|string[] $to
+     * @param string          $subject
+     * @param string          $template
+     * @param array           $data
      * @return int
      */
-    public function sendView($to, $subject, $template, $data = []): int
+    public function sendView($to, string $subject, string $template, array $data = []): int
     {
         $body = $this->view->render($template, $data);
 
diff --git a/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php b/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
index 91307bdd..1822f353 100644
--- a/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
+++ b/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
@@ -21,7 +21,7 @@ class TranslationServiceProviderTest extends ServiceProviderTest
         $locales = ['fo_OO' => 'Foo', 'fo_OO.BAR' => 'Foo (Bar)', 'te_ST.WTF-9' => 'WTF\'s Testing?'];
         $config = new Config(['locales' => $locales, 'default_locale' => $defaultLocale]);
 
-        $app = $this->getApp(['make', 'instance', 'get']);
+        $app = $this->getApp(['make', 'singleton', 'alias', 'get']);
         /** @var Session|MockObject $session */
         $session = $this->createMock(Session::class);
         /** @var Translator|MockObject $translator */
@@ -60,12 +60,16 @@ class TranslationServiceProviderTest extends ServiceProviderTest
             )
             ->willReturn($translator);
 
-        $app->expects($this->exactly(2))
-            ->method('instance')
-            ->withConsecutive(
-                [Translator::class, $translator],
-                ['translator', $translator]
-            );
+        $app->expects($this->once())
+            ->method('singleton')
+            ->willReturnCallback(function (string $abstract, callable $callback) use ($translator) {
+                $this->assertEquals(Translator::class, $abstract);
+                $this->assertEquals($translator, $callback());
+            });
+
+        $app->expects($this->once())
+            ->method('alias')
+            ->with(Translator::class, 'translator');
 
         $serviceProvider->register();
     }
diff --git a/tests/Unit/Mail/EngelsystemMailerTest.php b/tests/Unit/Mail/EngelsystemMailerTest.php
index 12dc3b0b..cdbdf435 100644
--- a/tests/Unit/Mail/EngelsystemMailerTest.php
+++ b/tests/Unit/Mail/EngelsystemMailerTest.php
@@ -2,15 +2,22 @@
 
 namespace Engelsystem\Test\Unit\Mail;
 
+use Engelsystem\Helpers\Translation\Translator;
 use Engelsystem\Mail\EngelsystemMailer;
+use Engelsystem\Models\User\Contact;
+use Engelsystem\Models\User\Settings;
+use Engelsystem\Models\User\User;
 use Engelsystem\Renderer\Renderer;
+use Engelsystem\Test\Unit\HasDatabase;
+use Engelsystem\Test\Unit\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
 use Swift_Mailer as SwiftMailer;
 use Swift_Message as SwiftMessage;
 
 class EngelsystemMailerTest extends TestCase
 {
+    use HasDatabase;
+
     /**
      * @covers \Engelsystem\Mail\EngelsystemMailer::__construct
      * @covers \Engelsystem\Mail\EngelsystemMailer::sendView
@@ -24,21 +31,69 @@ class EngelsystemMailerTest extends TestCase
         /** @var EngelsystemMailer|MockObject $mailer */
         $mailer = $this->getMockBuilder(EngelsystemMailer::class)
             ->setConstructorArgs(['mailer' => $swiftMailer, 'view' => $view])
-            ->setMethods(['send'])
+            ->onlyMethods(['send'])
             ->getMock();
-        $mailer->expects($this->once())
-            ->method('send')
-            ->with('foo@bar.baz', 'Lorem dolor', 'Rendered Stuff!')
-            ->willReturn(1);
-        $view->expects($this->once())
-            ->method('render')
-            ->with('test/template.tpl', ['dev' => true])
-            ->willReturn('Rendered Stuff!');
+        $this->setExpects($mailer, 'send', ['foo@bar.baz', 'Lorem dolor', 'Rendered Stuff!'], 1);
+        $this->setExpects($view, 'render', ['test/template.tpl', ['dev' => true]], 'Rendered Stuff!');
 
         $return = $mailer->sendView('foo@bar.baz', 'Lorem dolor', 'test/template.tpl', ['dev' => true]);
         $this->equalTo(1, $return);
     }
 
+    /**
+     * @covers \Engelsystem\Mail\EngelsystemMailer::sendViewTranslated
+     */
+    public function testSendViewTranslated()
+    {
+        $this->initDatabase();
+
+        $settings = new Settings([
+            'language' => 'de_DE',
+            'theme'    => '',
+        ]);
+        $contact = new Contact(['email' => null]);
+        $user = new User([
+            'id'       => 42,
+            'name'     => 'username',
+            'email'    => 'foo@bar.baz',
+            'password' => '',
+            'api_key'  => '',
+        ]);
+        $user->save();
+        $settings->user()->associate($user)->save();
+        $contact->user()->associate($user)->save();
+
+        /** @var Renderer|MockObject $view */
+        $view = $this->createMock(Renderer::class);
+        /** @var SwiftMailer|MockObject $swiftMailer */
+        $swiftMailer = $this->createMock(SwiftMailer::class);
+        /** @var Translator|MockObject $translator */
+        $translator = $this->createMock(Translator::class);
+
+        /** @var EngelsystemMailer|MockObject $mailer */
+        $mailer = $this->getMockBuilder(EngelsystemMailer::class)
+            ->setConstructorArgs(['mailer' => $swiftMailer, 'view' => $view, 'translation' => $translator])
+            ->onlyMethods(['sendView'])
+            ->getMock();
+
+        $this->setExpects($mailer, 'sendView', ['foo@bar.baz', 'Lorem dolor', 'test/template.tpl', ['dev' => true]], 1);
+        $this->setExpects($translator, 'getLocales', null, ['de_DE' => 'de_DE', 'en_US' => 'en_US']);
+        $this->setExpects($translator, 'getLocale', null, 'en_US');
+        $this->setExpects($translator, 'translate', ['translatable.text'], 'Lorem dolor');
+        $translator->expects($this->exactly(2))
+            ->method('setLocale')
+            ->withConsecutive(['de_DE'], ['en_US']);
+
+        $return = $mailer->sendViewTranslated(
+            $user,
+            'translatable.text',
+            'test/template.tpl',
+            ['dev' => true],
+            'de_DE'
+        );
+        $this->equalTo(1, $return);
+    }
+
     /**
      * @covers \Engelsystem\Mail\EngelsystemMailer::getSubjectPrefix
      * @covers \Engelsystem\Mail\EngelsystemMailer::send
@@ -50,32 +105,12 @@ class EngelsystemMailerTest extends TestCase
         $message = $this->createMock(SwiftMessage::class);
         /** @var SwiftMailer|MockObject $swiftMailer */
         $swiftMailer = $this->createMock(SwiftMailer::class);
-        $swiftMailer->expects($this->once())
-            ->method('createMessage')
-            ->willReturn($message);
-        $swiftMailer->expects($this->once())
-            ->method('send')
-            ->willReturn(1);
-
-        $message->expects($this->once())
-            ->method('setTo')
-            ->with(['to@xam.pel'])
-            ->willReturn($message);
-
-        $message->expects($this->once())
-            ->method('setFrom')
-            ->with('foo@bar.baz', 'Lorem Ipsum')
-            ->willReturn($message);
-
-        $message->expects($this->once())
-            ->method('setSubject')
-            ->with('[Mail test] Foo Bar')
-            ->willReturn($message);
-
-        $message->expects($this->once())
-            ->method('setBody')
-            ->with('Lorem Ipsum!')
-            ->willReturn($message);
+        $this->setExpects($swiftMailer, 'createMessage', null, $message);
+        $this->setExpects($swiftMailer, 'send', null, 1);
+        $this->setExpects($message, 'setTo', [['to@xam.pel']], $message);
+        $this->setExpects($message, 'setFrom', ['foo@bar.baz', 'Lorem Ipsum'], $message);
+        $this->setExpects($message, 'setSubject', ['[Mail test] Foo Bar'], $message);
+        $this->setExpects($message, 'setBody', ['Lorem Ipsum!'], $message);
 
         $mailer = new EngelsystemMailer($swiftMailer);
         $mailer->setFromAddress('foo@bar.baz');
diff --git a/tests/Unit/TestCase.php b/tests/Unit/TestCase.php
index d09104d4..e1a704d9 100644
--- a/tests/Unit/TestCase.php
+++ b/tests/Unit/TestCase.php
@@ -2,8 +2,8 @@
 
 namespace Engelsystem\Test\Unit;
 
-use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 abstract class TestCase extends PHPUnitTestCase
@@ -13,7 +13,7 @@ abstract class TestCase extends PHPUnitTestCase
      * @param string          $method
      * @param array           $arguments
      * @param mixed           $return
-     * @param InvokedRecorder $times
+     * @param InvocationOrder $times
      */
     protected function setExpects($object, $method, $arguments = null, $return = null, $times = null)
     {

From 8d090438b659b641dd0f6cbc99193f3b48b2fc4b Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 7 Oct 2019 21:59:40 +0200
Subject: [PATCH 02/17] Validation rules: min/max/between: Use string length to
 compare strings

---
 src/Http/Validation/Rules/Between.php         | 10 +++++
 src/Http/Validation/Rules/Max.php             | 10 +++++
 src/Http/Validation/Rules/Min.php             | 10 +++++
 .../Validation/Rules/StringInputLength.php    | 44 +++++++++++++++++++
 .../Http/Validation/Rules/BetweenTest.php     | 28 ++++++++++++
 tests/Unit/Http/Validation/Rules/MaxTest.php  | 26 +++++++++++
 tests/Unit/Http/Validation/Rules/MinTest.php  | 26 +++++++++++
 .../Rules/StringInputLengthTest.php           | 37 ++++++++++++++++
 .../Rules/Stub/ParentClassImplementation.php  | 23 ++++++++++
 .../Rules/Stub/UsesStringInputLength.php      | 10 +++++
 tests/Unit/Http/Validation/ValidatorTest.php  |  5 ++-
 11 files changed, 227 insertions(+), 2 deletions(-)
 create mode 100644 src/Http/Validation/Rules/Between.php
 create mode 100644 src/Http/Validation/Rules/Max.php
 create mode 100644 src/Http/Validation/Rules/Min.php
 create mode 100644 src/Http/Validation/Rules/StringInputLength.php
 create mode 100644 tests/Unit/Http/Validation/Rules/BetweenTest.php
 create mode 100644 tests/Unit/Http/Validation/Rules/MaxTest.php
 create mode 100644 tests/Unit/Http/Validation/Rules/MinTest.php
 create mode 100644 tests/Unit/Http/Validation/Rules/StringInputLengthTest.php
 create mode 100644 tests/Unit/Http/Validation/Rules/Stub/ParentClassImplementation.php
 create mode 100644 tests/Unit/Http/Validation/Rules/Stub/UsesStringInputLength.php

diff --git a/src/Http/Validation/Rules/Between.php b/src/Http/Validation/Rules/Between.php
new file mode 100644
index 00000000..106a93ac
--- /dev/null
+++ b/src/Http/Validation/Rules/Between.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use Respect\Validation\Rules\Between as RespectBetween;
+
+class Between extends RespectBetween
+{
+    use StringInputLength;
+}
diff --git a/src/Http/Validation/Rules/Max.php b/src/Http/Validation/Rules/Max.php
new file mode 100644
index 00000000..b1b2cfa3
--- /dev/null
+++ b/src/Http/Validation/Rules/Max.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use Respect\Validation\Rules\Max as RespectMax;
+
+class Max extends RespectMax
+{
+    use StringInputLength;
+}
diff --git a/src/Http/Validation/Rules/Min.php b/src/Http/Validation/Rules/Min.php
new file mode 100644
index 00000000..ab8d4e1a
--- /dev/null
+++ b/src/Http/Validation/Rules/Min.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use Respect\Validation\Rules\Min as RespectMin;
+
+class Min extends RespectMin
+{
+    use StringInputLength;
+}
diff --git a/src/Http/Validation/Rules/StringInputLength.php b/src/Http/Validation/Rules/StringInputLength.php
new file mode 100644
index 00000000..7b5c248b
--- /dev/null
+++ b/src/Http/Validation/Rules/StringInputLength.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use DateTime;
+use Illuminate\Support\Str;
+use Throwable;
+
+trait StringInputLength
+{
+    /**
+     * Use the input length of a string
+     *
+     * @param mixed $input
+     * @return bool
+     */
+    public function validate($input): bool
+    {
+        if (
+            is_string($input)
+            && !is_numeric($input)
+            && !$this->isDateTime($input)
+        ) {
+            $input = Str::length($input);
+        }
+
+        return parent::validate($input);
+    }
+
+    /**
+     * @param mixed $input
+     * @return bool
+     */
+    protected function isDateTime($input): bool
+    {
+        try {
+            new DateTime($input);
+        } catch (Throwable $e) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/BetweenTest.php b/tests/Unit/Http/Validation/Rules/BetweenTest.php
new file mode 100644
index 00000000..130d2f93
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/BetweenTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules;
+
+use Engelsystem\Http\Validation\Rules\Between;
+use Engelsystem\Test\Unit\TestCase;
+
+class BetweenTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Http\Validation\Rules\Between
+     */
+    public function testValidate()
+    {
+        $rule = new Between(3, 10);
+        $this->assertFalse($rule->validate(1));
+        $this->assertFalse($rule->validate('11'));
+        $this->assertTrue($rule->validate(5));
+        $this->assertFalse($rule->validate('AS'));
+        $this->assertFalse($rule->validate('TestContentThatCounts'));
+        $this->assertTrue($rule->validate('TESTING'));
+
+        $rule = new Between('2042-01-01', '2042-10-10');
+        $this->assertFalse($rule->validate('2000-01-01'));
+        $this->assertFalse($rule->validate('3000-01-01'));
+        $this->assertTrue($rule->validate('2042-05-11'));
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/MaxTest.php b/tests/Unit/Http/Validation/Rules/MaxTest.php
new file mode 100644
index 00000000..3f4d9516
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/MaxTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules;
+
+use Engelsystem\Http\Validation\Rules\Max;
+use Engelsystem\Test\Unit\TestCase;
+
+class MaxTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Http\Validation\Rules\Max
+     */
+    public function testValidate()
+    {
+        $rule = new Max(3);
+        $this->assertFalse($rule->validate(10));
+        $this->assertFalse($rule->validate('22'));
+        $this->assertTrue($rule->validate(3));
+        $this->assertFalse($rule->validate('TEST'));
+        $this->assertTrue($rule->validate('AS'));
+
+        $rule = new Max('2042-01-01');
+        $this->assertFalse($rule->validate('2100-01-01'));
+        $this->assertTrue($rule->validate('2000-01-01'));
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/MinTest.php b/tests/Unit/Http/Validation/Rules/MinTest.php
new file mode 100644
index 00000000..56350802
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/MinTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules;
+
+use Engelsystem\Http\Validation\Rules\Min;
+use Engelsystem\Test\Unit\TestCase;
+
+class MinTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Http\Validation\Rules\Min
+     */
+    public function testValidate()
+    {
+        $rule = new Min(3);
+        $this->assertFalse($rule->validate(1));
+        $this->assertFalse($rule->validate('2'));
+        $this->assertTrue($rule->validate(3));
+        $this->assertFalse($rule->validate('AS'));
+        $this->assertTrue($rule->validate('TEST'));
+
+        $rule = new Min('2042-01-01');
+        $this->assertFalse($rule->validate('2000-01-01'));
+        $this->assertTrue($rule->validate('2345-01-01'));
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/StringInputLengthTest.php b/tests/Unit/Http/Validation/Rules/StringInputLengthTest.php
new file mode 100644
index 00000000..5c4dc512
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/StringInputLengthTest.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules;
+
+use Engelsystem\Test\Unit\Http\Validation\Rules\Stub\UsesStringInputLength;
+use Engelsystem\Test\Unit\TestCase;
+
+class StringInputLengthTest extends TestCase
+{
+    /**
+     * @covers       \Engelsystem\Http\Validation\Rules\StringInputLength::validate
+     * @covers       \Engelsystem\Http\Validation\Rules\StringInputLength::isDateTime
+     * @dataProvider validateProvider
+     * @param mixed $input
+     * @param mixed $expectedInput
+     */
+    public function testValidate($input, $expectedInput)
+    {
+        $rule = new UsesStringInputLength();
+        $rule->validate($input);
+
+        $this->assertEquals($expectedInput, $rule->lastInput);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function validateProvider()
+    {
+        return [
+            ['TEST', 4],
+            ['?', 1],
+            ['2042-01-01 00:00', '2042-01-01 00:00'],
+            ['3', '3'],
+        ];
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/Stub/ParentClassImplementation.php b/tests/Unit/Http/Validation/Rules/Stub/ParentClassImplementation.php
new file mode 100644
index 00000000..1b6aaaf5
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/Stub/ParentClassImplementation.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules\Stub;
+
+class ParentClassImplementation
+{
+    /** @var bool */
+    public $validateResult = true;
+
+    /** @var mixed */
+    public $lastInput;
+
+    /**
+     * @param mixed $input
+     * @return bool
+     */
+    public function validate($input): bool
+    {
+        $this->lastInput = $input;
+
+        return $this->validateResult;
+    }
+}
diff --git a/tests/Unit/Http/Validation/Rules/Stub/UsesStringInputLength.php b/tests/Unit/Http/Validation/Rules/Stub/UsesStringInputLength.php
new file mode 100644
index 00000000..3522304c
--- /dev/null
+++ b/tests/Unit/Http/Validation/Rules/Stub/UsesStringInputLength.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Validation\Rules\Stub;
+
+use Engelsystem\Http\Validation\Rules\StringInputLength;
+
+class UsesStringInputLength extends ParentClassImplementation
+{
+    use StringInputLength;
+}
diff --git a/tests/Unit/Http/Validation/ValidatorTest.php b/tests/Unit/Http/Validation/ValidatorTest.php
index 450e5d4e..124673df 100644
--- a/tests/Unit/Http/Validation/ValidatorTest.php
+++ b/tests/Unit/Http/Validation/ValidatorTest.php
@@ -50,9 +50,10 @@ class ValidatorTest extends TestCase
         ));
 
         $this->assertFalse($val->validate(
-            ['lorem' => 2],
-            ['lorem' => 'required|min:3|max:10']
+            ['lorem' => 'OMG'],
+            ['lorem' => 'required|min:4|max:10']
         ));
+        $this->assertEquals(['lorem' => ['validation.lorem.min']], $val->getErrors());
         $this->assertFalse($val->validate(
             ['lorem' => 42],
             ['lorem' => 'required|min:3|max:10']

From 1b3e3b1d65126da909d0013c9c0a0cb3f41639c1 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Mon, 7 Oct 2019 22:02:28 +0200
Subject: [PATCH 03/17] Exceptions: Added HttpNotFound exception

---
 src/Http/Exceptions/HttpNotFound.php          | 23 +++++++++++++++++++
 .../Unit/Http/Exceptions/HttpNotFoundTest.php | 22 ++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/Http/Exceptions/HttpNotFound.php
 create mode 100644 tests/Unit/Http/Exceptions/HttpNotFoundTest.php

diff --git a/src/Http/Exceptions/HttpNotFound.php b/src/Http/Exceptions/HttpNotFound.php
new file mode 100644
index 00000000..324adaf9
--- /dev/null
+++ b/src/Http/Exceptions/HttpNotFound.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Engelsystem\Http\Exceptions;
+
+use Throwable;
+
+class HttpNotFound extends HttpException
+{
+    /**
+     * @param string         $message
+     * @param array          $headers
+     * @param int            $code
+     * @param Throwable|null $previous
+     */
+    public function __construct(
+        string $message = '',
+        array $headers = [],
+        int $code = 0,
+        Throwable $previous = null
+    ) {
+        parent::__construct(404, $message, $headers, $code, $previous);
+    }
+}
diff --git a/tests/Unit/Http/Exceptions/HttpNotFoundTest.php b/tests/Unit/Http/Exceptions/HttpNotFoundTest.php
new file mode 100644
index 00000000..a39ea087
--- /dev/null
+++ b/tests/Unit/Http/Exceptions/HttpNotFoundTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Http\Exceptions;
+
+use Engelsystem\Http\Exceptions\HttpNotFound;
+use PHPUnit\Framework\TestCase;
+
+class HttpNotFoundTest extends TestCase
+{
+    /**
+     * @covers \Engelsystem\Http\Exceptions\HttpNotFound::__construct
+     */
+    public function testConstruct()
+    {
+        $exception = new HttpNotFound();
+        $this->assertEquals(404, $exception->getStatusCode());
+        $this->assertEquals('', $exception->getMessage());
+
+        $exception = new HttpNotFound('Nothing to see here!');
+        $this->assertEquals('Nothing to see here!', $exception->getMessage());
+    }
+}

From e124b41977504067f6e1b6b3bf2e39c9b1d31324 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 13:57:50 +0200
Subject: [PATCH 04/17] Tests: TestCase: Initialize $this->app on every run

---
 tests/Unit/Controllers/AuthControllerTest.php        |  2 +-
 tests/Unit/HasDatabase.php                           |  8 +++-----
 .../Http/SessionHandlers/DatabaseHandlerTest.php     |  3 ++-
 tests/Unit/Models/EventConfigTest.php                |  6 ++++--
 tests/Unit/Models/LogEntryTest.php                   |  3 ++-
 tests/Unit/Models/User/HasUserModelTest.php          |  3 ++-
 tests/Unit/Models/User/UserTest.php                  |  3 ++-
 tests/Unit/TestCase.php                              | 12 ++++++++++++
 8 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/tests/Unit/Controllers/AuthControllerTest.php b/tests/Unit/Controllers/AuthControllerTest.php
index 6c237264..50ce014d 100644
--- a/tests/Unit/Controllers/AuthControllerTest.php
+++ b/tests/Unit/Controllers/AuthControllerTest.php
@@ -12,9 +12,9 @@ use Engelsystem\Http\Validation\Validator;
 use Engelsystem\Models\User\Settings;
 use Engelsystem\Models\User\User;
 use Engelsystem\Test\Unit\HasDatabase;
+use Engelsystem\Test\Unit\TestCase;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
diff --git a/tests/Unit/HasDatabase.php b/tests/Unit/HasDatabase.php
index 7a58bb2b..dbaa253e 100644
--- a/tests/Unit/HasDatabase.php
+++ b/tests/Unit/HasDatabase.php
@@ -2,7 +2,6 @@
 
 namespace Engelsystem\Test\Unit;
 
-use Engelsystem\Application;
 use Engelsystem\Database\Database;
 use Engelsystem\Database\Migration\Migrate;
 use Engelsystem\Database\Migration\MigrationServiceProvider;
@@ -27,12 +26,11 @@ trait HasDatabase
         $connection->getPdo()->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         $this->database = new Database($connection);
 
-        $app = new Application();
-        $app->instance(Database::class, $this->database);
-        $app->register(MigrationServiceProvider::class);
+        $this->app->instance(Database::class, $this->database);
+        $this->app->register(MigrationServiceProvider::class);
 
         /** @var Migrate $migration */
-        $migration = $app->get('db.migration');
+        $migration = $this->app->get('db.migration');
         $migration->initMigration();
 
         $this->database
diff --git a/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php
index 14f23c00..0325ccfe 100644
--- a/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php
+++ b/tests/Unit/Http/SessionHandlers/DatabaseHandlerTest.php
@@ -4,7 +4,7 @@ namespace Engelsystem\Test\Unit\Http\SessionHandlers;
 
 use Engelsystem\Http\SessionHandlers\DatabaseHandler;
 use Engelsystem\Test\Unit\HasDatabase;
-use PHPUnit\Framework\TestCase;
+use Engelsystem\Test\Unit\TestCase;
 
 class DatabaseHandlerTest extends TestCase
 {
@@ -90,6 +90,7 @@ class DatabaseHandlerTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->initDatabase();
     }
 }
diff --git a/tests/Unit/Models/EventConfigTest.php b/tests/Unit/Models/EventConfigTest.php
index e2ab5d10..18d27007 100644
--- a/tests/Unit/Models/EventConfigTest.php
+++ b/tests/Unit/Models/EventConfigTest.php
@@ -5,7 +5,7 @@ namespace Engelsystem\Test\Unit\Models;
 use Carbon\Carbon;
 use Engelsystem\Models\EventConfig;
 use Engelsystem\Test\Unit\HasDatabase;
-use PHPUnit\Framework\TestCase;
+use Engelsystem\Test\Unit\TestCase;
 
 class EventConfigTest extends TestCase
 {
@@ -102,7 +102,8 @@ class EventConfigTest extends TestCase
      */
     protected function getEventConfig()
     {
-        return new class extends EventConfig {
+        return new class extends EventConfig
+        {
             /**
              * @param string $value
              * @param string $type
@@ -122,6 +123,7 @@ class EventConfigTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->initDatabase();
     }
 }
diff --git a/tests/Unit/Models/LogEntryTest.php b/tests/Unit/Models/LogEntryTest.php
index 0a0efa3c..4b772cd0 100644
--- a/tests/Unit/Models/LogEntryTest.php
+++ b/tests/Unit/Models/LogEntryTest.php
@@ -4,7 +4,7 @@ namespace Engelsystem\Test\Unit\Models;
 
 use Engelsystem\Models\LogEntry;
 use Engelsystem\Test\Unit\HasDatabase;
-use PHPUnit\Framework\TestCase;
+use Engelsystem\Test\Unit\TestCase;
 use Psr\Log\LogLevel;
 
 class LogEntryTest extends TestCase
@@ -38,6 +38,7 @@ class LogEntryTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->initDatabase();
     }
 }
diff --git a/tests/Unit/Models/User/HasUserModelTest.php b/tests/Unit/Models/User/HasUserModelTest.php
index 58c01e1e..4f6da9ad 100644
--- a/tests/Unit/Models/User/HasUserModelTest.php
+++ b/tests/Unit/Models/User/HasUserModelTest.php
@@ -5,8 +5,8 @@ namespace Engelsystem\Test\Unit\Models;
 use Engelsystem\Models\User\HasUserModel;
 use Engelsystem\Test\Unit\HasDatabase;
 use Engelsystem\Test\Unit\Models\User\Stub\HasUserModelImplementation;
+use Engelsystem\Test\Unit\TestCase;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use PHPUnit\Framework\TestCase;
 
 class HasUserModelTest extends TestCase
 {
@@ -28,6 +28,7 @@ class HasUserModelTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->initDatabase();
     }
 }
diff --git a/tests/Unit/Models/User/UserTest.php b/tests/Unit/Models/User/UserTest.php
index 0e17d137..3e793832 100644
--- a/tests/Unit/Models/User/UserTest.php
+++ b/tests/Unit/Models/User/UserTest.php
@@ -10,7 +10,7 @@ use Engelsystem\Models\User\Settings;
 use Engelsystem\Models\User\State;
 use Engelsystem\Models\User\User;
 use Engelsystem\Test\Unit\HasDatabase;
-use PHPUnit\Framework\TestCase;
+use Engelsystem\Test\Unit\TestCase;
 
 class UserTest extends TestCase
 {
@@ -95,6 +95,7 @@ class UserTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->initDatabase();
     }
 }
diff --git a/tests/Unit/TestCase.php b/tests/Unit/TestCase.php
index e1a704d9..dba8c989 100644
--- a/tests/Unit/TestCase.php
+++ b/tests/Unit/TestCase.php
@@ -2,12 +2,16 @@
 
 namespace Engelsystem\Test\Unit;
 
+use Engelsystem\Application;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 use PHPUnit\Framework\TestCase as PHPUnitTestCase;
 
 abstract class TestCase extends PHPUnitTestCase
 {
+    /** @var Application */
+    protected $app;
+
     /**
      * @param MockObject      $object
      * @param string          $method
@@ -34,4 +38,12 @@ abstract class TestCase extends PHPUnitTestCase
             $invocation->willReturn($return);
         }
     }
+
+    /**
+     * Called before each test run
+     */
+    protected function setUp(): void
+    {
+        $this->app = new Application(__DIR__ . '/../../');
+    }
 }

From ae0816ce8de46c38cd6f4b6d95abb17a6703d280 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 14:07:28 +0200
Subject: [PATCH 05/17] Response: Fixed naming to use renderer instead of view
 and added setter

---
 src/Http/Response.php            | 27 +++++++++++++++++++--------
 tests/Unit/Http/ResponseTest.php | 12 ++++++++++++
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/Http/Response.php b/src/Http/Response.php
index 1a7c8209..a6b4ab74 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -3,6 +3,7 @@
 namespace Engelsystem\Http;
 
 use Engelsystem\Renderer\Renderer;
+use InvalidArgumentException;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpFoundation\Response as SymfonyResponse;
 
@@ -11,21 +12,21 @@ class Response extends SymfonyResponse implements ResponseInterface
     use MessageTrait;
 
     /** @var Renderer */
-    protected $view;
+    protected $renderer;
 
     /**
      * @param string   $content
      * @param int      $status
      * @param array    $headers
-     * @param Renderer $view
+     * @param Renderer $renderer
      */
     public function __construct(
         $content = '',
         int $status = 200,
         array $headers = [],
-        Renderer $view = null
+        Renderer $renderer = null
     ) {
-        $this->view = $view;
+        $this->renderer = $renderer;
         parent::__construct($content, $status, $headers);
     }
 
@@ -47,7 +48,7 @@ class Response extends SymfonyResponse implements ResponseInterface
      *                             provided status code; if none is provided, implementations MAY
      *                             use the defaults as suggested in the HTTP specification.
      * @return static
-     * @throws \InvalidArgumentException For invalid status code arguments.
+     * @throws InvalidArgumentException For invalid status code arguments.
      */
     public function withStatus($code, $reasonPhrase = '')
     {
@@ -107,12 +108,12 @@ class Response extends SymfonyResponse implements ResponseInterface
      */
     public function withView($view, $data = [], $status = 200, $headers = [])
     {
-        if (!$this->view instanceof Renderer) {
-            throw new \InvalidArgumentException('Renderer not defined');
+        if (!$this->renderer instanceof Renderer) {
+            throw new InvalidArgumentException('Renderer not defined');
         }
 
         $new = clone $this;
-        $new->setContent($this->view->render($view, $data));
+        $new->setContent($this->renderer->render($view, $data));
         $new->setStatusCode($status, ($status == $this->getStatusCode() ? $this->statusText : null));
 
         foreach ($headers as $key => $values) {
@@ -144,4 +145,14 @@ class Response extends SymfonyResponse implements ResponseInterface
 
         return $response;
     }
+
+    /**
+     * Set the renderer to use
+     *
+     * @param Renderer $renderer
+     */
+    public function setRenderer(Renderer $renderer)
+    {
+        $this->renderer = $renderer;
+    }
 }
diff --git a/tests/Unit/Http/ResponseTest.php b/tests/Unit/Http/ResponseTest.php
index 34f76513..b8e6e527 100644
--- a/tests/Unit/Http/ResponseTest.php
+++ b/tests/Unit/Http/ResponseTest.php
@@ -55,6 +55,7 @@ class ResponseTest extends TestCase
 
     /**
      * @covers \Engelsystem\Http\Response::withView
+     * @covers \Engelsystem\Http\Response::setRenderer
      */
     public function testWithView()
     {
@@ -73,6 +74,17 @@ class ResponseTest extends TestCase
         $this->assertEquals('Foo ipsum!', $newResponse->getContent());
         $this->assertEquals(505, $newResponse->getStatusCode());
         $this->assertArraySubset(['test' => ['er']], $newResponse->getHeaders());
+
+        /** @var REnderer|MockObject $renderer */
+        $anotherRenderer = $this->createMock(Renderer::class);
+        $anotherRenderer->expects($this->once())
+            ->method('render')
+            ->with('bar')
+            ->willReturn('Stuff');
+
+        $response->setRenderer($anotherRenderer);
+        $response = $response->withView('bar');
+        $this->assertEquals('Stuff', $response->getContent());
     }
 
     /**

From 810068dcf811b17805ee9958b877a827bf8125ed Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 14:18:51 +0200
Subject: [PATCH 06/17] Fixes: AuthController session error merging and
 StatsTest

---
 src/Controllers/AuthController.php            | 2 +-
 tests/Unit/Controllers/AuthControllerTest.php | 4 ++--
 tests/Unit/Controllers/Metrics/StatsTest.php  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Controllers/AuthController.php b/src/Controllers/AuthController.php
index c69c2377..7892064b 100644
--- a/src/Controllers/AuthController.php
+++ b/src/Controllers/AuthController.php
@@ -88,7 +88,7 @@ class AuthController extends BaseController
         $user = $this->auth->authenticate($data['login'], $data['password']);
 
         if (!$user instanceof User) {
-            $this->session->set('errors', $this->session->get('errors', []) + ['auth.not-found']);
+            $this->session->set('errors', array_merge($this->session->get('errors', []), ['auth.not-found']));
 
             return $this->showLogin();
         }
diff --git a/tests/Unit/Controllers/AuthControllerTest.php b/tests/Unit/Controllers/AuthControllerTest.php
index 50ce014d..a12ed6d6 100644
--- a/tests/Unit/Controllers/AuthControllerTest.php
+++ b/tests/Unit/Controllers/AuthControllerTest.php
@@ -13,7 +13,6 @@ use Engelsystem\Models\User\Settings;
 use Engelsystem\Models\User\User;
 use Engelsystem\Test\Unit\HasDatabase;
 use Engelsystem\Test\Unit\TestCase;
-use Illuminate\Support\Collection;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -66,6 +65,7 @@ class AuthControllerTest extends TestCase
         $session = new Session(new MockArraySessionStorage());
         /** @var Validator|MockObject $validator */
         $validator = new Validator();
+        $session->set('errors', [['bar' => 'some.bar.error']]);
 
         $user = new User([
             'name'          => 'foo',
@@ -89,7 +89,7 @@ class AuthControllerTest extends TestCase
 
         $response->expects($this->once())
             ->method('withView')
-            ->with('pages/login', ['errors' => Collection::make(['auth.not-found'])])
+            ->with('pages/login', ['errors' => collect(['some.bar.error', 'auth.not-found'])])
             ->willReturn($response);
         $response->expects($this->once())
             ->method('redirectTo')
diff --git a/tests/Unit/Controllers/Metrics/StatsTest.php b/tests/Unit/Controllers/Metrics/StatsTest.php
index fa78d8c3..9204f7db 100644
--- a/tests/Unit/Controllers/Metrics/StatsTest.php
+++ b/tests/Unit/Controllers/Metrics/StatsTest.php
@@ -155,8 +155,8 @@ class StatsTest extends TestCase
         $this->initDatabase();
         $this->addUsers();
 
-        (new PasswordReset(['use_id' => 1, 'token' => 'loremIpsum123']))->save();
-        (new PasswordReset(['use_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
+        (new PasswordReset(['user_id' => 1, 'token' => 'loremIpsum123']))->save();
+        (new PasswordReset(['user_id' => 3, 'token' => '5omeR4nd0mTok3N']))->save();
 
         $stats = new Stats($this->database);
         $this->assertEquals(2, $stats->passwordResets());

From 8f8130634e40f6a24295b7bab449a43ed7c5aa80 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 15:23:46 +0200
Subject: [PATCH 07/17] Show normal login page after registration, added msg()
 template function

---
 includes/pages/guest_login.php                |  4 +-
 includes/view/User_view.php                   | 58 +++++--------------
 resources/views/pages/login.twig              |  1 +
 src/Renderer/Twig/Extensions/Legacy.php       |  1 +
 .../Renderer/Twig/Extensions/LegacyTest.php   |  1 +
 5 files changed, 18 insertions(+), 47 deletions(-)

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 280743e5..170572e4 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -242,9 +242,9 @@ function guest_register()
                 redirect(page_link_to('register'));
             }
 
-            // If a welcome message is present, display registration success page.
+            // If a welcome message is present, display it on the next page
             if ($message = $config->get('welcome_msg')) {
-                return User_registration_success_view($message);
+                info((new Parsedown())->text($message));
             }
 
             redirect(page_link_to('/'));
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index bfe7e02c..b38a5062 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -107,46 +107,6 @@ function User_settings_view(
     ]);
 }
 
-/**
- * Displays the welcome message to the user and shows a login form.
- *
- * @param string $event_welcome_message
- * @return string
- */
-function User_registration_success_view($event_welcome_message)
-{
-    $parsedown = new Parsedown();
-    $event_welcome_message = $parsedown->text($event_welcome_message);
-
-    return page_with_title(__('Registration successful'), [
-        msg(),
-        div('row', [
-            div('col-md-4', [
-                $event_welcome_message
-            ]),
-            div('col-md-4', [
-                '<h2>' . __('Login') . '</h2>',
-                form([
-                    form_text('login', __('Nick'), ''),
-                    form_password('password', __('Password')),
-                    form_submit('submit', __('Login')),
-                    buttons([
-                        button(page_link_to('user_password_recovery'), __('I forgot my password'))
-                    ]),
-                    info(__('Please note: You have to activate cookies!'), true)
-                ], page_link_to('login'))
-            ]),
-            div('col-md-4', [
-                '<h2>' . __('What can I do?') . '</h2>',
-                '<p>' . __('Please read about the jobs you can do to help us.') . '</p>',
-                buttons([
-                    button(page_link_to('angeltypes', ['action' => 'about']), __('Teams/Job description') . ' &raquo;')
-                ])
-            ])
-        ])
-    ]);
-}
-
 /**
  * Gui for deleting user with password field.
  *
@@ -255,13 +215,13 @@ function Users_view(
     ];
 
     $user_table_headers = [
-        'name'           => Users_table_header_link('name', __('Nick'), $order_by)
+        'name' => Users_table_header_link('name', __('Nick'), $order_by)
     ];
-    if(config('enable_user_name')) {
+    if (config('enable_user_name')) {
         $user_table_headers['first_name'] = Users_table_header_link('first_name', __('Prename'), $order_by);
         $user_table_headers['last_name'] = Users_table_header_link('last_name', __('Name'), $order_by);
     }
-    if(config('enable_dect')) {
+    if (config('enable_dect')) {
         $user_table_headers['dect'] = Users_table_header_link('dect', __('DECT'), $order_by);
     }
     $user_table_headers['arrived'] = Users_table_header_link('arrived', __('Arrived'), $order_by);
@@ -271,8 +231,16 @@ function Users_view(
     $user_table_headers['force_active'] = Users_table_header_link('force_active', __('Forced'), $order_by);
     $user_table_headers['got_shirt'] = Users_table_header_link('got_shirt', __('T-Shirt'), $order_by);
     $user_table_headers['shirt_size'] = Users_table_header_link('shirt_size', __('Size'), $order_by);
-    $user_table_headers['arrival_date'] = Users_table_header_link('planned_arrival_date', __('Planned arrival'), $order_by);
-    $user_table_headers['departure_date'] = Users_table_header_link('planned_departure_date', __('Planned departure'), $order_by);
+    $user_table_headers['arrival_date'] = Users_table_header_link(
+        'planned_arrival_date',
+        __('Planned arrival'),
+        $order_by
+    );
+    $user_table_headers['departure_date'] = Users_table_header_link(
+        'planned_departure_date',
+        __('Planned departure'),
+        $order_by
+    );
     $user_table_headers['last_login_at'] = Users_table_header_link('last_login_at', __('Last login'), $order_by);
     $user_table_headers['actions'] = '';
 
diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig
index 88326429..6160508f 100644
--- a/resources/views/pages/login.twig
+++ b/resources/views/pages/login.twig
@@ -32,6 +32,7 @@
             <div class="col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
                 <div class="panel panel-primary first">
                     <div class="panel-body">
+                        {{ msg() }}
                         {% for message in errors|default([]) %}
                             {{ m.alert(__(message), 'danger') }}
                         {% endfor %}
diff --git a/src/Renderer/Twig/Extensions/Legacy.php b/src/Renderer/Twig/Extensions/Legacy.php
index 79de32cb..55c095fc 100644
--- a/src/Renderer/Twig/Extensions/Legacy.php
+++ b/src/Renderer/Twig/Extensions/Legacy.php
@@ -32,6 +32,7 @@ class Legacy extends TwigExtension
             new TwigFunction('menuUserHints', 'header_render_hints', $isSafeHtml),
             new TwigFunction('menuUserSubmenu', 'make_user_submenu', $isSafeHtml),
             new TwigFunction('page', [$this, 'getPage']),
+            new TwigFunction('msg', 'msg', $isSafeHtml),
         ];
     }
 
diff --git a/tests/Unit/Renderer/Twig/Extensions/LegacyTest.php b/tests/Unit/Renderer/Twig/Extensions/LegacyTest.php
index b6c19d14..7190c979 100644
--- a/tests/Unit/Renderer/Twig/Extensions/LegacyTest.php
+++ b/tests/Unit/Renderer/Twig/Extensions/LegacyTest.php
@@ -26,6 +26,7 @@ class LegacyTest extends ExtensionTest
         $this->assertExtensionExists('menuUserHints', 'header_render_hints', $functions, $isSafeHtml);
         $this->assertExtensionExists('menuUserSubmenu', 'make_user_submenu', $functions, $isSafeHtml);
         $this->assertExtensionExists('page', [$extension, 'getPage'], $functions);
+        $this->assertExtensionExists('msg', 'msg', $functions, $isSafeHtml);
     }
 
     /**

From dd0366296893a0e8da8ae0365387dd4823d53451 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Tue, 8 Oct 2019 16:17:06 +0200
Subject: [PATCH 08/17] Rebuild password reset

---
 config/routes.php                             |   6 +
 includes/controller/users_controller.php      | 115 --------
 includes/model/User_model.php                 |  19 --
 includes/view/User_view.php                   |  35 ---
 resources/lang/de_DE/default.mo               | Bin 46206 -> 46693 bytes
 resources/lang/de_DE/default.po               |  22 +-
 resources/lang/en_US/default.mo               | Bin 770 -> 1240 bytes
 resources/lang/en_US/default.po               |  18 ++
 resources/lang/pt_BR/default.mo               | Bin 41129 -> 41132 bytes
 resources/lang/pt_BR/default.po               |   2 +-
 resources/views/emails/mail.twig              |   8 +-
 resources/views/emails/password-reset.twig    |   3 +
 resources/views/macros/form.twig              |  18 ++
 resources/views/pages/login.twig              |   2 +-
 .../views/pages/password/reset-form.twig      |  18 ++
 .../views/pages/password/reset-success.twig   |  12 +
 resources/views/pages/password/reset.twig     |  32 +++
 src/Controllers/PasswordResetController.php   | 167 +++++++++++
 src/Middleware/LegacyMiddleware.php           |   6 -
 .../PasswordResetControllerTest.php           | 266 ++++++++++++++++++
 20 files changed, 566 insertions(+), 183 deletions(-)
 create mode 100644 resources/views/emails/password-reset.twig
 create mode 100644 resources/views/macros/form.twig
 create mode 100644 resources/views/pages/password/reset-form.twig
 create mode 100644 resources/views/pages/password/reset-success.twig
 create mode 100644 resources/views/pages/password/reset.twig
 create mode 100644 src/Controllers/PasswordResetController.php
 create mode 100644 tests/Unit/Controllers/PasswordResetControllerTest.php

diff --git a/config/routes.php b/config/routes.php
index 02fd3abd..e57d3079 100644
--- a/config/routes.php
+++ b/config/routes.php
@@ -13,6 +13,12 @@ $route->get('/login', 'AuthController@login');
 $route->post('/login', 'AuthController@postLogin');
 $route->get('/logout', 'AuthController@logout');
 
+// Password recovery
+$route->get('/password/reset', 'PasswordResetController@reset');
+$route->post('/password/reset', 'PasswordResetController@postReset');
+$route->get('/password/reset/{token:.+}', 'PasswordResetController@resetPassword');
+$route->post('/password/reset/{token:.+}', 'PasswordResetController@postResetPassword');
+
 // Stats
 $route->get('/metrics', 'Metrics\\Controller@metrics');
 $route->get('/stats', 'Metrics\\Controller@stats');
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 892089e7..3ad2ffd9 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -1,7 +1,6 @@
 <?php
 
 use Engelsystem\Database\DB;
-use Engelsystem\Models\User\PasswordReset;
 use Engelsystem\Models\User\State;
 use Engelsystem\Models\User\User;
 use Engelsystem\ShiftCalendarRenderer;
@@ -311,120 +310,6 @@ function users_list_controller()
     ];
 }
 
-/**
- * Second step of password recovery: set a new password using the token link from email
- *
- * @return string
- */
-function user_password_recovery_set_new_controller()
-{
-    $request = request();
-    $passwordReset = PasswordReset::whereToken($request->input('token'))->first();
-    if (!$passwordReset) {
-        error(__('Token is not correct.'));
-        redirect(page_link_to('login'));
-    }
-
-    if ($request->hasPostData('submit')) {
-        $valid = true;
-
-        if (
-            $request->has('password')
-            && strlen($request->postData('password')) >= config('min_password_length')
-        ) {
-            if ($request->postData('password') != $request->postData('password2')) {
-                $valid = false;
-                error(__('Your passwords don\'t match.'));
-            }
-        } else {
-            $valid = false;
-            error(__('Your password is to short (please use at least 6 characters).'));
-        }
-
-        if ($valid) {
-            auth()->setPassword($passwordReset->user, $request->postData('password'));
-            success(__('Password saved.'));
-            $passwordReset->delete();
-            redirect(page_link_to('login'));
-        }
-    }
-
-    return User_password_set_view();
-}
-
-/**
- * First step of password recovery: display a form that asks for your email and send email with recovery link
- *
- * @return string
- */
-function user_password_recovery_start_controller()
-{
-    $request = request();
-    if ($request->hasPostData('submit')) {
-        $valid = true;
-
-        $user_source = null;
-        if ($request->has('email') && strlen(strip_request_item('email')) > 0) {
-            $email = strip_request_item('email');
-            if (check_email($email)) {
-                /** @var User $user_source */
-                $user_source = User::whereEmail($email)->first();
-                if (!$user_source) {
-                    $valid = false;
-                    error(__('E-mail address is not correct.'));
-                }
-            } else {
-                $valid = false;
-                error(__('E-mail address is not correct.'));
-            }
-        } else {
-            $valid = false;
-            error(__('Please enter your e-mail.'));
-        }
-
-        if ($valid) {
-            $token = User_generate_password_recovery_token($user_source);
-            engelsystem_email_to_user(
-                $user_source,
-                __('Password recovery'),
-                sprintf(
-                    __('Please visit %s to recover your password.'),
-                    page_link_to('user_password_recovery', ['token' => $token])
-                )
-            );
-            success(__('We sent an email containing your password recovery link.'));
-            redirect(page_link_to('login'));
-        }
-    }
-
-    return User_password_recovery_view();
-}
-
-/**
- * User password recovery in 2 steps.
- * (By email)
- *
- * @return string
- */
-function user_password_recovery_controller()
-{
-    if (request()->has('token')) {
-        return user_password_recovery_set_new_controller();
-    }
-
-    return user_password_recovery_start_controller();
-}
-
-/**
- * Menu title for password recovery.
- *
- * @return string
- */
-function user_password_recovery_title()
-{
-    return __('Password recovery');
-}
-
 /**
  * Loads a user from param user_id.
  *
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 1994bc47..681e70aa 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -2,7 +2,6 @@
 
 use Carbon\Carbon;
 use Engelsystem\Database\DB;
-use Engelsystem\Models\User\PasswordReset;
 use Engelsystem\Models\User\User;
 use Engelsystem\ValidationResult;
 use Illuminate\Database\Query\JoinClause;
@@ -227,24 +226,6 @@ function User_reset_api_key($user, $log = true)
     }
 }
 
-/**
- * Generates a new password recovery token for given user.
- *
- * @param User $user
- * @return string
- */
-function User_generate_password_recovery_token($user)
-{
-    $reset = PasswordReset::findOrNew($user->id);
-    $reset->user_id = $user->id;
-    $reset->token = md5($user->name . time() . rand());
-    $reset->save();
-
-    engelsystem_log('Password recovery for ' . User_Nick_render($user, true) . ' started.');
-
-    return $reset->token;
-}
-
 /**
  * @param User $user
  * @return float
diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index b38a5062..95ecb626 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -759,41 +759,6 @@ function User_view_state_admin($freeloader, $user_source)
     return $state;
 }
 
-/**
- * View for password recovery step 1: E-Mail
- *
- * @return string
- */
-function User_password_recovery_view()
-{
-    return page_with_title(user_password_recovery_title(), [
-        msg(),
-        __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.'),
-        form([
-            form_text('email', __('E-Mail'), ''),
-            form_submit('submit', __('Recover'))
-        ])
-    ]);
-}
-
-/**
- * View for password recovery step 2: New password
- *
- * @return string
- */
-function User_password_set_view()
-{
-    return page_with_title(user_password_recovery_title(), [
-        msg(),
-        __('Please enter a new password.'),
-        form([
-            form_password('password', __('Password')),
-            form_password('password2', __('Confirm password')),
-            form_submit('submit', __('Save'))
-        ])
-    ]);
-}
-
 /**
  * @param array[] $user_angeltypes
  * @return string
diff --git a/resources/lang/de_DE/default.mo b/resources/lang/de_DE/default.mo
index fb93d59098f243fc9f3d8f04dc65da27eb7ce8d5..d4b7885bdb60dad5663232db1d20a4ced7afa4b8 100644
GIT binary patch
delta 10236
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

delta 9860
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
GrT+u%oKx=r

diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po
index 091e1114..d6dc38bb 100644
--- a/resources/lang/de_DE/default.po
+++ b/resources/lang/de_DE/default.po
@@ -619,9 +619,9 @@ msgid "Please visit %s to recover your password."
 msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen"
 
 #: includes/controller/users_controller.php:394
-msgid "We sent an email containing your password recovery link."
+msgid "We sent you an email containing your password recovery link."
 msgstr ""
-"Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
+"Wir haben dir eine eMail mit einem Link zum Passwort-zurücksetzen geschickt."
 
 #: includes/helper/email_helper.php:41
 #, php-format
@@ -2769,3 +2769,21 @@ msgstr "Bitte gib ein Passwort an."
 
 msgid "validation.login.required"
 msgstr "Bitte gib einen Loginnamen an."
+
+msgid "form.submit"
+msgstr "Absenden"
+
+msgid "validation.email.required"
+msgstr "Bitte gib eine E-Mail-Adresse an."
+
+msgid "validation.email.email"
+msgstr "Die E-Mail-Adresse ist nicht gültig."
+
+msgid "validation.password.min"
+msgstr "Dein angegebenes Passwort ist zu kurz."
+
+msgid "validation.password.confirmed"
+msgstr "Deine Passwörter stimmen nicht überein."
+
+msgid "validation.password_confirmation.required"
+msgstr "Du musst dein Passwort bestätigen."
diff --git a/resources/lang/en_US/default.mo b/resources/lang/en_US/default.mo
index 7ef9c3b2c086aec2c1c210507ed820614e9f409d..30dd375dc39bc5f1a990046ec381e6b165c06100 100644
GIT binary patch
delta 598
zcmZXPu}T9$5QZl)QKQB}i6UxP4G0!qXK5qk2@HsptllQKaCfV_cL`PjOGWSq3hEmO
z78Z6kw$>Il`V9I4;(wb2BN_Pj+ufP{XZCdTz0m%g$z2g*0$PH6s0cknX?#J`&^I&*
zQHE#^m;x8TN{?IMGS0i;JQ#zi-vzi1-h(gD8`Qx0dW2|{s7*iEFkIwwL}hRdTm-9N
zYRG%%HkdZN16RQ(5MDN5VPhQY7*v3ewvor0h0+hAAq?Zlb3zqu)KwgAx>Q#>a7=s<
z$cUQUmoAT_3LOz}>37$m>*TVOoL5#3Ralog5bj{X5jUo#wCe;iOm51_?QC(sS7?nN
zA3icArZnppGHF;#tFX~I%WhY9x`Wg_+}aTscU>)vNy{)bvm-iG^Tcpoi{n^o;dWlL
y<<_2x|C$)awXp9|!hMJSWmE4+DP}ySqptVhbbVX<ig~;#P|bRuVkd)r9Qp-ETa-!w

delta 176
zcmcb?*~C_VPl#nI0}!wPu?!H~05K~N#{e-16aX<F5ElZmBoH?MF-YAkAU?>*z_1-i
z2LW*<69a=ZkUj&XLF!%rX`nO%GZ2H!1_7WD14CkINrqlteu-{ceraCHWE)2P&8Hdf
pFizgX>?9SEk*biBpPregke8U7s*qW%P?TC&npu>ZGI=J83;_7{AP@im

diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po
index 1ff16c83..a2d56fd1 100644
--- a/resources/lang/en_US/default.po
+++ b/resources/lang/en_US/default.po
@@ -30,3 +30,21 @@ msgstr "The password is required."
 
 msgid "validation.login.required"
 msgstr "The login name is required."
+
+msgid "form.submit"
+msgstr "Submit"
+
+msgid "validation.email.required"
+msgstr "The email address is required."
+
+msgid "validation.email.email"
+msgstr "This email address is not valid."
+
+msgid "validation.password.min"
+msgstr "Your password is too short."
+
+msgid "validation.password.confirmed"
+msgstr "Your passwords are not equal."
+
+msgid "validation.password_confirmation.required"
+msgstr "You have to confirm your password."
diff --git a/resources/lang/pt_BR/default.mo b/resources/lang/pt_BR/default.mo
index 8b8641565705f92b5dbcf78956dbb887cd62b6bb..d15826e6b0ee3c286dca910b7223e6c2b67156cf 100644
GIT binary patch
delta 4947
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
HtU><=wBNr<

delta 4944
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
I`m<U82dlKatN;K2

diff --git a/resources/lang/pt_BR/default.po b/resources/lang/pt_BR/default.po
index b9bf420d..e5e5371e 100644
--- a/resources/lang/pt_BR/default.po
+++ b/resources/lang/pt_BR/default.po
@@ -551,7 +551,7 @@ msgid "Please visit %s to recover your password."
 msgstr "Por favor visite %s para recuperar sua senha"
 
 #: includes/controller/users_controller.php:271
-msgid "We sent an email containing your password recovery link."
+msgid "We sent you an email containing your password recovery link."
 msgstr "Nós enviamos um email com o link para recuperação da sua senha."
 
 #: includes/helper/email_helper.php:12
diff --git a/resources/views/emails/mail.twig b/resources/views/emails/mail.twig
index ec70f594..e0ad7b64 100644
--- a/resources/views/emails/mail.twig
+++ b/resources/views/emails/mail.twig
@@ -1,6 +1,6 @@
-{{ __('Hi %s,', [username]) }}
+{% block title %}{{ __('Hi %s,', [username]) }}{% endblock %}
 
-{{ __('here is a message for you from the %s:', [config('app_name')]) }}
-{{ message|raw }}
+{% block introduction %}{{ __('here is a message for you from the %s:', [config('app_name')]) }}{% endblock %}
+{% block message %}{{ message|raw }}{% endblock %}
 
-{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }}
+{% block footer %}{{ __('This email is autogenerated and has not been signed. You got this email because you are registered in the %s.', [config('app_name')]) }}{% endblock %}
diff --git a/resources/views/emails/password-reset.twig b/resources/views/emails/password-reset.twig
new file mode 100644
index 00000000..30b613b4
--- /dev/null
+++ b/resources/views/emails/password-reset.twig
@@ -0,0 +1,3 @@
+{% extends "emails/mail.twig" %}
+
+{% block message %}{{ __('Please visit %s to recover your password.', [url('/password/reset/') ~ reset.token]) }}{% endblock %}
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
new file mode 100644
index 00000000..5d41b085
--- /dev/null
+++ b/resources/views/macros/form.twig
@@ -0,0 +1,18 @@
+{% macro input(name, label, type, required) %}
+    <div class="form-group">
+        {% if label %}
+            <label for="{{ name }}">{{ label }}</label>
+        {% endif %}
+        <input type="{{ type|default('text') }}" class="form-control" id="{{ name }}" name="{{ name }}"
+                {%- if required|default(false) %} required="required"{% endif -%}
+        >
+    </div>
+{% endmacro %}
+
+{% macro hidden(name, value) %}
+    <input type="hidden" id="{{ name }}" name="{{ name }}" value="{{ value }}">
+{% endmacro %}
+
+{% macro submit(label) %}
+    <button type="submit" class="btn btn-default">{{ label|default(__('form.submit')) }}</button>
+{% endmacro %}
diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig
index 6160508f..34dbd63f 100644
--- a/resources/views/pages/login.twig
+++ b/resources/views/pages/login.twig
@@ -62,7 +62,7 @@
                             </div>
 
                             <div class="text-center">
-                                <a href="{{ url('user-password-recovery') }}" class="">
+                                <a href="{{ url('/password/reset') }}" class="">
                                     {{ __('I forgot my password') }}
                                 </a>
                             </div>
diff --git a/resources/views/pages/password/reset-form.twig b/resources/views/pages/password/reset-form.twig
new file mode 100644
index 00000000..60eb2499
--- /dev/null
+++ b/resources/views/pages/password/reset-form.twig
@@ -0,0 +1,18 @@
+{% extends "pages/password/reset.twig" %}
+{% import 'macros/base.twig' as m %}
+{% import 'macros/form.twig' as f %}
+
+{% block row_content %}
+    <div class="col-md-8">
+        <form action="" enctype="multipart/form-data" method="post">
+            {{ csrf() }}
+
+            {{ f.input('password', __('Password'), 'password', true) }}
+            {{ f.input('password_confirmation', __('Confirm password'), 'password', true) }}
+
+            <div class="form-group">
+                {{ f.submit(__('Save')) }}
+            </div>
+        </form>
+    </div>
+{% endblock %}
diff --git a/resources/views/pages/password/reset-success.twig b/resources/views/pages/password/reset-success.twig
new file mode 100644
index 00000000..19b8a93e
--- /dev/null
+++ b/resources/views/pages/password/reset-success.twig
@@ -0,0 +1,12 @@
+{% extends "pages/password/reset.twig" %}
+{% import 'macros/base.twig' as m %}
+
+{% block row_content %}
+    <div class="col-md-12">
+        {% if type == 'email' %}
+            {{ m.alert(__('We sent you an email containing your password recovery link.'), 'info') }}
+        {% elseif type == 'reset' %}
+            {{ m.alert(__('Password saved.'), 'success') }}
+        {% endif %}
+    </div>
+{% endblock %}
diff --git a/resources/views/pages/password/reset.twig b/resources/views/pages/password/reset.twig
new file mode 100644
index 00000000..289152ea
--- /dev/null
+++ b/resources/views/pages/password/reset.twig
@@ -0,0 +1,32 @@
+{% extends 'layouts/app.twig' %}
+{% import 'macros/base.twig' as m %}
+{% import 'macros/form.twig' as f %}
+
+{% block title %}{{ __('Password recovery') }}{% endblock %}
+
+{% block content %}
+    <div class="container">
+        <h1>{{ __('Password recovery') }}</h1>
+
+        {% for message in errors|default([]) %}
+            {{ m.alert(__(message), 'danger') }}
+        {% endfor %}
+
+        <div class="row">
+            {% block row_content %}
+                <div class="col-md-8">
+                    <form action="" enctype="multipart/form-data" method="post">
+                        {{ csrf() }}
+
+                        {{ __('We will send you an e-mail with a password recovery link. Please use the email address you used for registration.') }}
+                        {{ f.input('email', __('E-Mail'), 'email', true) }}
+
+                        <div class="form-group">
+                            {{ f.submit(__('Recover')) }}
+                        </div>
+                    </form>
+                </div>
+            {% endblock %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/src/Controllers/PasswordResetController.php b/src/Controllers/PasswordResetController.php
new file mode 100644
index 00000000..505ed8eb
--- /dev/null
+++ b/src/Controllers/PasswordResetController.php
@@ -0,0 +1,167 @@
+<?php
+
+namespace Engelsystem\Controllers;
+
+use Engelsystem\Http\Exceptions\HttpNotFound;
+use Engelsystem\Http\Request;
+use Engelsystem\Http\Response;
+use Engelsystem\Mail\EngelsystemMailer;
+use Engelsystem\Models\User\PasswordReset;
+use Engelsystem\Models\User\User;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+
+class PasswordResetController extends BaseController
+{
+    /** @var LoggerInterface */
+    protected $log;
+
+    /** @var EngelsystemMailer */
+    protected $mail;
+
+    /** @var Response */
+    protected $response;
+
+    /** @var SessionInterface */
+    protected $session;
+
+    /** @var array */
+    protected $permissions = [
+        'reset'             => 'login',
+        'postReset'         => 'login',
+        'resetPassword'     => 'login',
+        'postResetPassword' => 'login',
+    ];
+
+    /**
+     * @param Response          $response
+     * @param SessionInterface  $session
+     * @param EngelsystemMailer $mail
+     * @param LoggerInterface   $log
+     */
+    public function __construct(
+        Response $response,
+        SessionInterface $session,
+        EngelsystemMailer $mail,
+        LoggerInterface $log
+    ) {
+        $this->log = $log;
+        $this->mail = $mail;
+        $this->response = $response;
+        $this->session = $session;
+    }
+
+    /**
+     * @return Response
+     */
+    public function reset(): Response
+    {
+        return $this->showView('pages/password/reset');
+    }
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function postReset(Request $request): Response
+    {
+        $data = $this->validate($request, [
+            'email' => 'required|email',
+        ]);
+
+        /** @var User $user */
+        $user = User::whereEmail($data['email'])->first();
+        if ($user) {
+            $reset = PasswordReset::findOrNew($user->id);
+            $reset->user_id = $user->id;
+            $reset->token = md5(random_bytes(64));
+            $reset->save();
+
+            $this->log->info(
+                sprintf('Password recovery for %s (%u)', $user->name, $user->id),
+                ['user' => $user->toJson()]
+            );
+
+            $this->mail->sendViewTranslated(
+                $user,
+                'Password recovery',
+                'emails/password-reset',
+                ['username' => $user->name, 'reset' => $reset]
+            );
+        }
+
+        return $this->showView('pages/password/reset-success', ['type' => 'email']);
+    }
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function resetPassword(Request $request): Response
+    {
+        $this->requireToken($request);
+
+        return $this->showView('pages/password/reset-form');
+    }
+
+    /**
+     * @param Request $request
+     * @return Response
+     */
+    public function postResetPassword(Request $request): Response
+    {
+        $reset = $this->requireToken($request);
+
+        $data = $this->validate($request, [
+            'password'              => 'required|min:' . config('min_password_length'),
+            'password_confirmation' => 'required',
+        ]);
+
+        if ($data['password'] !== $data['password_confirmation']) {
+            $this->session->set('errors',
+                array_merge($this->session->get('errors', []), ['validation.password.confirmed']));
+
+            return $this->showView('pages/password/reset-form');
+        }
+
+        auth()->setPassword($reset->user, $data['password']);
+        $reset->delete();
+
+        return $this->showView('pages/password/reset-success', ['type' => 'reset']);
+    }
+
+    /**
+     * @param string $view
+     * @param array  $data
+     * @return Response
+     */
+    protected function showView($view = 'pages/password/reset', $data = []): Response
+    {
+        $errors = Collection::make(Arr::flatten($this->session->get('errors', [])));
+        $this->session->remove('errors');
+
+        return $this->response->withView(
+            $view,
+            array_merge_recursive(['errors' => $errors], $data)
+        );
+    }
+
+    /**
+     * @param Request $request
+     * @return PasswordReset
+     */
+    protected function requireToken(Request $request): PasswordReset
+    {
+        $token = $request->getAttribute('token');
+        /** @var PasswordReset|null $reset */
+        $reset = PasswordReset::whereToken($token)->first();
+
+        if (!$reset) {
+            throw new HttpNotFound();
+        }
+
+        return $reset;
+    }
+}
diff --git a/src/Middleware/LegacyMiddleware.php b/src/Middleware/LegacyMiddleware.php
index 27a15faa..11508e1c 100644
--- a/src/Middleware/LegacyMiddleware.php
+++ b/src/Middleware/LegacyMiddleware.php
@@ -26,7 +26,6 @@ class LegacyMiddleware implements MiddlewareInterface
         'shifts_json_export',
         'users',
         'user_driver_licenses',
-        'user_password_recovery',
         'user_worklog',
     ];
 
@@ -112,11 +111,6 @@ class LegacyMiddleware implements MiddlewareInterface
             case 'shifts_json_export':
                 require_once realpath(__DIR__ . '/../../includes/controller/shifts_controller.php');
                 shifts_json_export_controller();
-            case 'user_password_recovery':
-                require_once realpath(__DIR__ . '/../../includes/controller/users_controller.php');
-                $title = user_password_recovery_title();
-                $content = user_password_recovery_controller();
-                return [$title, $content];
             case 'public_dashboard':
                 return public_dashboard_controller();
             case 'angeltypes':
diff --git a/tests/Unit/Controllers/PasswordResetControllerTest.php b/tests/Unit/Controllers/PasswordResetControllerTest.php
new file mode 100644
index 00000000..54046cef
--- /dev/null
+++ b/tests/Unit/Controllers/PasswordResetControllerTest.php
@@ -0,0 +1,266 @@
+<?php
+
+namespace Engelsystem\Test\Unit\Controllers;
+
+use Engelsystem\Config\Config;
+use Engelsystem\Controllers\PasswordResetController;
+use Engelsystem\Helpers\Authenticator;
+use Engelsystem\Http\Exceptions\HttpNotFound;
+use Engelsystem\Http\Exceptions\ValidationException;
+use Engelsystem\Http\Request;
+use Engelsystem\Http\Response;
+use Engelsystem\Http\Validation\Validator;
+use Engelsystem\Mail\EngelsystemMailer;
+use Engelsystem\Models\User\PasswordReset;
+use Engelsystem\Models\User\User;
+use Engelsystem\Renderer\Renderer;
+use Engelsystem\Test\Unit\HasDatabase;
+use Engelsystem\Test\Unit\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\Test\TestLogger;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
+
+class PasswordResetControllerTest extends TestCase
+{
+    use HasDatabase;
+
+    /** @var array */
+    protected $args = [];
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::reset
+     * @covers \Engelsystem\Controllers\PasswordResetController::__construct
+     */
+    public function testReset(): void
+    {
+        $controller = $this->getController('pages/password/reset');
+        $response = $controller->reset();
+
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::postReset
+     */
+    public function testPostReset(): void
+    {
+        $this->initDatabase();
+        $request = new Request([], ['email' => 'foo@bar.batz']);
+        $user = $this->createUser();
+
+        $controller = $this->getController(
+            'pages/password/reset-success',
+            ['type' => 'email', 'errors' => collect()]
+        );
+        /** @var TestLogger $log */
+        $log = $this->args['log'];
+        /** @var EngelsystemMailer|MockObject $mailer */
+        $mailer = $this->args['mailer'];
+        $this->setExpects($mailer, 'sendViewTranslated');
+
+        $controller->postReset($request);
+
+        $this->assertNotEmpty(PasswordReset::find($user->id)->first());
+        $this->assertTrue($log->hasInfoThatContains($user->name));
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::postReset
+     */
+    public function testPostResetInvalidRequest(): void
+    {
+        $request = new Request();
+
+        $controller = $this->getController();
+
+        $this->expectException(ValidationException::class);
+        $controller->postReset($request);
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::postReset
+     */
+    public function testPostResetNoUser(): void
+    {
+        $this->initDatabase();
+        $request = new Request([], ['email' => 'foo@bar.batz']);
+
+        $controller = $this->getController(
+            'pages/password/reset-success',
+            ['type' => 'email', 'errors' => collect()]
+        );
+
+        $controller->postReset($request);
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::resetPassword
+     * @covers \Engelsystem\Controllers\PasswordResetController::requireToken
+     */
+    public function testResetPassword(): void
+    {
+        $this->initDatabase();
+
+        $user = $this->createUser();
+        $token = $this->createToken($user);
+        $request = new Request([], [], ['token' => $token->token]);
+
+        $controller = $this->getController('pages/password/reset-form');
+
+        $controller->resetPassword($request);
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::resetPassword
+     * @covers \Engelsystem\Controllers\PasswordResetController::requireToken
+     */
+    public function testResetPasswordNoToken(): void
+    {
+        $this->initDatabase();
+        $controller = $this->getController();
+
+        $this->expectException(HttpNotFound::class);
+        $controller->resetPassword(new Request());
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::postResetPassword
+     */
+    public function testPostResetPassword(): void
+    {
+        $this->initDatabase();
+
+        $this->app->instance('config', new Config(['min_password_length' => 3]));
+        $user = $this->createUser();
+        $token = $this->createToken($user);
+        $password = 'SomeRandomPasswordForAmazingSecurity';
+        $request = new Request(
+            [],
+            ['password' => $password, 'password_confirmation' => $password],
+            ['token' => $token->token]
+        );
+
+        $controller = $this->getController(
+            'pages/password/reset-success',
+            ['type' => 'reset', 'errors' => collect()]
+        );
+
+        $auth = new Authenticator($request, $this->args['session'], $user);
+        $this->app->instance('authenticator', $auth);
+
+        $response = $controller->postResetPassword($request);
+        $this->assertEquals(200, $response->getStatusCode());
+
+        $this->assertEmpty(PasswordReset::find($user->id));
+        $this->assertNotNull(auth()->authenticate($user->name, $password));
+    }
+
+    /**
+     * @covers \Engelsystem\Controllers\PasswordResetController::postResetPassword
+     * @covers \Engelsystem\Controllers\PasswordResetController::showView
+     */
+    public function testPostResetPasswordNotMatching(): void
+    {
+        $this->initDatabase();
+
+        $this->app->instance('config', new Config(['min_password_length' => 3]));
+        $user = $this->createUser();
+        $token = $this->createToken($user);
+        $password = 'SomeRandomPasswordForAmazingSecurity';
+        $request = new Request(
+            [],
+            ['password' => $password, 'password_confirmation' => $password . 'OrNot'],
+            ['token' => $token->token]
+        );
+
+        $controller = $this->getController(
+            'pages/password/reset-form',
+            ['errors' => collect(['some.other.error', 'validation.password.confirmed'])]
+        );
+        /** @var Session $session */
+        $session = $this->args['session'];
+        $session->set('errors', ['foo' => ['bar' => 'some.other.error']]);
+
+        $controller->postResetPassword($request);
+        $this->assertEmpty($session->get('errors'));
+    }
+
+    /**
+     * @return array
+     */
+    protected function getControllerArgs(): array
+    {
+        $response = new Response();
+        $session = new Session(new MockArraySessionStorage());
+        /** @var EngelsystemMailer|MockObject $mailer */
+        $mailer = $this->createMock(EngelsystemMailer::class);
+        $log = new TestLogger();
+        $renderer = $this->createMock(Renderer::class);
+        $response->setRenderer($renderer);
+
+        return $this->args = [
+            'response' => $response,
+            'session'  => $session,
+            'mailer'   => $mailer,
+            'log'      => $log,
+            'renderer' => $renderer
+        ];
+    }
+
+    /**
+     * @param string $view
+     * @param array  $data
+     * @return PasswordResetController
+     */
+    protected function getController(?string $view = null, ?array $data = null): PasswordResetController
+    {
+        /** @var Response $response */
+        /** @var Session $session */
+        /** @var EngelsystemMailer|MockObject $mailer */
+        /** @var TestLogger $log */
+        /** @var Renderer|MockObject $renderer */
+        list($response, $session, $mailer, $log, $renderer) = array_values($this->getControllerArgs());
+        $controller = new PasswordResetController($response, $session, $mailer, $log);
+        $controller->setValidator(new Validator());
+
+        if ($view) {
+            $args = [$view];
+            if ($data) {
+                $args[] = $data;
+            }
+
+            $this->setExpects($renderer, 'render', $args, 'Foo');
+        }
+
+        return $controller;
+    }
+
+    /**
+     * @return User
+     */
+    protected function createUser(): User
+    {
+        $user = new User([
+            'name'     => 'foo',
+            'password' => '',
+            'email'    => 'foo@bar.batz',
+            'api_key'  => '',
+        ]);
+        $user->save();
+
+        return $user;
+    }
+
+    /**
+     * @param User $user
+     * @return PasswordReset
+     */
+    protected function createToken(User $user): PasswordReset
+    {
+        $reset = new PasswordReset(['user_id' => $user->id, 'token' => 'SomeTestToken123']);
+        $reset->save();
+
+        return $reset;
+    }
+}

From c9ebaa972cb2a16e16ffc78080f03342eae5d874 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 6 Sep 2019 03:45:56 +0200
Subject: [PATCH 09/17] Shifts view: Persist hidden filters

---
 resources/assets/js/forms.js           | 35 +++++++++++++++++++++++---
 resources/views/pages/user-shifts.html |  8 +++---
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/forms.js b/resources/assets/js/forms.js
index f5818e97..9970b907 100644
--- a/resources/assets/js/forms.js
+++ b/resources/assets/js/forms.js
@@ -16,7 +16,7 @@ global.checkAll = (id, checked) => {
  * Sets the checkboxes according to the given type
  *
  * @param {string} id The elements ID
- * @param {list} shifts_list A list of numbers
+ * @param {list} shiftsList A list of numbers
  */
 global.checkOwnTypes = (id, shiftsList) => {
     $('#' + id + ' input[type="checkbox"]').each(function () {
@@ -144,10 +144,10 @@ $(function () {
         elem.children('input').on('click', function (ev) {
             ev.stopImmediatePropagation();
             if (typeof elem.data('DateTimePicker') === 'undefined') {
-              elem.datetimepicker(opts);
-              elem.data('DateTimePicker').show();
+                elem.datetimepicker(opts);
+                elem.data('DateTimePicker').show();
             } else {
-              elem.data('DateTimePicker').toggle();
+                elem.data('DateTimePicker').toggle();
             }
         });
     });
@@ -173,3 +173,30 @@ $(function () {
         });
     });
 });
+
+/**
+ * Set the filter selects to latest state
+ *
+ * Uses DOMContentLoaded to prevent flickering
+ */
+window.addEventListener('DOMContentLoaded', () => {
+    const filter = document.getElementById('collapseShiftsFilterSelect');
+    if (!filter || localStorage.getItem('collapseShiftsFilterSelect') !== 'hidden') {
+        return;
+    }
+
+    filter.classList.remove('in');
+});
+$(() => {
+    if (typeof (localStorage) === 'undefined') {
+        return;
+    }
+
+    const onChange = (e) => {
+        localStorage.setItem('collapseShiftsFilterSelect', e.type);
+    };
+
+    $('#collapseShiftsFilterSelect')
+        .on('hidden.bs.collapse', onChange)
+        .on('shown.bs.collapse', onChange);
+});
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index 9ac501da..d5a98f80 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -55,12 +55,12 @@
         <div class="col-md-6">
             <button class="btn btn-info btn-sm hidden-print" style="margin-top: 20px; margin-bottom:10px" type="button"
                     data-toggle="collapse"
-                    data-target="#collapseRoomSelect" aria-expanded="false"
-                    aria-controls="collapseRoomSelect"
+                    data-target="#collapseShiftsFilterSelect" aria-expanded="true"
+                    aria-controls="collapseShiftsFilterSelect"
             >
                 collapse/show filters
             </button>
-            <div class="collapse in" id="collapseRoomSelect">
+            <div class="collapse in" id="collapseShiftsFilterSelect">
                 <div class="row">
                     <div class="col-xs-4 col-xxs-12">%room_select%</div>
                     <div class="col-xs-4 col-xxs-12">%type_select%</div>
@@ -79,5 +79,5 @@
 %shifts_table%
 
 <div class="hidden-print">
-%ical_text%
+    %ical_text%
 </div>
\ No newline at end of file

From fc773b25b3de455f7e74334156926f644f04db98 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 18 Sep 2019 14:09:30 +0200
Subject: [PATCH 10/17] Use 403 forbidden on shifts json, atom export and ical
 export

---
 includes/controller/shifts_controller.php | 18 ++++++++++--------
 includes/helper/error_helper.php          | 11 -----------
 includes/includes.php                     |  1 -
 includes/pages/user_atom.php              | 18 ++++++++++--------
 includes/pages/user_ical.php              | 19 +++++++++++--------
 5 files changed, 31 insertions(+), 36 deletions(-)
 delete mode 100644 includes/helper/error_helper.php

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index caf124ba..726814cf 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,5 +1,6 @@
 <?php
 
+use Engelsystem\Http\Exceptions\HttpForbidden;
 use Engelsystem\ShiftSignupState;
 
 /**
@@ -348,17 +349,18 @@ function shift_next_controller()
 function shifts_json_export_controller()
 {
     $request = request();
-
-    if (!$request->has('key') || !preg_match('/^[\da-f]{32}$/', $request->input('key'))) {
-        engelsystem_error('Missing key.');
-    }
-
     $user = auth()->apiUser('key');
-    if (!$user) {
-        engelsystem_error('Key invalid.');
+
+    if (
+        !$request->has('key')
+        || !preg_match('/^[\da-f]{32}$/', $request->input('key'))
+        || !$user
+    ) {
+        throw new HttpForbidden('{"error":"Missing or invalid key"}', ['content-type' => 'application/json']);
     }
+
     if (!auth()->can('shifts_json_export')) {
-        engelsystem_error('No privilege for shifts_json_export.');
+        throw new HttpForbidden('{"error":"Not allowed"}', ['content-type' => 'application/json']);
     }
 
     $shifts = load_ical_shifts();
diff --git a/includes/helper/error_helper.php b/includes/helper/error_helper.php
deleted file mode 100644
index 9314a57a..00000000
--- a/includes/helper/error_helper.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/**
- * Displays a fatal message and stops execution.
- *
- * @param string $message
- */
-function engelsystem_error($message)
-{
-    raw_output($message);
-}
diff --git a/includes/includes.php b/includes/includes.php
index 855ff359..601a6ca2 100644
--- a/includes/includes.php
+++ b/includes/includes.php
@@ -60,7 +60,6 @@ $includeFiles = [
 
     __DIR__ . '/../includes/helper/graph_helper.php',
     __DIR__ . '/../includes/helper/message_helper.php',
-    __DIR__ . '/../includes/helper/error_helper.php',
     __DIR__ . '/../includes/helper/email_helper.php',
 
     __DIR__ . '/../includes/mailer/shifts_mailer.php',
diff --git a/includes/pages/user_atom.php b/includes/pages/user_atom.php
index 8e5b4858..a491fea7 100644
--- a/includes/pages/user_atom.php
+++ b/includes/pages/user_atom.php
@@ -1,6 +1,7 @@
 <?php
 
 use Engelsystem\Database\DB;
+use Engelsystem\Http\Exceptions\HttpForbidden;
 
 /**
  * Publically available page to feed the news to feed readers
@@ -8,17 +9,18 @@ use Engelsystem\Database\DB;
 function user_atom()
 {
     $request = request();
-
-    if (!$request->has('key') || !preg_match('/^[\da-f]{32}$/', $request->input('key'))) {
-        engelsystem_error('Missing key.');
-    }
-
     $user = auth()->apiUser('key');
-    if (empty($user)) {
-        engelsystem_error('Key invalid.');
+
+    if (
+        !$request->has('key')
+        || !preg_match('/^[\da-f]{32}$/', $request->input('key'))
+        || empty($user)
+    ) {
+        throw new HttpForbidden('Missing or invalid key', ['content-type' => 'text/text']);
     }
+
     if (!auth()->can('atom')) {
-        engelsystem_error('No privilege for atom.');
+        throw new HttpForbidden('Not allowed', ['content-type' => 'text/text']);
     }
 
     $news = DB::select('
diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php
index ee3a8340..2f3a7ccc 100644
--- a/includes/pages/user_ical.php
+++ b/includes/pages/user_ical.php
@@ -1,22 +1,25 @@
 <?php
 
+use Engelsystem\Http\Exceptions\HttpForbidden;
+
 /**
  * Controller for ical output of users own shifts or any user_shifts filter.
  */
 function user_ical()
 {
     $request = request();
-
-    if (!$request->has('key') || !preg_match('/^[\da-f]{32}$/', $request->input('key'))) {
-        engelsystem_error('Missing key.');
-    }
-
     $user = auth()->apiUser('key');
-    if (!$user) {
-        engelsystem_error('Key invalid.');
+
+    if (
+        !$request->has('key')
+        || !preg_match('/^[\da-f]{32}$/', $request->input('key'))
+        || !$user
+    ) {
+        throw new HttpForbidden('Missing or invalid key', ['content-type' => 'text/text']);
     }
+
     if (!auth()->can('ical')) {
-        engelsystem_error('No privilege for ical.');
+        throw new HttpForbidden('Not allowed', ['content-type' => 'text/text']);
     }
 
     $ical_shifts = load_ical_shifts();

From bf191ef22232a2937d474a1c8c1c3fbc2bbd94ae Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 6 Oct 2019 15:50:45 +0200
Subject: [PATCH 11/17] CI: Build translation files for container and release
 archive

---
 contrib/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/Dockerfile b/contrib/Dockerfile
index a7fd403b..013ccf1d 100644
--- a/contrib/Dockerfile
+++ b/contrib/Dockerfile
@@ -4,7 +4,12 @@ COPY ./ /app/
 RUN composer --no-ansi install --no-dev --ignore-platform-reqs
 RUN composer --no-ansi dump-autoload --optimize
 
-# Intermediate container for less layers
+# Intermediate containers for less layers
+FROM alpine as translation
+RUN apk add gettext
+COPY resources/lang/ /data
+RUN find /data -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
+
 FROM alpine as data
 COPY .babelrc .browserslistrc composer.json LICENSE package.json README.md webpack.config.js yarn.lock /app/
 COPY bin/ /app/bin
@@ -13,11 +18,11 @@ COPY db/ /app/db
 RUN mkdir /app/import/
 COPY includes/ /app/includes
 COPY public/ /app/public
-COPY resources/lang /app/resources/lang
 COPY resources/views /app/resources/views
 COPY src/ /app/src
 COPY storage/ /app/storage
 
+COPY --from=translation /data/ /app/resources/lang
 COPY --from=composer /app/vendor/ /app/vendor
 COPY --from=composer /app/composer.lock /app/
 

From 7c9910677e776aafe744ecbf41ade5e5b795c3a7 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 6 Oct 2019 16:53:10 +0200
Subject: [PATCH 12/17] Frontend: Show language selects on every page

---
 resources/views/layouts/parts/navbar.twig | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig
index 61c6a10b..0b2eee63 100644
--- a/resources/views/layouts/parts/navbar.twig
+++ b/resources/views/layouts/parts/navbar.twig
@@ -55,16 +55,14 @@
                                 {{ elements.toolbar_item(user.name, url('users', {'action': 'view'}), 'users', 'icon icon-icon_angel') }}
                             {% endif %}
 
-                            {% if has_permission_to('user_settings') or has_permission_to('logout') %}
-                                <li class="dropdown">
-                                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                        <span class="caret"></span>
-                                    </a>
-                                    <ul class="dropdown-menu" role="menu">
-                                        {{ menuUserSubmenu()|join(" ")|raw }}
-                                    </ul>
-                                </li>
-                            {% endif %}
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                    <span class="caret"></span>
+                                </a>
+                                <ul class="dropdown-menu" role="menu">
+                                    {{ menuUserSubmenu()|join(" ")|raw }}
+                                </ul>
+                            </li>
 
                         </ul>
                     {% endblock %}

From 973c108b153fb1d8be3576935c58e92865d19e7a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sun, 6 Oct 2019 17:38:23 +0200
Subject: [PATCH 13/17] credits: Make them translatable and use markdown

---
 resources/views/pages/credits.twig | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/views/pages/credits.twig b/resources/views/pages/credits.twig
index 3bb04895..8bd1f694 100644
--- a/resources/views/pages/credits.twig
+++ b/resources/views/pages/credits.twig
@@ -4,28 +4,28 @@
 
 {% block content %}
     <div class="container">
-        <h1>Credits</h1>
+        <h1>{{ __('Credits') }}</h1>
         <div class="row">
             {% for title, credit in credits %}
                 <div class="col-md-4">
-                    <h2>{{ title }}</h2>
-                    {{ credit|markdown }}
+                    <h2>{{ __(title) }}</h2>
+                    {{ __(credit)|markdown }}
                 </div>
             {% endfor %}
 
             <div class="col-md-4">
-                <h2>Source code</h2>
-                <p>Version: <i>{{ version }}</i></p>
+                <h2>{{ __('Source code') }}</h2>
+                <p>{{ __('Version: _%s_', [version])|markdown }}</i></p>
                 <p>
-                    The original engelsystem was written by
-                    <a href="https://github.com/cookieBerlin/engelsystem">cookie</a>.
-                    It was then completely rewritten and enhanced by
-                    <a href="https://notrademark.de">msquare</a> (maintainer) and
-                    <a href="https://myigel.name">MyIgel</a>.
+                    {{ __('The original engelsystem was written by
+[cookie](https://github.com/cookieBerlin/engelsystem).
+It was then completely rewritten and enhanced by [msquare](https://notrademark.de) (maintainer) and
+[MyIgel](https://myigel.name).')|markdown }}
                 </p>
                 <p>
-                    Please look at the <a href="https://github.com/engelsystem/engelsystem/graphs/contributors">
-                        contributor list on GitHub</a> for a complete list.
+                    {{ __('Please have a look at the
+[contributors list on GitHub](https://github.com/engelsystem/engelsystem/graphs/contributors)
+for a complete list.')|markdown }}
                 </p>
             </div>
         </div>

From fa35187795734ad4f4dc33f74cc0fe020dd9ff32 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 9 Oct 2019 13:54:04 +0200
Subject: [PATCH 14/17] Removed .mo translation files from version control, use
 .po as fallback

---
 .gitignore                                    |   1 +
 README.md                                     |   5 ++++
 resources/lang/de_DE/default.mo               | Bin 46693 -> 0 bytes
 resources/lang/en_US/default.mo               | Bin 1240 -> 0 bytes
 resources/lang/pt_BR/default.mo               | Bin 41132 -> 0 bytes
 .../TranslationServiceProvider.php            |  25 ++++++++++++++++--
 .../Translation/Assets/ba_RR/default.po       |   3 +++
 .../TranslationServiceProviderTest.php        |  22 ++++++++++++---
 8 files changed, 51 insertions(+), 5 deletions(-)
 delete mode 100644 resources/lang/de_DE/default.mo
 delete mode 100644 resources/lang/en_US/default.mo
 delete mode 100644 resources/lang/pt_BR/default.mo
 create mode 100644 tests/Unit/Helpers/Translation/Assets/ba_RR/default.po

diff --git a/.gitignore b/.gitignore
index 77a62c1e..cda5cf92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ _vimrc_local.vim
 /public/coverage
 /coverage
 /unittests.xml
+/resources/lang/*/*.mo
 
 # Composer files
 /vendor/
diff --git a/README.md b/README.md
index 02508157..594011b7 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,11 @@ The following instructions explain how to get, build and run the latest engelsys
     ```bash
     yarn build
     ```
+ * Optionally (for better performance)
+   * Generate translation files
+      ```bash
+      find resources/lang/ -type f -name '*.po' -exec sh -c 'file="{}"; msgfmt "${file%.*}.po" -o "${file%.*}.mo"' \;
+      ```
 
 ### Configuration and Setup
  * The webserver must have write access to the ```import``` and ```storage``` directories and read access for all other directories
diff --git a/resources/lang/de_DE/default.mo b/resources/lang/de_DE/default.mo
deleted file mode 100644
index d4b7885bdb60dad5663232db1d20a4ced7afa4b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46693
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

diff --git a/resources/lang/en_US/default.mo b/resources/lang/en_US/default.mo
deleted file mode 100644
index 30dd375dc39bc5f1a990046ec381e6b165c06100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmaJ=&2AGh5H`^A6MhaHK!_g=AR!QV$%YErjdG!+P|-p}Q+`g7o1N?$cI{w$TXNzF
zIKqWD;LeQ;@4%U7fEPfFche+Q5tcrG>z$czW~}kg({mpgts3D1AtRh5d?Wbvi*SnY
zn{b@K4ls6x=mhaO;;UnB5nrV93*xiH1+mxrKzxJv3-Nct4?;rcPlp&gO#Fu!i09`R
zyF`4A_&jl&*z1Y$`8~1E_nG(#@mFG!Di=wV>nQC<2*(IyF4sKm2MNAEpO1;crGe6p
z4|JhoHqa&yY_XL~$F@Z#W8tJ$0p>zx)xQ6?!MBAp7|&WVok$h@%Q6(!?r0MSeXR!4
z<a^^L)?BJty~+RoN%qE)Rm~I6j?u5N@AzuWpQEwVPXuk1U}i_wVGfO;Uh6#V@@0c%
zB!3_rM$o8-_juUgjU@<|qI!6<9@f1he}>!At4#ftc>OM~FF@l?v_O6h@>>%sDMW(2
ziz1Jpw!XUFo~92e<+4@|mE+yfkg_>^=WY)(AypIlsW28@YqPt;7pHzkC_6yI+p4c)
zsgej5x1_7R<PTAy5l)*3IvQi?APg3RFeFoT=8tjY@7%6Q>muki6Ldb|F87qy!>RXu
zVR0y28bMI&WQ7qKU!l3M5vXB#w5>)Hs?XMS1(#b8-e^waH*{h8xLkD+LDj~Zu+*#X
zA*)KATu}t5dYc<F@hD6`?N9~0?rUIAG!zyM><A0xoPsv6I}#u*>=><*06G~`>EO%=
zL_${?!0G@-x&UDitdm&=so18ggQ3w|8RqsD2>S*eq1Z+hu#IZ)yD3SQBM%~u4O;7S
z&?ABJNd&B$;(q(?yjAA%0e})Y`q-)M72VCGbXykYh3N^2EMR-AKG10mHr2*es<S=s
S(e!;$;~K_Kz;`{(6R^KXCTfuY

diff --git a/resources/lang/pt_BR/default.mo b/resources/lang/pt_BR/default.mo
deleted file mode 100644
index d15826e6b0ee3c286dca910b7223e6c2b67156cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41132
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
MNM{CgakxqNe_0Tk+yDRo

diff --git a/src/Helpers/Translation/TranslationServiceProvider.php b/src/Helpers/Translation/TranslationServiceProvider.php
index 05e782ec..6df9b0fe 100644
--- a/src/Helpers/Translation/TranslationServiceProvider.php
+++ b/src/Helpers/Translation/TranslationServiceProvider.php
@@ -5,6 +5,7 @@ namespace Engelsystem\Helpers\Translation;
 use Engelsystem\Config\Config;
 use Engelsystem\Container\ServiceProvider;
 use Gettext\Translations;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Session\Session;
 
 class TranslationServiceProvider extends ServiceProvider
@@ -69,14 +70,18 @@ class TranslationServiceProvider extends ServiceProvider
     public function getTranslator(string $locale): GettextTranslator
     {
         if (!isset($this->translators[$locale])) {
-            $file = $this->app->get('path.lang') . '/' . $locale . '/default.mo';
+            $file = $this->getFile($locale);
 
             /** @var GettextTranslator $translator */
             $translator = $this->app->make(GettextTranslator::class);
 
             /** @var Translations $translations */
             $translations = $this->app->make(Translations::class);
-            $translations->addFromMoFile($file);
+            if (Str::endsWith($file, '.mo')) {
+                $translations->addFromMoFile($file);
+            } else {
+                $translations->addFromPoFile($file);
+            }
 
             $translator->loadTranslations($translations);
 
@@ -85,4 +90,20 @@ class TranslationServiceProvider extends ServiceProvider
 
         return $this->translators[$locale];
     }
+
+    /**
+     * @param string $locale
+     * @return string
+     */
+    protected function getFile(string $locale): string
+    {
+        $filepath = $file = $this->app->get('path.lang') . '/' . $locale . '/default';
+        $file = $filepath . '.mo';
+
+        if (!file_exists($file)) {
+            $file = $filepath . '.po';
+        }
+
+        return $file;
+    }
 }
diff --git a/tests/Unit/Helpers/Translation/Assets/ba_RR/default.po b/tests/Unit/Helpers/Translation/Assets/ba_RR/default.po
new file mode 100644
index 00000000..887e2daa
--- /dev/null
+++ b/tests/Unit/Helpers/Translation/Assets/ba_RR/default.po
@@ -0,0 +1,3 @@
+# Testing content
+msgid "foo.bar"
+msgstr "B Arr!"
diff --git a/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php b/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
index 1822f353..e55fdf02 100644
--- a/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
+++ b/tests/Unit/Helpers/Translation/TranslationServiceProviderTest.php
@@ -12,7 +12,7 @@ use Symfony\Component\HttpFoundation\Session\Session;
 class TranslationServiceProviderTest extends ServiceProviderTest
 {
     /**
-     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::register()
+     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::register
      */
     public function testRegister(): void
     {
@@ -30,7 +30,7 @@ class TranslationServiceProviderTest extends ServiceProviderTest
         /** @var TranslationServiceProvider|MockObject $serviceProvider */
         $serviceProvider = $this->getMockBuilder(TranslationServiceProvider::class)
             ->setConstructorArgs([$app])
-            ->setMethods(['setLocale'])
+            ->onlyMethods(['setLocale'])
             ->getMock();
 
         $app->expects($this->exactly(2))
@@ -75,7 +75,7 @@ class TranslationServiceProviderTest extends ServiceProviderTest
     }
 
     /**
-     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::getTranslator()
+     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::getTranslator
      */
     public function testGetTranslator(): void
     {
@@ -91,4 +91,20 @@ class TranslationServiceProviderTest extends ServiceProviderTest
         // Retry from cache
         $serviceProvider->getTranslator('fo_OO');
     }
+
+    /**
+     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::getTranslator
+     * @covers \Engelsystem\Helpers\Translation\TranslationServiceProvider::getFile
+     */
+    public function testGetTranslatorFromPo(): void
+    {
+        $app = $this->getApp(['get']);
+        $this->setExpects($app, 'get', ['path.lang'], __DIR__ . '/Assets');
+
+        $serviceProvider = new TranslationServiceProvider($app);
+
+        // Get translator using a .po file
+        $translator = $serviceProvider->getTranslator('ba_RR');
+        $this->assertEquals('B Arr!', $translator->gettext('foo.bar'));
+    }
 }

From 5e2cb6e5c92e85ac84b171c19fcd16643501b3e0 Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Fri, 11 Oct 2019 21:15:54 +0200
Subject: [PATCH 15/17] Updates moment js

---
 package.json | 2 +-
 yarn.lock    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5a8a5a44..8a623a3b 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "eonasdan-bootstrap-datetimepicker": "^4.17.47",
     "jquery": "^3.3.1",
     "jquery-ui": "^1.11.2",
-    "moment": "^2.8.2",
+    "moment": "^2.12.0",
     "moment-timezone": "^0.4.0",
     "select2": "^4.0.6-rc.1",
     "select2-bootstrap-theme": "0.1.0-beta.10"
diff --git a/yarn.lock b/yarn.lock
index cec94e2e..c49eb596 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3328,7 +3328,7 @@ moment-timezone@^0.4.0:
   dependencies:
     moment ">= 2.6.0"
 
-"moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.8.2:
+"moment@>= 2.6.0", moment@^2.10, moment@^2.10.2, moment@^2.12.0:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==

From 75f04507aedc6cea020da93fc579351cfb0f4f2c Mon Sep 17 00:00:00 2001
From: Michael Weimann <mail@michael-weimann.eu>
Date: Fri, 11 Oct 2019 21:16:24 +0200
Subject: [PATCH 16/17] Makes Monday first day of the week even if English
 language is selected

---
 resources/assets/js/vendor.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/resources/assets/js/vendor.js b/resources/assets/js/vendor.js
index bf3807f7..b4b6487d 100644
--- a/resources/assets/js/vendor.js
+++ b/resources/assets/js/vendor.js
@@ -10,6 +10,13 @@ require('./forms');
 require('./sticky-headers');
 require('./moment-countdown');
 
+moment.updateLocale('en', {
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
 $.ajaxSetup({
     headers: {'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')}
 });

From 7a2427e70296ef652f76fe2e2edc47d2e0f70f5a Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 11 Oct 2019 22:56:38 +0200
Subject: [PATCH 17/17] docker-compose: Set mariadb version and added local dev
 env to readme

---
 README.md                  | 14 ++++++++++++++
 contrib/docker-compose.yml |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 594011b7..9b4a3aaf 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,20 @@ Import database
 docker exec -it engelsystem bin/migrate
 ```
 
+#### Local development
+To use the working directory in the container the docker-compose file has to be changed:
+```yaml
+[...]
+  nginx:
+    volumes:
+      - ../public/assets:/var/www/public/assets
+[...]
+  engelsystem:
+    volumes:
+      - ../:/var/www
+[...]
+```
+
 #### Scripts
 ##### bin/deploy.sh
 The `bin/deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh.
diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml
index 197e2281..4624cce4 100644
--- a/contrib/docker-compose.yml
+++ b/contrib/docker-compose.yml
@@ -27,12 +27,13 @@ services:
     depends_on:
       - database
   database:
-    image: mariadb:latest
+    image: mariadb:10.2
     environment:
       MYSQL_DATABASE: engelsystem
       MYSQL_USER: engelsystem
       MYSQL_PASSWORD: engelsystem
       MYSQL_RANDOM_ROOT_PASSWORD: 1
+      MYSQL_INITDB_SKIP_TZINFO: "yes"
     volumes:
       - db:/var/lib/mysql
     networks: