Merge pull request 'bugfix/fix-ambiguous-sql-field-names' (!65) from bugfix/fix-ambiguous-sql-field-names into develop

Reviewed-on: #65

.env.example

@@ -1,4 +1,5 @@
 APP_NAME=MapGuesser
+APP_URL=mapguesser.dev
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser
@@ -21,3 +22,5 @@ MULTI_INTERNAL_PORT=5000
 MULTI_WS_URL=mapguesser-dev.ch:8090
 MULTI_WS_PORT=8090
 ENABLE_GAME_FOR_GUESTS=0
+RECAPTCHA_SITEKEY=your_recaptcha_sitekey
+RECAPTCHA_SECRET=your_recaptcha_secret

Jenkinsfile

@@ -8,6 +8,9 @@ pipeline {
 
     stages {
         stage('Install composer') {
+            environment {
+                COMPOSER_HOME="${WORKSPACE}/.composer"
+            }
             agent {
                 dockerfile {
                     filename 'docker/Dockerfile-test'

composer.json

@@ -3,15 +3,19 @@
   "type": "project",
   "description": "MapGuesser Application",
   "license": "GNU GPL 3.0",
+  "repositories": [
+    {
+        "url": "https://git.esoko.eu/esoko/soko-web.git",
+        "type": "git"
+    }
+  ],
   "require": {
-    "vlucas/phpdotenv": "^4.1",
-    "symfony/console": "^5.1",
-    "phpmailer/phpmailer": "^6.1",
+    "esoko/soko-web": "0.10.1",
     "fzaninotto/faker": "^1.9"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9",
-    "phpstan/phpstan": "^0.12.32"
+    "phpunit/phpunit": "^9.6",
+    "phpstan/phpstan": "^1.10"
   },
   "autoload": {
     "psr-4": {

database/migrations/data/20200612_2124_map_area.php

@@ -1,8 +1,8 @@
 <?php
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 use MapGuesser\Util\Geo\Bounds;
 
 $select = new Select(\Container::$dbConnection, 'maps');

database/migrations/data/20200614_1328_user_confirmation.php

@@ -1,8 +1,8 @@
 <?php
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 
 $select = new Select(\Container::$dbConnection, 'users');
 $select->columns(['id']);

docker-compose.yml

@@ -29,6 +29,12 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+    adminer:
+        image: adminer:4.8.1-standalone
+        ports:
+        - 9090:8080
+        environment:
+            - ADMINER_DEFAULT_SERVER=mariadb
     mail:
         image: marcopas/docker-mailslurper:latest
         ports:

docker/Dockerfile-test

@@ -1,4 +1,6 @@
-FROM php:7.4.7-cli-buster
+FROM ubuntu:focal
 
-RUN apt-get update && apt-get install -y unzip
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update && apt install -y curl git unzip php7.4-cli php7.4-mbstring php7.4-xml
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

main.php

@@ -14,10 +14,12 @@ $dotenv->load();
 
 class Container
 {
-    static MapGuesser\Interfaces\Database\IConnection $dbConnection;
-    static MapGuesser\Routing\RouteCollection $routeCollection;
-    static MapGuesser\Interfaces\Session\ISessionHandler $sessionHandler;
-    static MapGuesser\Interfaces\Request\IRequest $request;
+    static SokoWeb\Interfaces\Database\IConnection $dbConnection;
+    static SokoWeb\Interfaces\PersistentData\IPersistentDataManager $persistentDataManager;
+    static SokoWeb\Interfaces\Routing\IRouteCollection $routeCollection;
+    static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
+    static SokoWeb\Interfaces\Request\IRequest $request;
 }
 
-Container::$dbConnection = new MapGuesser\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
+Container::$dbConnection = new SokoWeb\Database\Mysql\Connection($_ENV['DB_HOST'], $_ENV['DB_USER'], $_ENV['DB_PASSWORD'], $_ENV['DB_NAME']);
+Container::$persistentDataManager = new SokoWeb\PersistentData\PersistentDataManager(Container::$dbConnection);

mapg

@@ -8,6 +8,6 @@ $app = new Symfony\Component\Console\Application('MapGuesser Console', '');
 $app->add(new MapGuesser\Cli\MigrateDatabaseCommand());
 $app->add(new MapGuesser\Cli\AddUserCommand());
 $app->add(new MapGuesser\Cli\LinkViewCommand());
-$app->add(new \MapGuesser\Cli\MaintainDatabaseCommand());
+$app->add(new MapGuesser\Cli\MaintainDatabaseCommand());
 
 $app->run();

public/index.php

@@ -1,53 +1,3 @@
 <?php
 
 require '../web.php';
-
-$method = strtolower($_SERVER['REQUEST_METHOD']);
-$url = substr($_SERVER['REQUEST_URI'], strlen('/'));
-if (($pos = strpos($url, '?')) !== false) {
-    $url = substr($url, 0, $pos);
-}
-$url = rawurldecode($url);
-
-$match = Container::$routeCollection->match($method, $url == '' ? [] : explode('/', $url));
-
-if ($match !== null) {
-    list($route, $params) = $match;
-
-    Container::$request->setParsedRouteParams($params);
-
-    $handler = $route->getHandler();
-    $controller = new $handler[0](Container::$request);
-
-    if ($controller instanceof MapGuesser\Interfaces\Authorization\ISecured) {
-        $authorized = $controller->authorize();
-    } else {
-        $authorized = true;
-    }
-
-    if ($method === 'post' && Container::$request->post('anti_csrf_token') !== Container::$request->session()->get('anti_csrf_token')) {
-        $content = new MapGuesser\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
-        header('Content-Type: text/html; charset=UTF-8', true, 403);
-        $content->render();
-        return;
-    }
-
-    if ($authorized) {
-        $response = call_user_func([$controller, $handler[1]]);
-
-        if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
-            header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
-            $response->render();
-
-            return;
-        } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
-            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
-
-            return;
-        }
-    }
-}
-
-$content = new MapGuesser\Response\HtmlContent('error/404');
-header('Content-Type: text/html; charset=UTF-8', true, 404);
-$content->render();

public/static/css/mapguesser.css

@@ -241,7 +241,7 @@ button.green:enabled:hover, button.green:enabled:focus, a.button.green:hover, a.
     background-color: #1b7d31;
 }
 
-input[type=text], select, textarea {
+input.text, select, textarea {
     background-color: #f9fafb;
     border: solid #c8d2e1 1px;
     border-radius: 2px;
@@ -250,7 +250,7 @@ input[type=text], select, textarea {
     font-weight: 300;
 }
 
-input[type=text], select {
+input.text, select {
     height: 30px;
     line-height: 30px;
     padding: 0 5px;
@@ -265,11 +265,11 @@ textarea {
     resize: none;
 }
 
-input[type=text].big, select.big, textarea.big, div.inputWithButton>input[type=text] {
+input.text.big, select.big, textarea.big, div.inputWithButton>input.text {
     font-size: 18px;
 }
 
-input[type=text].big, select.big, div.inputWithButton>input[type=text] {
+input.text.big, select.big, div.inputWithButton>input.text {
     height: 35px;
     line-height: 35px;
     padding: 0 6px;
@@ -284,19 +284,19 @@ input.fullWidth, select.fullWidth, textarea.fullWidth {
     width: 100%;
 }
 
-input[type=text]:disabled, select:disabled, textarea:disabled {
+input.text:disabled, select:disabled, textarea:disabled {
     background-color: #dfdfdf;
     border: solid #dfdfdf 1px;
     color: #000000;
 }
 
-input[type=text]:focus, select:focus, textarea:focus {
+input.text:focus, select:focus, textarea:focus {
     background-color: #ffffff;
     border: solid #29457f 2px;
     outline: none;
 }
 
-input[type=text]:focus, select:focus {
+input.text:focus, select:focus {
     padding: 0 4px;
 }
 
@@ -304,16 +304,16 @@ textarea:focus {
     padding: 4px;
 }
 
-input[type=text].big:focus, select.big:focus {
+input.text.big:focus, select.big:focus {
     padding: 0 5px;
 }
 
-div.inputWithButton>input[type=text] {
+div.inputWithButton>input.text {
     width: 100%;
     padding: 0 83px 0 6px;
 }
 
-div.inputWithButton>input[type=text]:focus {
+div.inputWithButton>input.text:focus {
     padding: 0 82px 0 5px;
 }
 

public/static/js/maps.js

@@ -69,7 +69,7 @@
         printTimeForHuman: function (time) {
             const minutes = Math.floor(time / 60);
             const seconds = time % 60;
-            var time_str = ''; 
+            var time_str = '';
 
             if (minutes == 1) {
                 time_str += '1 minute';
@@ -141,9 +141,7 @@
     if (document.getElementById('challengeButton')) {
         document.getElementById('challengeButton').onclick = function () {
             MapGuesser.showModal('challenge');
-            document.getElementById('createNewChallengeButton').href = '/challenge/new/' + this.dataset.mapId;
             document.getElementById('playMode').style.visibility = 'hidden';
-            
             var timeLimit = document.getElementById('timeLimit').value;
             document.getElementById('timeLimitLabel').innerText = 'Time limit of ' + Util.printTimeForHuman(timeLimit);
         };

src/Cli/AddUserCommand.php

@@ -1,7 +1,6 @@
 <?php namespace MapGuesser\Cli;
 
 use DateTime;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -32,8 +31,7 @@ class AddUserCommand extends Command
         }
 
         try {
-            $pdm = new PersistentDataManager();
-            $pdm->saveToDb($user);
+            \Container::$persistentDataManager->saveToDb($user);
         } catch (\Exception $e) {
             $output->writeln('<error>Adding user failed!</error>');
             $output->writeln('');

src/Cli/LinkViewCommand.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
 use FilesystemIterator;
-use MapGuesser\View\Linker;
+use SokoWeb\View\Linker;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Symfony\Component\Console\Command\Command;

src/Cli/MaintainDatabaseCommand.php

@@ -1,10 +1,9 @@
 <?php namespace MapGuesser\Cli;
 
 use DateTime;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
@@ -16,8 +15,6 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class MaintainDatabaseCommand extends Command
 {
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
     private UserConfirmationRepository $userConfirmationRepository;
@@ -32,7 +29,6 @@ class MaintainDatabaseCommand extends Command
     {
         parent::__construct();
 
-        $this->pdm = new PersistentDataManager();
         $this->userRepository = new UserRepository();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
@@ -77,19 +73,19 @@ class MaintainDatabaseCommand extends Command
             //TODO: these can be in some wrapper class
             $userConfirmation = $this->userConfirmationRepository->getByUser($user);
             if ($userConfirmation !== null) {
-                $this->pdm->deleteFromDb($userConfirmation);
+                \Container::$persistentDataManager->deleteFromDb($userConfirmation);
             }
 
             $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
             if ($userPasswordResetter !== null) {
-                $this->pdm->deleteFromDb($userPasswordResetter);
+                \Container::$persistentDataManager->deleteFromDb($userPasswordResetter);
             }
 
             foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
-                $this->pdm->deleteFromDb($userPlayedPlace);
+                \Container::$persistentDataManager->deleteFromDb($userPlayedPlace);
             }
 
-            $this->pdm->deleteFromDb($user);
+            \Container::$persistentDataManager->deleteFromDb($user);
         }
 
         \Container::$dbConnection->commit();
@@ -98,14 +94,14 @@ class MaintainDatabaseCommand extends Command
     private function deleteExpiredPasswordResetters(): void
     {
         foreach ($this->userPasswordResetterRepository->getAllExpired() as $passwordResetter) {
-            $this->pdm->deleteFromDb($passwordResetter);
+            \Container::$persistentDataManager->deleteFromDb($passwordResetter);
         }
     }
 
     private function deleteExpiredRooms(): void
     {
         foreach ($this->multiRoomRepository->getAllExpired() as $multiRoom) {
-            $this->pdm->deleteFromDb($multiRoom);
+            \Container::$persistentDataManager->deleteFromDb($multiRoom);
         }
     }
 

src/Cli/MigrateDatabaseCommand.php

@@ -1,8 +1,8 @@
 <?php namespace MapGuesser\Cli;
 
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Database\Query\Modify;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IResultSet;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/Controller/GameController.php

@@ -2,33 +2,27 @@
 
 use DateTime;
 use Faker\Factory;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
 use MapGuesser\Multi\MultiConnector;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\MultiRoom;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\Model\UserInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Response\Redirect;
 
-class GameController implements ISecured
+class GameController implements IAuthenticationRequired
 {
     const NUMBER_OF_ROUNDS = 5;
 
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private MultiConnector $multiConnector;
 
     private MultiRoomRepository $multiRoomRepository;
@@ -41,10 +35,8 @@ class GameController implements ISecured
 
     private UserInChallengeRepository $userInChallengeRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->multiConnector = new MultiConnector();
         $this->multiRoomRepository = new MultiRoomRepository();
         $this->mapRepository = new MapRepository();
@@ -53,21 +45,21 @@ class GameController implements ISecured
         $this->userInChallengeRepository = new UserInChallengeRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return !empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || $this->request->user() !== null;
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function getGame(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
 
         return new HtmlContent('game', ['mapId' => $mapId]);
     }
 
     public function getNewMultiGame(): IRedirect
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
         $map = $this->mapRepository->getById($mapId);
         $roomId = bin2hex(random_bytes(3));
         $token = $this->getMultiToken($roomId);
@@ -83,7 +75,7 @@ class GameController implements ISecured
         $room->setMembersArray(['owner' => $token, 'all' => []]);
         $room->setUpdatedDate(new DateTime());
 
-        $this->pdm->saveToDb($room);
+        \Container::$persistentDataManager->saveToDb($room);
 
         $this->multiConnector->sendMessage('create_room', ['roomId' => $roomId]);
 
@@ -97,14 +89,14 @@ class GameController implements ISecured
 
     public function getMultiGame(): IContent
     {
-        $roomId = $this->request->query('roomId');
+        $roomId = \Container::$request->query('roomId');
 
         return new HtmlContent('game', ['roomId' => $roomId]);
     }
 
     public function getChallenge(): IContent
-    {   
-        $challengeToken = $this->request->query('challengeToken');
+    {
+        $challengeToken = \Container::$request->query('challengeToken');
 
         return new HtmlContent('game', ['challengeToken' => $challengeToken]);
     }
@@ -120,28 +112,28 @@ class GameController implements ISecured
         $challenge = new Challenge();
         $challenge->setToken($challengeToken);
         $challenge->setCreatedDate(new DateTime());
-        
-        if ($this->request->post('timerEnabled') !== null && $this->request->post('timeLimit') !== null) {
-            $challenge->setTimeLimit($this->request->post('timeLimit'));
+
+        if (\Container::$request->post('timerEnabled') !== null && \Container::$request->post('timeLimit') !== null) {
+            $challenge->setTimeLimit(\Container::$request->post('timeLimit'));
         }
-        if ($this->request->post('timeLimitType') !== null) {
-            $challenge->setTimeLimitType($this->request->post('timeLimitType'));
+        if (\Container::$request->post('timeLimitType') !== null) {
+            $challenge->setTimeLimitType(\Container::$request->post('timeLimitType'));
         }
-        if ($this->request->post('noMove') !== null) {
+        if (\Container::$request->post('noMove') !== null) {
             $challenge->setNoMove(true);
         }
-        if ($this->request->post('noPan') !== null) {
+        if (\Container::$request->post('noPan') !== null) {
             $challenge->setNoPan(true);
         }
-        if ($this->request->post('noZoom') !== null) {
+        if (\Container::$request->post('noZoom') !== null) {
             $challenge->setNoZoom(true);
         }
 
-        $this->pdm->saveToDb($challenge);
+        \Container::$persistentDataManager->saveToDb($challenge);
 
         // save owner/creator
 
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
 
         $userInChallenge = new UserInChallenge();
@@ -150,11 +142,11 @@ class GameController implements ISecured
         $userInChallenge->setTimeLeft($challenge->getTimeLimit());
         $userInChallenge->setIsOwner(true);
 
-        $this->pdm->saveToDb($userInChallenge);
+        \Container::$persistentDataManager->saveToDb($userInChallenge);
 
         // select places
 
-        $mapId = (int) $this->request->post('mapId');
+        $mapId = (int) \Container::$request->post('mapId');
         // $map = $this->mapRepository->getById($mapId);
 
         $places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId);
@@ -165,7 +157,7 @@ class GameController implements ISecured
             $placeInChallenge->setPlace($place);
             $placeInChallenge->setChallenge($challenge);
             $placeInChallenge->setRound($round++);
-            $this->pdm->saveToDb($placeInChallenge);
+            \Container::$persistentDataManager->saveToDb($placeInChallenge);
         }
 
         return new JsonContent(['challengeToken' => dechex($challengeToken)]);
@@ -173,9 +165,9 @@ class GameController implements ISecured
 
     public function prepareGame(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
         $map = $this->mapRepository->getById($mapId);
-        $session = $this->request->session();
+        $session = \Container::$request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
             $session->set('state', [
@@ -198,8 +190,8 @@ class GameController implements ISecured
 
     public function prepareMultiGame(): IContent
     {
-        $roomId = $this->request->query('roomId');
-        $userName = $this->request->post('userName');
+        $roomId = \Container::$request->query('roomId');
+        $userName = \Container::$request->post('userName');
         if (empty($userName)) {
             $faker = Factory::create();
             $userName = $faker->userName;
@@ -228,7 +220,7 @@ class GameController implements ISecured
         $room->setMembersArray($members);
         $room->setUpdatedDate(new DateTime());
 
-        $this->pdm->saveToDb($room);
+        \Container::$persistentDataManager->saveToDb($room);
 
         $this->multiConnector->sendMessage('join_room', [
             'roomId' => $roomId,
@@ -248,8 +240,8 @@ class GameController implements ISecured
 
     public function prepareChallenge(): IContent
     {
-        $challengeToken_str = $this->request->query('challengeToken');
-        $session = $this->request->session();
+        $challengeToken_str = \Container::$request->query('challengeToken');
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
 
         if (!isset($userId))
@@ -270,7 +262,7 @@ class GameController implements ISecured
             $userInChallenge->setUserId($userId);
             $userInChallenge->setChallenge($challenge);
             $userInChallenge->setTimeLeft($challenge->getTimeLimit());
-            $this->pdm->saveToDb($userInChallenge);
+            \Container::$persistentDataManager->saveToDb($userInChallenge);
         }
 
         $map = $this->mapRepository->getByChallenge($challenge);
@@ -284,7 +276,7 @@ class GameController implements ISecured
 
     private function getMultiToken(string $roomId): string
     {
-        $session = $this->request->session();
+        $session = \Container::$request->session();
 
         if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
             $token = bin2hex(random_bytes(16));

src/Controller/GameFlowController.php

@@ -1,13 +1,11 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
 use MapGuesser\Util\Geo\Position;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Interfaces\Response\IContent;
 use MapGuesser\Multi\MultiConnector;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\Map;
@@ -15,70 +13,52 @@ use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserPlayedPlace;
-use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\GuessRepository;
-use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Repository\UserRepository;
 
-class GameFlowController implements ISecured
+class GameFlowController implements IAuthenticationRequired
 {
     const NUMBER_OF_ROUNDS = 5;
     const MAX_SCORE = 1000;
 
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private MultiConnector $multiConnector;
 
     private MultiRoomRepository $multiRoomRepository;
 
     private PlaceRepository $placeRepository;
 
-    private MapRepository $mapRepository;
-
-    private UserRepository $userRepository;
-
     private UserPlayedPlaceRepository $userPlayedPlaceRepository;
 
-    private ChallengeRepository $challengeRepository;
-
     private UserInChallengeRepository $userInChallengeRepository;
 
     private PlaceInChallengeRepository $placeInChallengeRepository;
 
     private GuessRepository $guessRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->multiConnector = new MultiConnector();
         $this->multiRoomRepository = new MultiRoomRepository();
         $this->placeRepository = new PlaceRepository();
-        $this->mapRepository = new MapRepository();
-        $this->userRepository = new UserRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
-        $this->challengeRepository = new ChallengeRepository();
         $this->userInChallengeRepository = new UserInChallengeRepository();
         $this->placeInChallengeRepository = new PlaceInChallengeRepository();
         $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        return !empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || $this->request->user() !== null;
+        return empty($_ENV['ENABLE_GAME_FOR_GUESTS']);
     }
 
     public function initialData(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
-        $session = $this->request->session();
+        $mapId = (int) \Container::$request->query('mapId');
+        $session = \Container::$request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
             return new JsonContent(['error' => 'no_session_found']);
@@ -115,8 +95,8 @@ class GameFlowController implements ISecured
 
     public function multiInitialData(): IContent
     {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
+        $roomId = \Container::$request->query('roomId');
+        $session = \Container::$request->session();
 
         if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
             return new JsonContent(['error' => 'no_session_found']);
@@ -134,7 +114,7 @@ class GameFlowController implements ISecured
             $this->startNewGame($state, $state['mapId']);
             $room->setStateArray($state);
             $room->setUpdatedDate(new DateTime());
-            $this->pdm->saveToDb($room);
+            \Container::$persistentDataManager->saveToDb($room);
         }
 
         $places = [];
@@ -154,16 +134,16 @@ class GameFlowController implements ISecured
     private function prepareChallengeResponse(int $userId, Challenge $challenge, int $currentRound, bool $withHistory = false): array
     {
         $currentPlace = $this->placeRepository->getByRoundInChallenge($challenge, $currentRound);
-        
+
         // if the last round was played ($currentPlace == null) or history is explicitly requested (for initializing)
         if (!isset($currentPlace) || $withHistory) {
 
-            $withRelations = [User::class, PlaceInChallenge::class, Place::class];
-            foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) { 
+            $withRelations = ['user', 'place_in_challange', 'place'];
+            foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) {
                 $round = $guess->getPlaceInChallenge()->getRound();
-    
+
                 if ($guess->getUser()->getId() === $userId) {
-                    $response['history'][$round]['position'] = 
+                    $response['history'][$round]['position'] =
                             $guess->getPlaceInChallenge()->getPlace()->getPosition()->toArray();
                     $response['history'][$round]['result'] = [
                             'guessPosition' => $guess->getPosition()->toArray(),
@@ -188,8 +168,8 @@ class GameFlowController implements ISecured
                             'distance' => null,
                             'score' => 0
                     ];
-                    
-                    $response['history'][$i]['position'] = 
+
+                    $response['history'][$i]['position'] =
                             $this->placeRepository->getByRoundInChallenge($challenge, $i)->getPosition()->toArray();
                 }
             }
@@ -207,7 +187,7 @@ class GameFlowController implements ISecured
 
             $prevRound = $currentRound - 1;
             if ($prevRound >= 0) {
-                foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, [User::class]) as $guess) {
+                foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, ['user']) as $guess) {
                     if ($guess->getUser()->getId() != $userId) {
                         $response['allResults'][] = [
                             'userName' => $guess->getUser()->getDisplayName(),
@@ -233,10 +213,10 @@ class GameFlowController implements ISecured
 
     public function challengeInitialData(): IContent
     {
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
-        $challengeToken_str = $this->request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $challengeToken_str = \Container::$request->query('challengeToken');
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
 
         if (!isset($userInChallenge)) {
             return new JsonContent(['error' => 'game_not_found']);
@@ -250,22 +230,22 @@ class GameFlowController implements ISecured
         if ($challenge->getTimeLimitType() === 'game' && $challenge->getTimeLimit() !== null && $userInChallenge->getCurrentRound() > 0) {
             $timeLimit = max(10, $userInChallenge->getTimeLeft());
             $response['restrictions']['timeLimit'] = $timeLimit * 1000;
-        } 
+        }
 
         return new JsonContent($response);
     }
 
     public function guess(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
-        $session = $this->request->session();
+        $mapId = (int) \Container::$request->query('mapId');
+        $session = \Container::$request->session();
 
         if (!($state = $session->get('state')) || $state['mapId'] !== $mapId) {
             return new JsonContent(['error' => 'no_session_found']);
         }
 
         $last = $state['rounds'][$state['currentRound']];
-        $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        $guessPosition = new Position((float) \Container::$request->post('lat'), (float) \Container::$request->post('lng'));
         $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $last['guessPosition'] = $guessPosition;
@@ -298,7 +278,7 @@ class GameFlowController implements ISecured
     // save the selected place for the round in UserPlayedPlace
     private function saveVisit($placeId): void
     {
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
 
         if (isset($userId)) {
@@ -311,14 +291,14 @@ class GameFlowController implements ISecured
                 $userPlayedPlace->incrementOccurrences();
             }
             $userPlayedPlace->setLastTimeDate(new DateTime());
-            $this->pdm->saveToDb($userPlayedPlace);
+            \Container::$persistentDataManager->saveToDb($userPlayedPlace);
         }
     }
 
     public function multiGuess(): IContent
     {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
+        $roomId = \Container::$request->query('roomId');
+        $session = \Container::$request->session();
 
         if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
             return new JsonContent(['error' => 'no_session_found']);
@@ -328,7 +308,7 @@ class GameFlowController implements ISecured
         $state = $room->getStateArray();
 
         $last = $state['rounds'][$state['currentRound']];
-        $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        $guessPosition = new Position((float) \Container::$request->post('lat'), (float) \Container::$request->post('lng'));
         $result = $this->evaluateGuess($last['position'], $guessPosition, $state['area']);
 
         $responseFromMulti = $this->multiConnector->sendMessage('guess', [
@@ -354,10 +334,10 @@ class GameFlowController implements ISecured
 
     public function challengeGuess(): IContent
     {
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
-        $challengeToken_str = $this->request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $challengeToken_str = \Container::$request->query('challengeToken');
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
 
         if (!isset($userInChallenge)) {
             return new JsonContent(['error' => 'game_not_found']);
@@ -365,7 +345,7 @@ class GameFlowController implements ISecured
 
         $challenge = $userInChallenge->getChallenge();
         $currentRound = $userInChallenge->getCurrentRound();
-        $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, [Place::class, Map::class]);
+        $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, ['place', 'map']);
         $currentPlace = $currentPlaceInChallenge->getPlace();
         $map = $currentPlace->getMap();
 
@@ -374,8 +354,8 @@ class GameFlowController implements ISecured
         $response = $this->prepareChallengeResponse($userId, $challenge, $nextRound);
         $response['position'] = $currentPlace->getPosition()->toArray();
 
-        if ($this->request->post('lat') && $this->request->post('lng')) {
-            $guessPosition = new Position((float) $this->request->post('lat'), (float) $this->request->post('lng'));
+        if (\Container::$request->post('lat') && \Container::$request->post('lng')) {
+            $guessPosition = new Position((float) \Container::$request->post('lat'), (float) \Container::$request->post('lng'));
             $result = $this->evaluateGuess($currentPlace->getPosition(), $guessPosition, $map->getArea());
 
             // save guess
@@ -385,7 +365,7 @@ class GameFlowController implements ISecured
             $guess->setPosition($guessPosition);
             $guess->setDistance($result['distance']);
             $guess->setScore($result['score']);
-            $this->pdm->saveToDb($guess);
+            \Container::$persistentDataManager->saveToDb($guess);
 
             $response['result'] = $result;
 
@@ -396,11 +376,11 @@ class GameFlowController implements ISecured
 
         // save user relevant state of challenge
         $userInChallenge->setCurrentRound($nextRound);
-        $timeLeft = $this->request->post('timeLeft');
+        $timeLeft = \Container::$request->post('timeLeft');
         if (isset($timeLeft)) {
             $userInChallenge->setTimeLeft(intval($timeLeft));
         }
-        $this->pdm->saveToDb($userInChallenge);
+        \Container::$persistentDataManager->saveToDb($userInChallenge);
 
         if ($challenge->getTimeLimitType() === 'game' && isset($timeLeft)) {
             $timeLimit = max(10, intval($timeLeft));
@@ -418,8 +398,8 @@ class GameFlowController implements ISecured
 
     public function multiNextRound(): IContent
     {
-        $roomId = $this->request->query('roomId');
-        $session = $this->request->session();
+        $roomId = \Container::$request->query('roomId');
+        $session = \Container::$request->session();
 
         if (!($multiState = $session->get('multiState')) || $multiState['roomId'] !== $roomId) {
             return new JsonContent(['error' => 'no_session_found']);
@@ -440,7 +420,7 @@ class GameFlowController implements ISecured
 
         $room->setStateArray($state);
         $room->setUpdatedDate(new DateTime());
-        $this->pdm->saveToDb($room);
+        \Container::$persistentDataManager->saveToDb($room);
 
         return new JsonContent(['ok' => true]);
     }
@@ -455,7 +435,7 @@ class GameFlowController implements ISecured
 
     private function startNewGame(array &$state, int $mapId): void
     {
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
 
         $places = $this->placeRepository->getRandomNPlaces($mapId, static::NUMBER_OF_ROUNDS, $userId);

src/Controller/HomeController.php

@@ -1,20 +1,12 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
 
 class HomeController
 {
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
     public function getIndex(): IRedirect
     {
         return new Redirect(\Container::$routeCollection->getRoute('maps')->generateLink(), IRedirect::TEMPORARY);
@@ -24,6 +16,6 @@ class HomeController
     {
         // session starts with the request, this method just sends valid data to the client
 
-        return new JsonContent(['antiCsrfToken' => $this->request->session()->get('anti_csrf_token')]);
+        return new JsonContent(['antiCsrfToken' => \Container::$request->session()->get('anti_csrf_token')]);
     }
 }

src/Controller/LoginController.php

@@ -2,31 +2,26 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\Mailing\Mail;
-use MapGuesser\OAuth\GoogleOAuth;
+use SokoWeb\Http\Request;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\Mailing\Mail;
+use SokoWeb\OAuth\GoogleOAuth;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserConfirmation;
 use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
 use MapGuesser\Repository\UserRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
+use SokoWeb\Util\CaptchaValidator;
+use SokoWeb\Util\JwtParser;
 
 class LoginController
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
     private UserConfirmationRepository $userConfirmationRepository;
@@ -35,23 +30,27 @@ class LoginController
 
     private UserPlayedPlaceRepository $userPlayedPlaceRepository;
 
-    public function __construct(IRequest $request)
+    private string $redirectUrl;
+
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->userRepository = new UserRepository();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
+        $this->redirectUrl = \Container::$request->session()->has('redirect_after_login') ?
+            \Container::$request->session()->get('redirect_after_login') :
+            \Container::$routeCollection->getRoute('index')->generateLink();
     }
 
     public function getLoginForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/login');
+        return new HtmlContent('login/login', ['redirectUrl' => $this->redirectUrl]);
     }
 
     public function getGoogleLoginRedirect(): IRedirect
@@ -59,13 +58,13 @@ class LoginController
         $state = bin2hex(random_bytes(16));
         $nonce = bin2hex(random_bytes(16));
 
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \Container::$request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_nonce', $nonce);
 
         $oAuth = new GoogleOAuth(new Request());
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink(),
             $nonce
         );
 
@@ -74,12 +73,13 @@ class LoginController
 
     public function getSignupForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        if ($this->request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('tmp_user_data');
+        if (\Container::$request->session()->has('tmp_user_data')) {
+            $tmpUserData = \Container::$request->session()->get('tmp_user_data');
 
             $data = ['email' => $tmpUserData['email']];
         } else {
@@ -96,28 +96,30 @@ class LoginController
 
     public function getSignupWithGoogleForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        if (!$this->request->session()->has('google_user_data')) {
+        if (!\Container::$request->session()->has('google_user_data')) {
             return new Redirect(\Container::$routeCollection->getRoute('login-google')->generateLink(), IRedirect::TEMPORARY);
         }
 
-        $userData = $this->request->session()->get('google_user_data');
+        $userData = \Container::$request->session()->get('google_user_data');
 
         $user = $this->userRepository->getByEmail($userData['email']);
 
-        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email']]);
+        return new HtmlContent('login/google_signup', ['found' => $user !== null, 'email' => $userData['email'], 'redirectUrl' => $this->redirectUrl]);
     }
 
     public function getRequestPasswordResetForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        return new HtmlContent('login/password_reset_request', ['email' => $this->request->query('email')]);
+        return new HtmlContent('login/password_reset_request', ['email' => \Container::$request->query('email')]);
     }
 
     public function getRequestPasswordResetSuccess(): IContent
@@ -127,11 +129,12 @@ class LoginController
 
     public function getResetPasswordForm()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        $token = $this->request->query('token');
+        $token = \Container::$request->query('token');
         $resetter = $this->userPasswordResetterRepository->getByToken($token);
 
         if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
@@ -140,19 +143,20 @@ class LoginController
 
         $user = $this->userRepository->getById($resetter->getUserId());
 
-        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail()]);
+        return new HtmlContent('login/reset_password', ['success' => true, 'token' => $token, 'email' => $user->getEmail(), 'redirectUrl' => $this->redirectUrl]);
     }
 
     public function login(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
         if ($user === null) {
-            if (strlen($this->request->post('password')) < 6) {
+            if (strlen(\Container::$request->post('password')) < 6) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
@@ -161,16 +165,16 @@ class LoginController
             }
 
             $tmpUser = new User();
-            $tmpUser->setPlainPassword($this->request->post('password'));
+            $tmpUser->setPlainPassword(\Container::$request->post('password'));
 
-            $this->request->session()->set('tmp_user_data', [
-                'email' => $this->request->post('email'),
+            \Container::$request->session()->set('tmp_user_data', [
+                'email' => \Container::$request->post('email'),
                 'password_hashed' => $tmpUser->getPassword()
             ]);
 
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()
+                    'target' => \Container::$routeCollection->getRoute('signup')->generateLink()
                 ]
             ]);
         }
@@ -186,7 +190,7 @@ class LoginController
             ]);
         }
 
-        if (!$user->checkPassword($this->request->post('password'))) {
+        if (!$user->checkPassword(\Container::$request->post('password'))) {
             return new JsonContent([
                 'error' => [
                     'errorText' => 'The given password is wrong. You can <a href="/password/requestReset?email=' .
@@ -195,25 +199,27 @@ class LoginController
             ]);
         }
 
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
     public function loginWithGoogle()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
             return new HtmlContent('login/google_login');
         }
 
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+            \Container::$request->query('code'),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -223,7 +229,7 @@ class LoginController
         $jwtParser = new JwtParser($tokenData['id_token']);
         $idToken = $jwtParser->getPayload();
 
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
             return new HtmlContent('login/google_login');
         }
 
@@ -234,34 +240,36 @@ class LoginController
         $user = $this->userRepository->getByGoogleSub($idToken['sub']);
 
         if ($user === null) {
-            $this->request->session()->set('google_user_data', ['sub' => $idToken['sub'], 'email' => $idToken['email']]);
+            \Container::$request->session()->set('google_user_data', ['sub' => $idToken['sub'], 'email' => $idToken['email']]);
 
             return new Redirect(\Container::$routeCollection->getRoute('signup-google')->generateLink(), IRedirect::TEMPORARY);
         }
 
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function logout(): IRedirect
     {
-        $this->request->setUser(null);
+        \Container::$request->setUser(null);
 
         return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
     }
 
     public function signup(): IContent
     {
-        if ($this->request->user() !== null) {
-            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new JsonContent(['redirect' => ['target' => $this->redirectUrl]]);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
         if ($user !== null) {
             if ($user->getActive()) {
-                if (!$user->checkPassword($this->request->post('password'))) {
+                if (!$user->checkPassword(\Container::$request->post('password'))) {
                     return new JsonContent([
                         'error' => [
                             'errorText' => 'There is a user already registered with the given email address, ' .
@@ -271,9 +279,10 @@ class LoginController
                     ]);
                 }
 
-                $this->request->setUser($user);
+                \Container::$request->setUser($user);
 
-                $data = ['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('index')->generateLink()]];
+                $this->deleteRedirectUrl();
+                $data = ['redirect' => ['target' => $this->redirectUrl]];
             } else {
                 $data = [
                     'error' => [
@@ -285,21 +294,33 @@ class LoginController
             return new JsonContent($data);
         }
 
-        if (filter_var($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
+        if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
+            if (!\Container::$request->post('g-recaptcha-response')) {
+                return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
+            }
+
+            $captchaValidator = new CaptchaValidator();
+            $captchaResponse = $captchaValidator->validate(\Container::$request->post('g-recaptcha-response'));
+            if (!$captchaResponse['success']) {
+                return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
+            }
+        }
+
+        if (filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
             return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
         }
 
-        if ($this->request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('tmp_user_data');
+        if (\Container::$request->session()->has('tmp_user_data')) {
+            $tmpUserData = \Container::$request->session()->get('tmp_user_data');
 
             $tmpUser = new User();
             $tmpUser->setPassword($tmpUserData['password_hashed']);
 
-            if (!$tmpUser->checkPassword($this->request->post('password'))) {
+            if (!$tmpUser->checkPassword(\Container::$request->post('password'))) {
                 return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
             }
         } else {
-            if (strlen($this->request->post('password')) < 6) {
+            if (strlen(\Container::$request->post('password')) < 6) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
@@ -307,19 +328,17 @@ class LoginController
                 ]);
             }
 
-            if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+            if (\Container::$request->post('password') !== \Container::$request->post('password_confirm')) {
                 return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
             }
         }
 
         $user = new User();
-        $user->setEmail($this->request->post('email'));
-        $user->setPlainPassword($this->request->post('password'));
+        $user->setEmail(\Container::$request->post('email'));
+        $user->setPlainPassword(\Container::$request->post('password'));
         $user->setCreatedDate(new DateTime());
 
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
         $token = bin2hex(random_bytes(16));
 
@@ -328,24 +347,23 @@ class LoginController
         $confirmation->setToken($token);
         $confirmation->setLastSentDate(new DateTime());
 
-        $this->pdm->saveToDb($confirmation);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->saveToDb($confirmation);
 
         $this->sendConfirmationEmail($user->getEmail(), $token, $user->getCreatedDate());
 
-        $this->request->session()->delete('tmp_user_data');
+        \Container::$request->session()->delete('tmp_user_data');
 
         return new JsonContent(['success' => true]);
     }
 
     public function signupWithGoogle(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent(['success' => true]);
         }
 
-        $userData = $this->request->session()->get('google_user_data');
+        $userData = \Container::$request->session()->get('google_user_data');
 
         $user = $this->userRepository->getByEmail($userData['email']);
 
@@ -362,100 +380,109 @@ class LoginController
         $user->setActive(true);
         $user->setGoogleSub($userData['sub']);
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
         if ($sendWelcomeEmail) {
             $this->sendWelcomeEmail($user->getEmail());
         }
 
-        $this->request->session()->delete('google_user_data');
-        $this->request->setUser($user);
+        \Container::$request->session()->delete('google_user_data');
+        \Container::$request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
     public function resetSignup(): IContent
     {
-        $this->request->session()->delete('tmp_user_data');
+        \Container::$request->session()->delete('tmp_user_data');
 
         return new JsonContent(['success' => true]);
     }
 
     public function resetGoogleSignup(): IContent
     {
-        $this->request->session()->delete('google_user_data');
+        \Container::$request->session()->delete('google_user_data');
 
         return new JsonContent(['success' => true]);
     }
 
     public function activate()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
+        $confirmation = $this->userConfirmationRepository->getByToken(substr(\Container::$request->query('token'), 0, 32));
 
         if ($confirmation === null) {
             return new HtmlContent('login/activate');
         }
 
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($confirmation);
+        \Container::$persistentDataManager->deleteFromDb($confirmation);
 
         $user = $this->userRepository->getById($confirmation->getUserId());
         $user->setActive(true);
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
-        \Container::$dbConnection->commit();
+        \Container::$request->setUser($user);
 
-        $this->request->setUser($user);
-
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        $this->deleteRedirectUrl();
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
     }
 
     public function cancel()
     {
-        if ($this->request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        $confirmation = $this->userConfirmationRepository->getByToken(substr($this->request->query('token'), 0, 32));
+        $confirmation = $this->userConfirmationRepository->getByToken(substr(\Container::$request->query('token'), 0, 32));
 
         if ($confirmation === null) {
             return new HtmlContent('login/cancel', ['success' => false]);
         }
 
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($confirmation);
+        \Container::$persistentDataManager->deleteFromDb($confirmation);
 
         $user = $this->userRepository->getById($confirmation->getUserId());
 
         foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
-            $this->pdm->deleteFromDb($userPlayedPlace);
+            \Container::$persistentDataManager->deleteFromDb($userPlayedPlace);
         }
 
-        $this->pdm->deleteFromDb($user);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->deleteFromDb($user);
 
         return new HtmlContent('login/cancel', ['success' => true]);
     }
 
     public function requestPasswordReset(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => $this->redirectUrl
                 ]
             ]);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
+            if (!\Container::$request->post('g-recaptcha-response')) {
+                return new JsonContent(['error' => ['errorText' => 'Please check "I\'m not a robot" in the reCAPTCHA box!']]);
+            }
+
+            $captchaValidator = new CaptchaValidator();
+            $captchaResponse = $captchaValidator->validate(\Container::$request->post('g-recaptcha-response'));
+            if (!$captchaResponse['success']) {
+                return new JsonContent(['error' => ['errorText' => 'reCAPTCHA challenge failed. Please try again!']]);
+            }
+        }
+
+        $user = $this->userRepository->getByEmail(\Container::$request->post('email'));
 
         if ($user === null) {
             return new JsonContent([
@@ -494,15 +521,11 @@ class LoginController
         $passwordResetter->setToken($token);
         $passwordResetter->setExpiresDate($expires);
 
-        \Container::$dbConnection->startTransaction();
-
         if ($existingResetter !== null) {
-            $this->pdm->deleteFromDb($existingResetter);
+            \Container::$persistentDataManager->deleteFromDb($existingResetter);
         }
 
-        $this->pdm->saveToDb($passwordResetter);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->saveToDb($passwordResetter);
 
         $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
 
@@ -512,26 +535,27 @@ class LoginController
 
     public function resetPassword(): IContent
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()
+                    'target' => $this->redirectUrl
                 ]
             ]);
         }
 
-        $token = $this->request->query('token');
+        $token = \Container::$request->query('token');
         $resetter = $this->userPasswordResetterRepository->getByToken($token);
 
         if ($resetter === null || $resetter->getExpiresDate() < new DateTime()) {
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
+                    'target' => \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token])
                 ]
             ]);
         }
 
-        if (strlen($this->request->post('password')) < 6) {
+        if (strlen(\Container::$request->post('password')) < 6) {
             return new JsonContent([
                 'error' => [
                     'errorText' => 'The given password is too short. Please choose a password that is at least 6 characters long!'
@@ -539,23 +563,20 @@ class LoginController
             ]);
         }
 
-        if ($this->request->post('password') !== $this->request->post('password_confirm')) {
+        if (\Container::$request->post('password') !== \Container::$request->post('password_confirm')) {
             return new JsonContent(['error' => ['errorText' => 'The given passwords do not match.']]);
         }
 
-        \Container::$dbConnection->startTransaction();
-
-        $this->pdm->deleteFromDb($resetter);
+        \Container::$persistentDataManager->deleteFromDb($resetter);
 
         $user = $this->userRepository->getById($resetter->getUserId());
-        $user->setPlainPassword($this->request->post('password'));
+        $user->setPlainPassword(\Container::$request->post('password'));
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
-        \Container::$dbConnection->commit();
-
-        $this->request->setUser($user);
+        \Container::$request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -566,9 +587,9 @@ class LoginController
         $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
         $mail->setBodyFromTemplate('signup', [
             'EMAIL' => $email,
-            'ACTIVATE_LINK' => $this->request->getBase() . '/' .
+            'ACTIVATE_LINK' => \Container::$request->getBase() .
                 \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
-            'CANCEL_LINK' => $this->request->getBase() . '/' .
+            'CANCEL_LINK' => \Container::$request->getBase() .
                 \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
             'ACTIVATABLE_UNTIL' => (clone $created)->add(new DateInterval('P1D'))->format('Y-m-d H:i T')
         ]);
@@ -585,7 +606,7 @@ class LoginController
 
         $confirmation->setLastSentDate(new DateTime());
 
-        $this->pdm->saveToDb($confirmation);
+        \Container::$persistentDataManager->saveToDb($confirmation);
 
         $this->sendConfirmationEmail($user->getEmail(), $confirmation->getToken(), $user->getCreatedDate());
 
@@ -610,10 +631,15 @@ class LoginController
         $mail->setSubject($_ENV['APP_NAME'] . ' - Password reset');
         $mail->setBodyFromTemplate('password-reset', [
             'EMAIL' => $email,
-            'RESET_LINK' => $this->request->getBase() . '/' .
+            'RESET_LINK' => \Container::$request->getBase() .
                 \Container::$routeCollection->getRoute('password-reset')->generateLink(['token' => $token]),
             'EXPIRES' => $expires->format('Y-m-d H:i T')
         ]);
         $mail->send();
     }
+
+    private function deleteRedirectUrl(): void
+    {
+        \Container::$request->session()->delete('redirect_after_login');
+    }
 }

src/Controller/MapAdminController.php

@@ -1,15 +1,14 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Response\IContent;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\MapRepository;
@@ -17,19 +16,15 @@ use MapGuesser\Repository\PlaceInChallengeRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
 use MapGuesser\Util\Geo\Bounds;
 use MapGuesser\Util\Panorama\Pov;
 
-class MapAdminController implements ISecured
+class MapAdminController implements IAuthenticationRequired, ISecured
 {
     private static string $unnamedMapName = '[unnamed map]';
 
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private MapRepository $mapRepository;
 
     private PlaceRepository $placeRepository;
@@ -44,10 +39,8 @@ class MapAdminController implements ISecured
 
     private UserInChallengeRepository $userInChallengeRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->mapRepository = new MapRepository();
         $this->placeRepository = new PlaceRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
@@ -57,16 +50,19 @@ class MapAdminController implements ISecured
         $this->userInChallengeRepository = new UserInChallengeRepository();
     }
 
+    public function isAuthenticationRequired(): bool
+    {
+        return true;
+    }
+
     public function authorize(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
+        return \Container::$request->user()->hasPermission(IUser::PERMISSION_ADMIN);
     }
 
     public function getMapEditor(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
 
         if ($mapId) {
             $map = $this->mapRepository->getById($mapId);
@@ -89,7 +85,7 @@ class MapAdminController implements ISecured
 
     public function getPlace(): IContent
     {
-        $placeId = (int) $this->request->query('placeId');
+        $placeId = (int) \Container::$request->query('placeId');
 
         $place = $this->placeRepository->getById($placeId);
 
@@ -98,16 +94,14 @@ class MapAdminController implements ISecured
 
     public function saveMap(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
-
-        \Container::$dbConnection->startTransaction();
+        $mapId = (int) \Container::$request->query('mapId');
 
         if ($mapId) {
             $map = $this->mapRepository->getById($mapId);
         } else {
             $map = new Map();
             $map->setName(self::$unnamedMapName);
-            $this->pdm->saveToDb($map);
+            \Container::$persistentDataManager->saveToDb($map);
         }
 
         if (isset($_POST['added'])) {
@@ -129,7 +123,7 @@ class MapAdminController implements ISecured
                     $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
                 }
 
-                $this->pdm->saveToDb($place);
+                \Container::$persistentDataManager->saveToDb($place);
 
                 $addedIds[] = ['tempId' => $placeRaw['id'], 'id' => $place->getId()];
             }
@@ -151,7 +145,7 @@ class MapAdminController implements ISecured
                 ));
                 $place->setPanoIdCachedTimestampDate(new DateTime('-1 day'));
 
-                $this->pdm->saveToDb($place);
+                \Container::$persistentDataManager->saveToDb($place);
             }
         }
 
@@ -180,26 +174,20 @@ class MapAdminController implements ISecured
             $map->setUnlisted((bool)$_POST['unlisted']);
         }
 
-        $this->pdm->saveToDb($map);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->saveToDb($map);
 
         return new JsonContent(['mapId' => $map->getId(), 'added' => $addedIds]);
     }
 
     public function deleteMap(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
 
         $map = $this->mapRepository->getById($mapId);
 
-        \Container::$dbConnection->startTransaction();
-
         $this->deletePlaces($map);
 
-        $this->pdm->deleteFromDb($map);
-
-        \Container::$dbConnection->commit();
+        \Container::$persistentDataManager->deleteFromDb($map);
 
         return new JsonContent(['success' => true]);
     }
@@ -207,14 +195,14 @@ class MapAdminController implements ISecured
     private function deletePlace(Place $place): void
     {
         foreach ($this->userPlayedPlaceRepository->getAllByPlace($place) as $userPlayedPlace) {
-            $this->pdm->deleteFromDb($userPlayedPlace);
+            \Container::$persistentDataManager->deleteFromDb($userPlayedPlace);
         }
 
         foreach ($this->challengeRepository->getAllByPlace($place) as $challenge) {
             $this->deleteChallenge($challenge);
         }
 
-        $this->pdm->deleteFromDb($place);
+        \Container::$persistentDataManager->deleteFromDb($place);
     }
 
     private function deletePlaces(Map $map): void
@@ -227,18 +215,18 @@ class MapAdminController implements ISecured
     private function deleteChallenge(Challenge $challenge): void
     {
         foreach ($this->userInChallengeRepository->getAllByChallenge($challenge) as $userInChallenge) {
-            $this->pdm->deleteFromDb($userInChallenge);
+            \Container::$persistentDataManager->deleteFromDb($userInChallenge);
         }
 
-        foreach ($this->guessRepository->getAllInChallenge($challenge, [PlaceInChallenge::class]) as $guess) {
-            $this->pdm->deleteFromDb($guess);
+        foreach ($this->guessRepository->getAllInChallenge($challenge, ['place_in_challange']) as $guess) {
+            \Container::$persistentDataManager->deleteFromDb($guess);
         }
 
         foreach ($this->placeInChallengeRepository->getAllByChallenge($challenge) as $placeInChallenge) {
-            $this->pdm->deleteFromDb($placeInChallenge);
+            \Container::$persistentDataManager->deleteFromDb($placeInChallenge);
         }
 
-        $this->pdm->deleteFromDb($challenge);
+        \Container::$persistentDataManager->deleteFromDb($challenge);
     }
 
     private function calculateMapBounds(Map $map): Bounds

src/Controller/MapsController.php

@@ -1,22 +1,14 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Database\RawExpression;
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\Database\RawExpression;
+use SokoWeb\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Response\HtmlContent;
 
 class MapsController
 {
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
     public function getMaps(): IContent
     {
         //TODO: from repository - count should be added
@@ -37,7 +29,7 @@ class MapsController
         $select->groupBy(['maps', 'id']);
         $select->orderBy('name');
 
-        $user = $this->request->user();
+        $user = \Container::$request->user();
         $isAdmin = $user !== null && $user->hasPermission(IUser::PERMISSION_ADMIN);
         if (!$isAdmin) {
             $select->where(['maps', 'unlisted'], '=', false);

src/Controller/UserController.php

@@ -1,31 +1,24 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
-use MapGuesser\OAuth\GoogleOAuth;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\Http\Request;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
+use SokoWeb\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
+use SokoWeb\OAuth\GoogleOAuth;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
-use MapGuesser\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Response\HtmlContent;
+use SokoWeb\Response\JsonContent;
+use SokoWeb\Response\Redirect;
+use SokoWeb\Util\JwtParser;
 
-class UserController implements ISecured
+class UserController implements IAuthenticationRequired
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserConfirmationRepository $userConfirmationRepository;
 
     private UserPasswordResetterRepository $userPasswordResetterRepository;
@@ -36,10 +29,8 @@ class UserController implements ISecured
 
     private GuessRepository $guessRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
-        $this->pdm = new PersistentDataManager();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
@@ -47,11 +38,9 @@ class UserController implements ISecured
         $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        $user = $this->request->user();
-
-        return $user !== null;
+        return true;
     }
 
     public function getAccount(): IContent
@@ -59,7 +48,7 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         return new HtmlContent('account/account', ['user' => $user->toArray()]);
     }
@@ -69,19 +58,19 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         $state = bin2hex(random_bytes(16));
         $nonce = bin2hex(random_bytes(16));
 
-        $this->request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \Container::$request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_nonce', $nonce);
 
         $oAuth = new GoogleOAuth(new Request());
 
         $url = $oAuth->getDialogUrl(
             $state,
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink(),
             $nonce,
             $user->getEmail()
         );
@@ -94,16 +83,16 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
-        if ($this->request->query('state') !== $this->request->session()->get('oauth_state')) {
+        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
             return new HtmlContent('account/google_authenticate', ['success' => false]);
         }
 
         $oAuth = new GoogleOAuth(new Request());
         $tokenData = $oAuth->getToken(
-            $this->request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
+            \Container::$request->query('code'),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -113,7 +102,7 @@ class UserController implements ISecured
         $jwtParser = new JwtParser($tokenData['id_token']);
         $idToken = $jwtParser->getPayload();
 
-        if ($idToken['nonce'] !== $this->request->session()->get('oauth_nonce')) {
+        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
             return new HtmlContent('account/google_authenticate', ['success' => false]);
         }
 
@@ -125,7 +114,7 @@ class UserController implements ISecured
         }
 
         $authenticatedWithGoogleUntil = new DateTime('+45 seconds');
-        $this->request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
+        \Container::$request->session()->set('authenticated_with_google_until', $authenticatedWithGoogleUntil);
 
         return new HtmlContent('account/google_authenticate', [
             'success' => true,
@@ -138,7 +127,7 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         return new HtmlContent('account/delete', ['user' => $user->toArray()]);
     }
@@ -148,19 +137,19 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         if (!$this->confirmUserIdentity(
             $user,
-            $this->request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
+            \Container::$request->session()->get('authenticated_with_google_until'),
+            \Container::$request->post('password'),
             $error
         )) {
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        if (strlen($this->request->post('password_new')) > 0) {
-            if (strlen($this->request->post('password_new')) < 6) {
+        if (strlen(\Container::$request->post('password_new')) > 0) {
+            if (strlen(\Container::$request->post('password_new')) < 6) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given new password is too short. Please choose a password that is at least 6 characters long!'
@@ -168,7 +157,7 @@ class UserController implements ISecured
                 ]);
             }
 
-            if ($this->request->post('password_new') !== $this->request->post('password_new_confirm')) {
+            if (\Container::$request->post('password_new') !== \Container::$request->post('password_new_confirm')) {
                 return new JsonContent([
                     'error' => [
                         'errorText' => 'The given new passwords do not match.'
@@ -176,12 +165,12 @@ class UserController implements ISecured
                 ]);
             }
 
-            $user->setPlainPassword($this->request->post('password_new'));
+            $user->setPlainPassword(\Container::$request->post('password_new'));
         }
 
-        $this->pdm->saveToDb($user);
+        \Container::$persistentDataManager->saveToDb($user);
 
-        $this->request->session()->delete('authenticated_with_google_until');
+        \Container::$request->session()->delete('authenticated_with_google_until');
 
         return new JsonContent(['success' => true]);
     }
@@ -191,46 +180,42 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         if (!$this->confirmUserIdentity(
             $user,
-            $this->request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
+            \Container::$request->session()->get('authenticated_with_google_until'),
+            \Container::$request->post('password'),
             $error
         )) {
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        \Container::$dbConnection->startTransaction();
-
         $userConfirmation = $this->userConfirmationRepository->getByUser($user);
         if ($userConfirmation !== null) {
-            $this->pdm->deleteFromDb($userConfirmation);
+            \Container::$persistentDataManager->deleteFromDb($userConfirmation);
         }
 
         $userPasswordResetter = $this->userPasswordResetterRepository->getByUser($user);
         if ($userPasswordResetter !== null) {
-            $this->pdm->deleteFromDb($userPasswordResetter);
+            \Container::$persistentDataManager->deleteFromDb($userPasswordResetter);
         }
 
         foreach ($this->userPlayedPlaceRepository->getAllByUser($user) as $userPlayedPlace) {
-            $this->pdm->deleteFromDb($userPlayedPlace);
+            \Container::$persistentDataManager->deleteFromDb($userPlayedPlace);
         }
 
         foreach ($this->userInChallengeRepository->getAllByUser($user) as $userInChallenge) {
-            $this->pdm->deleteFromDb($userInChallenge);
+            \Container::$persistentDataManager->deleteFromDb($userInChallenge);
         }
 
         foreach ($this->guessRepository->getAllByUser($user) as $guess) {
-            $this->pdm->deleteFromDb($guess);
+            \Container::$persistentDataManager->deleteFromDb($guess);
         }
 
-        $this->pdm->deleteFromDb($user);
+        \Container::$persistentDataManager->deleteFromDb($user);
 
-        \Container::$dbConnection->commit();
-
-        $this->request->session()->delete('authenticated_with_google_until');
+        \Container::$request->session()->delete('authenticated_with_google_until');
 
         return new JsonContent(['success' => true]);
     }

src/Database/Mysql/Connection.php

@@ -1,114 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Database\IStatement;
-use mysqli;
-
-class Connection implements IConnection
-{
-    private mysqli $connection;
-
-    public function __construct(string $host, string $user, string $password, string $db, int $port = -1, string $socket = null)
-    {
-        if ($port < 0) {
-            $port = (int) ini_get('mysqli.default_port');
-        }
-
-        if ($socket === null) {
-            $socket = (string) ini_get('mysqli.default_socket');
-        }
-
-        $this->connection = new mysqli($host, $user, $password, $db, $port, $socket);
-
-        if ($this->connection->connect_error) {
-            throw new \Exception('Connection failed: ' . $this->connection->connect_error);
-        }
-
-        if (!$this->connection->set_charset('utf8mb4')) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function __destruct()
-    {
-        $this->connection->close();
-    }
-
-    public function startTransaction(): void
-    {
-        if (!$this->connection->autocommit(false)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function commit(): void
-    {
-        if (!$this->connection->commit() || !$this->connection->autocommit(true)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function rollback(): void
-    {
-        if (!$this->connection->rollback() || !$this->connection->autocommit(true)) {
-            throw new \Exception($this->connection->error);
-        }
-    }
-
-    public function query(string $query): ?IResultSet
-    {
-        if (!($result = $this->connection->query($query))) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        if ($result !== true) {
-            return new ResultSet($result);
-        }
-
-        return null;
-    }
-
-    public function multiQuery(string $query): array
-    {
-        if (!$this->connection->multi_query($query)) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        $ret = [];
-        do {
-            if ($result = $this->connection->store_result()) {
-                $ret[] = new ResultSet($result);
-            } else {
-                $ret[] = null;
-            }
-
-            $this->connection->more_results();
-        } while ($this->connection->next_result());
-
-        if ($this->connection->error) {
-            throw new \Exception($this->connection->error  . '. Query: ' . $query);
-        }
-
-        return $ret;
-    }
-
-    public function prepare(string $query): IStatement
-    {
-        if (!($stmt = $this->connection->prepare($query))) {
-            throw new \Exception($this->connection->error . '. Query: ' . $query);
-        }
-
-        return new Statement($stmt);
-    }
-
-    public function lastId(): int
-    {
-        return $this->connection->insert_id;
-    }
-
-    public function getAffectedRows(): int
-    {
-        return $this->connection->affected_rows;
-    }
-}

src/Database/Mysql/ResultSet.php

@@ -1,62 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IResultSet;
-use mysqli_result;
-
-class ResultSet implements IResultSet
-{
-    private mysqli_result $result;
-
-    public function __construct(mysqli_result $result)
-    {
-        $this->result = $result;
-    }
-
-    public function fetch(int $type = IResultSet::FETCH_ASSOC): ?array
-    {
-        return $this->result->fetch_array($this->convertFetchType($type));
-    }
-
-    public function fetchAll(int $type = IResultSet::FETCH_ASSOC): array
-    {
-        return $this->result->fetch_all($this->convertFetchType($type));
-    }
-
-    public function fetchOneColumn(string $valueName, string $keyName = null): array
-    {
-        $array = [];
-
-        while ($r = $this->fetch(IResultSet::FETCH_ASSOC)) {
-            if (isset($keyName)) {
-                $array[$r[$keyName]] = $r[$valueName];
-            } else {
-                $array[] = $r[$valueName];
-            }
-        }
-
-        return $array;
-    }
-
-    private function convertFetchType(int $type): int
-    {
-        switch ($type) {
-            case IResultSet::FETCH_ASSOC:
-                $internal_type = MYSQLI_ASSOC;
-                break;
-
-            case IResultSet::FETCH_BOTH:
-                $internal_type = MYSQLI_BOTH;
-                break;
-
-            case IResultSet::FETCH_NUM:
-                $internal_type = MYSQLI_NUM;
-                break;
-
-            default:
-                $internal_type = MYSQLI_BOTH;
-                break;
-        }
-
-        return $internal_type;
-    }
-}

src/Database/Mysql/Statement.php

@@ -1,79 +0,0 @@
-<?php namespace MapGuesser\Database\Mysql;
-
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Database\IStatement;
-use mysqli_stmt;
-
-class Statement implements IStatement
-{
-    private mysqli_stmt $stmt;
-
-    public function __construct(mysqli_stmt $stmt)
-    {
-        $this->stmt = $stmt;
-    }
-
-    public function __destruct()
-    {
-        $this->stmt->close();
-    }
-
-    public function execute(array $params = []): ?IResultSet
-    {
-        if ($params) {
-            $ref_params = [''];
-
-            foreach ($params as &$param) {
-                $type = gettype($param);
-
-                switch ($type) {
-                    case 'integer':
-                    case 'double':
-                    case 'string':
-                        $t = $type[0];
-                        break;
-
-                    case 'NULL':
-                        $t = 's';
-                        break;
-
-                    case 'boolean':
-                        $param = (string) (int) $param;
-                        $t = 's';
-                        break;
-
-                    case 'array':
-                        $param = json_encode($param);
-                        $t = 's';
-                        break;
-                }
-
-                if (!isset($t)) {
-                    throw new \Exception('Data type ' . $type . ' not supported!');
-                }
-
-                $ref_params[] = &$param;
-                $ref_params[0] .= $t;
-            }
-
-            if (!call_user_func_array([$this->stmt, 'bind_param'], $ref_params)) {
-                throw new \Exception($this->stmt->error);
-            }
-        }
-
-        if (!$this->stmt->execute()) {
-            throw new \Exception($this->stmt->error);
-        }
-
-        if ($result_set = $this->stmt->get_result()) {
-            return new ResultSet($result_set);
-        }
-
-        return null;
-    }
-
-    public function getAffectedRows(): int
-    {
-        return $this->stmt->affected_rows;
-    }
-}

src/Database/Query/Modify.php

@@ -1,140 +0,0 @@
-<?php namespace MapGuesser\Database\Query;
-
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Database\Utils;
-
-class Modify
-{
-    private IConnection $connection;
-
-    private string $table;
-
-    private string $idName = 'id';
-
-    private array $attributes = [];
-
-    private ?string $externalId = null;
-
-    private bool $autoIncrement = true;
-
-    public function __construct(IConnection $connection, string $table)
-    {
-        $this->connection = $connection;
-        $this->table = $table;
-    }
-
-    public function setIdName(string $idName): Modify
-    {
-        $this->idName = $idName;
-
-        return $this;
-    }
-
-    public function setExternalId($id): Modify
-    {
-        $this->externalId = $id;
-
-        return $this;
-    }
-
-    public function setAutoIncrement(bool $autoIncrement = true): Modify
-    {
-        $this->autoIncrement = $autoIncrement;
-
-        return $this;
-    }
-
-    public function fill(array $attributes): Modify
-    {
-        $this->attributes = array_merge($this->attributes, $attributes);
-
-        return $this;
-    }
-
-    public function set(string $name, $value): Modify
-    {
-        $this->attributes[$name] = $value;
-
-        return $this;
-    }
-
-    public function setId($id): Modify
-    {
-        $this->attributes[$this->idName] = $id;
-
-        return $this;
-    }
-
-    public function getId()
-    {
-        return $this->attributes[$this->idName];
-    }
-
-    public function save(): void
-    {
-        if (isset($this->attributes[$this->idName])) {
-            $this->update();
-        } else {
-            $this->insert();
-        }
-    }
-
-    public function delete(): void
-    {
-        if (!isset($this->attributes[$this->idName])) {
-            throw new \Exception('No primary key specified!');
-        }
-
-        $query = 'DELETE FROM ' . Utils::backtick($this->table) . ' WHERE ' . Utils::backtick($this->idName) . '=?';
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute([$this->idName => $this->attributes[$this->idName]]);
-    }
-
-    private function insert(): void
-    {
-        if ($this->externalId !== null) {
-            $this->attributes[$this->idName] = $this->externalId;
-        } elseif (!$this->autoIncrement) {
-            $this->attributes[$this->idName] = $this->generateKey();
-        }
-
-        $set = $this->generateColumnsWithBinding(array_keys($this->attributes));
-
-        $query = 'INSERT INTO ' . Utils::backtick($this->table) . ' SET ' . $set;
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute($this->attributes);
-
-        if ($this->autoIncrement) {
-            $this->attributes[$this->idName] = $this->connection->lastId();
-        }
-    }
-
-    private function update(): void
-    {
-        $attributes = $this->attributes;
-        unset($attributes[$this->idName]);
-
-        $set = $this->generateColumnsWithBinding(array_keys($attributes));
-
-        $query = 'UPDATE ' . Utils::backtick($this->table) . ' SET ' . $set . ' WHERE ' . Utils::backtick($this->idName) . '=?';
-
-        $stmt = $this->connection->prepare($query);
-        $stmt->execute(array_merge($attributes, [$this->idName => $this->attributes[$this->idName]]));
-    }
-
-    public static function generateColumnsWithBinding(array $columns): string
-    {
-        array_walk($columns, function(&$value, $key) {
-            $value = Utils::backtick($value) . '=?';
-        });
-
-        return implode(',', $columns);
-    }
-
-    private function generateKey(): string
-    {
-        return substr(hash('sha256', serialize($this->attributes) . random_bytes(5) . microtime()), 0, 7);
-    }
-}

src/Database/Query/Select.php

@@ -1,445 +0,0 @@
-<?php namespace MapGuesser\Database\Query;
-
-use Closure;
-use MapGuesser\Interfaces\Database\IConnection;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Database\RawExpression;
-use MapGuesser\Database\Utils;
-
-class Select
-{
-    const CONDITION_WHERE = 0;
-
-    const CONDITION_HAVING = 1;
-
-    const DERIVED_TABLE_KEY = 'DERIVED';
-
-    private IConnection $connection;
-
-    private string $table;
-
-    private string $idName = 'id';
-
-    private array $tableAliases = [];
-
-    private array $joins = [];
-
-    private array $columns = [];
-
-    private array $conditions = [self::CONDITION_WHERE => [], self::CONDITION_HAVING => []];
-
-    private array $groups = [];
-
-    private array $orders = [];
-
-    private ?array $limit;
-
-    public function __construct(IConnection $connection, ?string $table = null)
-    {
-        $this->connection = $connection;
-
-        if ($table !== null) {
-            $this->table = $table;
-        }
-    }
-
-    public function setIdName(string $idName): Select
-    {
-        $this->idName = $idName;
-
-        return $this;
-    }
-
-    public function setTableAliases(array $tableAliases): Select
-    {
-        $this->tableAliases = array_merge($this->tableAliases, $tableAliases);
-
-        return $this;
-    }
-
-    public function setDerivedTableAlias(string $tableAlias): Select
-    {
-        return $this->setTableAliases([Select::DERIVED_TABLE_KEY => $tableAlias]);
-    }
-
-    public function from(string $table): Select
-    {
-        $this->table = $table;
-
-        return $this;
-    }
-
-    public function columns(array $columns): Select
-    {
-        $this->columns = array_merge($this->columns, $columns);
-
-        return $this;
-    }
-
-    public function innerJoin($table, $column1, string $relation, $column2): Select
-    {
-        $this->addJoin('INNER', $table, $column1, $relation, $column2);
-
-        return $this;
-    }
-
-    public function leftJoin($table, $column1, string $relation, $column2): Select
-    {
-        $this->addJoin('LEFT', $table, $column1, $relation, $column2);
-
-        return $this;
-    }
-
-    public function whereId($value): Select
-    {
-        $this->addWhereCondition('AND', $this->idName, '=', $value);
-
-        return $this;
-    }
-
-    public function where($column, string $relation = null, $value = null): Select
-    {
-        $this->addWhereCondition('AND', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function orWhere($column, string $relation = null, $value = null): Select
-    {
-        $this->addWhereCondition('OR', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function having($column, string $relation = null, $value = null): Select
-    {
-        $this->addHavingCondition('AND', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function orHaving($column, string $relation = null, $value = null): Select
-    {
-        $this->addHavingCondition('OR', $column, $relation, $value);
-
-        return $this;
-    }
-
-    public function groupBy($column): Select
-    {
-        $this->groups[] = $column;
-
-        return $this;
-    }
-
-    public function orderBy($column, string $type = 'ASC'): Select
-    {
-        $this->orders[] = [$column, $type];
-
-        return $this;
-    }
-
-    public function limit(int $limit, int $offset = 0): Select
-    {
-        $this->limit = [$limit, $offset];
-
-        return $this;
-    }
-
-    public function resetLimit(): void
-    {
-        $this->limit = null;
-    }
-
-    public function paginate(int $page, int $itemsPerPage): Select
-    {
-        $this->limit($itemsPerPage, ($page - 1) * $itemsPerPage);
-
-        return $this;
-    }
-
-    public function execute(): IResultSet
-    {
-        list($query, $params) = $this->generateQuery();
-
-        return $this->connection->prepare($query)->execute($params);
-    }
-
-    public function count(): int
-    {
-        if (count($this->groups) > 0 || count($this->conditions[self::CONDITION_HAVING]) > 0) {
-            $orders = $this->orders;
-
-            $this->orders = [];
-
-            list($query, $params) = $this->generateQuery();
-
-            $result = $this->connection->prepare('SELECT COUNT(*) num_rows FROM (' . $query . ') x')
-                ->execute($params)
-                ->fetch(IResultSet::FETCH_NUM);
-
-            $this->orders = $orders;
-
-            return $result[0];
-        } else {
-            $columns = $this->columns;
-            $orders = $this->orders;
-
-            $this->columns = [new RawExpression('COUNT(*) num_rows')];
-            $this->orders = [];
-
-            list($query, $params) = $this->generateQuery();
-
-            $result = $this->connection->prepare($query)
-                ->execute($params)
-                ->fetch(IResultSet::FETCH_NUM);
-
-            $this->columns = $columns;
-            $this->orders = $orders;
-
-            return $result[0];
-        }
-    }
-
-    private function isDerivedTable(): bool
-    {
-        return array_key_exists(Select::DERIVED_TABLE_KEY, $this->tableAliases);
-    }
-
-    private function addJoin(string $type, $table, $column1, string $relation, $column2): void
-    {
-        $this->joins[] = [$type, $table, $column1, $relation, $column2];
-    }
-
-    private function addWhereCondition(string $logic, $column, string $relation, $value): void
-    {
-        $this->conditions[self::CONDITION_WHERE][] = [$logic, $column, $relation, $value];
-    }
-
-    private function addHavingCondition(string $logic, $column, string $relation, $value): void
-    {
-        $this->conditions[self::CONDITION_HAVING][] = [$logic, $column, $relation, $value];
-    }
-
-    private function generateQuery(): array
-    {
-        list($tableQuery, $tableParams) = $this->generateTable($this->table, true);
-        $queryString = 'SELECT ' . $this->generateColumns() . ' FROM ' . $tableQuery;
-
-        if (count($this->joins) > 0) {
-            list($joinQuery, $joinParams) = $this->generateJoins();
-            $queryString .= ' ' . $joinQuery;
-        } else {
-            $joinParams = [];
-        }
-
-        if (count($this->conditions[self::CONDITION_WHERE]) > 0) {
-            list($wheres, $whereParams) = $this->generateConditions(self::CONDITION_WHERE);
-
-            $queryString .= ' WHERE ' .  $wheres;
-        } else {
-            $whereParams = [];
-        }
-
-        if (count($this->groups) > 0) {
-            $queryString .= ' GROUP BY ' . $this->generateGroupBy();
-        }
-
-        if (count($this->conditions[self::CONDITION_HAVING]) > 0) {
-            list($havings, $havingParams) = $this->generateConditions(self::CONDITION_HAVING);
-
-            $queryString .= ' HAVING ' .  $havings;
-        } else {
-            $havingParams = [];
-        }
-
-        if (count($this->orders) > 0) {
-            $queryString .= ' ORDER BY ' . $this->generateOrderBy();
-        }
-
-        if (isset($this->limit)) {
-            $queryString .= ' LIMIT ' . $this->limit[1] . ', ' . $this->limit[0];
-        }
-
-        if ($this->isDerivedTable()) {
-            $queryString = '(' . $queryString . ') AS ' . $this->tableAliases[Select::DERIVED_TABLE_KEY];
-        }
-
-        return [$queryString, array_merge($tableParams, $joinParams, $whereParams, $havingParams)];
-    }
-
-    private function generateTable($table, bool $defineAlias = false): array
-    {
-        $params = [];
-
-        if ($table instanceof RawExpression) {
-            return [(string) $table, $params];
-        }
-
-        if ($table instanceof Select)
-        {
-            return $table->generateQuery();
-        }
-
-        if (isset($this->tableAliases[$table])) {
-            $queryString = ($defineAlias ? Utils::backtick($this->tableAliases[$table]) . ' ' . Utils::backtick($table) : Utils::backtick($table));
-            return [$queryString, $params];
-        }
-
-        return [Utils::backtick($table), $params];
-    }
-
-    private function generateColumn($column): string
-    {
-        if ($column instanceof RawExpression) {
-            return (string) $column;
-        }
-
-        if (is_array($column)) {
-            $out = '';
-
-            if ($column[0]) {
-                list($tableName, $params) = $this->generateTable($column[0]);
-                $out .= $tableName . '.';
-            }
-
-            $out .= Utils::backtick($column[1]);
-
-            if (!empty($column[2])) {
-                $out .= ' ' . Utils::backtick($column[2]);
-            }
-
-            return $out;
-        } else {
-            return Utils::backtick($column);
-        }
-    }
-
-    private function generateColumns(): string
-    {
-        $columns = $this->columns;
-
-        array_walk($columns, function (&$value, $key) {
-            $value = $this->generateColumn($value);
-        });
-
-        return implode(',', $columns);
-    }
-
-    private function generateJoins(): array
-    {
-
-        $joinQueries = [];
-        $params = [];
-
-        foreach ($this->joins as $join) {
-            list($joinQueryFragment, $paramsFragment) = $this->generateTable($join[1], true);
-            $joinQueries[] = $join[0] . ' JOIN ' . $joinQueryFragment . ' ON ' . $this->generateColumn($join[2]) . ' ' . $join[3] . ' ' . $this->generateColumn($join[4]);
-            $params = array_merge($params, $paramsFragment);
-        }
-
-        return [implode(' ', $joinQueries), $params];
-    }
-
-    private function generateConditions(int $type): array
-    {
-        $conditions = '';
-        $params = [];
-
-        foreach ($this->conditions[$type] as $condition) {
-            list($logic, $column, $relation, $value) = $condition;
-
-            if ($column instanceof Closure) {
-                list($conditionsStringFragment, $paramsFragment) = $this->generateComplexConditionFragment($type, $column);
-            } else {
-                list($conditionsStringFragment, $paramsFragment) = $this->generateConditionFragment($condition);
-            }
-
-            if ($conditions !== '') {
-                $conditions .= ' ' . $logic . ' ';
-            }
-
-            $conditions .= $conditionsStringFragment;
-            $params = array_merge($params, $paramsFragment);
-        }
-
-        return [$conditions, $params];
-    }
-
-    private function generateConditionFragment(array $condition): array
-    {
-        list($logic, $column, $relation, $value) = $condition;
-
-        if ($column instanceof RawExpression) {
-            return [(string) $column, []];
-        }
-
-        $conditionsString = $this->generateColumn($column) . ' ';
-
-        if ($value === null) {
-            return [$conditionsString . ($relation == '=' ? 'IS NULL' : 'IS NOT NULL'), []];
-        }
-
-        $conditionsString .= strtoupper($relation) . ' ';;
-
-        switch ($relation = strtolower($relation)) {
-            case 'between':
-                $params = [$value[0], $value[1]];
-
-                $conditionsString .= '? AND ?';
-                break;
-
-            case 'in':
-            case 'not in':
-                $params = $value;
-
-                if (count($value) > 0) {
-                    $conditionsString .= '(' . implode(', ', array_fill(0, count($value), '?')) . ')';
-                } else {
-                    $conditionsString = $relation == 'in' ? '0' : '1';
-                }
-                break;
-
-            default:
-                $params = [$value];
-
-                $conditionsString .= '?';
-        }
-
-        return [$conditionsString, $params];
-    }
-
-    private function generateComplexConditionFragment(int $type, Closure $conditionCallback): array
-    {
-        $instance = new self($this->connection, $this->table);
-        $instance->tableAliases = $this->tableAliases;
-
-        $conditionCallback($instance);
-
-        list($conditions, $params) = $instance->generateConditions($type);
-
-        return ['(' . $conditions . ')', $params];
-    }
-
-    private function generateGroupBy(): string
-    {
-        $groups = $this->groups;
-
-        array_walk($groups, function (&$value, $key) {
-            $value = $this->generateColumn($value);
-        });
-
-        return implode(',', $groups);
-    }
-
-    private function generateOrderBy(): string
-    {
-        $orders = $this->orders;
-
-        array_walk($orders, function (&$value, $key) {
-            $value = $this->generateColumn($value[0]) . ' ' . strtoupper($value[1]);
-        });
-
-        return implode(',', $orders);
-    }
-}

src/Database/RawExpression.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Database;
-
-class RawExpression
-{
-    private string $expression;
-
-    public function __construct(string $expression)
-    {
-        $this->expression = $expression;
-    }
-
-    public function __toString(): string
-    {
-        return $this->expression;
-    }
-}

src/Database/Utils.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Database;
-
-class Utils {
-    public static function backtick(string $name): string
-    {
-        return '`' . $name . '`';
-    }
-}

src/Http/Request.php

@@ -1,102 +0,0 @@
-<?php namespace MapGuesser\Http;
-
-use MapGuesser\Interfaces\Http\IRequest;
-use MapGuesser\Interfaces\Http\IResponse;
-
-class Request implements IRequest
-{
-    private string $url;
-
-    private int $method;
-
-    private string $query = '';
-
-    private array $headers = [];
-
-    public function __construct(string $url = '', int $method = self::HTTP_GET)
-    {
-        $this->url = $url;
-        $this->method = $method;
-    }
-
-    public function setUrl(string $url): void
-    {
-        $this->url = $url;
-    }
-
-    public function setMethod(int $method): void
-    {
-        $this->method = $method;
-    }
-
-    public function setQuery($query): void
-    {
-        if (is_string($query)) {
-            $this->query = $query;
-        } else {
-            $this->query = http_build_query($query);
-        }
-    }
-
-    public function setHeaders(array $headers): void
-    {
-        $this->headers = array_merge($this->headers, $headers);
-    }
-
-    public function send(): IResponse
-    {
-        $ch = curl_init();
-
-        if ($this->method === self::HTTP_POST) {
-            $url = $this->url;
-
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->query);
-        } else {
-            $url = $this->url . '?' . $this->query;
-        }
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 20);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-        curl_setopt($ch, CURLOPT_USERAGENT, 'MapGuesser cURL/1.0');
-
-        if (count($this->headers) > 0) {
-            curl_setopt($ch, CURLOPT_HTTPHEADER, $this->headers);
-        }
-
-        $responseHeaders = [];
-        curl_setopt(
-            $ch,
-            CURLOPT_HEADERFUNCTION,
-            function ($ch, $header) use (&$responseHeaders) {
-                $len = strlen($header);
-                $header = explode(':', $header, 2);
-
-                if (count($header) < 2) {
-                    return $len;
-                }
-
-                $responseHeaders[strtolower(trim($header[0]))][] = trim($header[1]);
-
-                return $len;
-            }
-        );
-
-        $responseBody = curl_exec($ch);
-
-        if ($responseBody === false) {
-            $error = curl_error($ch);
-
-            curl_close($ch);
-
-            throw new \Exception($error);
-        }
-
-        curl_close($ch);
-
-        return new Response($responseBody, $responseHeaders);
-    }
-}

src/Http/Response.php

@@ -1,26 +0,0 @@
-<?php namespace MapGuesser\Http;
-
-use MapGuesser\Interfaces\Http\IResponse;
-
-class Response implements IResponse
-{
-    private string $body;
-
-    private array $headers;
-
-    public function __construct(string $body, array $headers)
-    {
-        $this->body = $body;
-        $this->headers = $headers;
-    }
-
-    public function getBody(): string
-    {
-        return $this->body;
-    }
-
-    public function getHeaders(): array
-    {
-        return $this->headers;
-    }
-}

src/Interfaces/Authentication/IUser.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Authentication;
-
-interface IUser
-{
-    const PERMISSION_NORMAL = 0;
-
-    const PERMISSION_ADMIN = 1;
-
-    public function hasPermission(int $permission): bool;
-
-    public function getUniqueId();
-
-    public function getDisplayName(): string;
-
-    public function checkPassword(string $password): bool;
-}

src/Interfaces/Authorization/ISecured.php

@@ -1,6 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Authorization;
-
-interface ISecured
-{
-    public function authorize(): bool;
-}

src/Interfaces/Database/IConnection.php

@@ -1,20 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IConnection
-{
-    public function startTransaction(): void;
-
-    public function commit(): void;
-
-    public function rollback(): void;
-
-    public function query(string $query): ?IResultSet;
-
-    public function multiQuery(string $query): array;
-
-    public function prepare(string $query): IStatement;
-
-    public function lastId(): int;
-
-    public function getAffectedRows(): int;
-}

src/Interfaces/Database/IResultSet.php

@@ -1,16 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IResultSet
-{
-    const FETCH_ASSOC = 0;
-
-    const FETCH_NUM = 1;
-
-    const FETCH_BOTH = 2;
-
-    public function fetch(int $type): ?array;
-
-    public function fetchAll(int $type): array;
-
-    public function fetchOneColumn(string $valueName, string $keyName): array;
-}

src/Interfaces/Database/IStatement.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Database;
-
-interface IStatement
-{
-    public function execute(array $params): ?IResultSet;
-
-    public function getAffectedRows(): int;
-}

src/Interfaces/Http/IRequest.php

@@ -1,18 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Http;
-
-interface IRequest
-{
-    const HTTP_GET = 0;
-
-    const HTTP_POST = 1;
-
-    public function setUrl(string $url): void;
-
-    public function setMethod(int $method): void;
-
-    public function setQuery($query): void;
-
-    public function setHeaders(array $headers): void;
-
-    public function send(): IResponse;
-}

src/Interfaces/Http/IResponse.php

@@ -1,8 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Http;
-
-interface IResponse
-{
-    public function getBody(): string;
-
-    public function getHeaders(): array;
-}

src/Interfaces/Request/IRequest.php

@@ -1,20 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Request;
-
-use MapGuesser\Interfaces\Authentication\IUser;
-
-interface IRequest
-{
-    public function setParsedRouteParams(array &$routeParams): void;
-
-    public function getBase(): string;
-
-    public function query(string $key);
-
-    public function post(string $key);
-
-    public function session(): ISession;
-
-    public function setUser(?IUser $user): void;
-
-    public function user(): ?IUser;
-}

src/Interfaces/Request/ISession.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Request;
-
-interface ISession
-{
-    public function has(string $key): bool;
-
-    public function get(string $key);
-
-    public function set(string $key, $value): void;
-
-    public function delete(string $key): void;
-}

src/Interfaces/Response/IContent.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Response;
-
-interface IContent
-{
-    public function setData(array $data): void;
-
-    public function getData(): array;
-
-    public function render(): void;
-
-    public function getContentType(): string;
-}

src/Interfaces/Response/IRedirect.php

@@ -1,12 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Response;
-
-interface IRedirect
-{
-    const PERMANENT = 1;
-
-    const TEMPORARY = 2;
-
-    public function getUrl(): string;
-
-    public function getHttpCode(): int;
-}

src/Interfaces/Session/ISessionHandler.php

@@ -1,9 +0,0 @@
-<?php namespace MapGuesser\Interfaces\Session;
-
-use SessionHandlerInterface;
-use SessionIdInterface;
-use SessionUpdateTimestampHandlerInterface;
-
-interface ISessionHandler extends SessionHandlerInterface, SessionIdInterface, SessionUpdateTimestampHandlerInterface
-{
-}

src/Mailing/Mail.php

@@ -1,87 +0,0 @@
-<?php namespace MapGuesser\Mailing;
-
-use PHPMailer\PHPMailer\PHPMailer;
-
-class Mail
-{
-    private array $recipients = [];
-
-    public string $subject = '';
-
-    public string $body = '';
-
-    public function addRecipient(string $mail, ?string $name = null): void
-    {
-        $this->recipients[] = [$mail, $name];
-    }
-
-    public function setSubject(string $subject): void
-    {
-        $this->subject = $subject;
-    }
-
-    public function setBody(string $body): void
-    {
-        $this->body = $body;
-    }
-
-    public function setBodyFromTemplate(string $template, array $params = []): void
-    {
-        $this->body = file_get_contents(ROOT . '/mail/' . $template . '.html');
-
-        $baseParameters = [
-            'APP_NAME' => $_ENV['APP_NAME'],
-            'BASE_URL' => \Container::$request->getBase(),
-        ];
-
-        $params = array_merge($baseParameters, $params);
-
-        foreach ($params as $key => $param) {
-            $this->body = str_replace('{{' . $key . '}}', $param, $this->body);
-        }
-    }
-
-    public function send(): void
-    {
-        $mailer = new PHPMailer(true);
-
-        $mailer->CharSet = 'utf-8';
-        $mailer->Hostname = substr($_ENV['MAIL_FROM'], strpos($_ENV['MAIL_FROM'], '@') + 1);
-
-        if (!empty($_ENV['MAIL_HOST'])) {
-            $mailer->Mailer = 'smtp';
-            $mailer->Host = $_ENV['MAIL_HOST'];
-            $mailer->Port = !empty($_ENV['MAIL_PORT']) ? $_ENV['MAIL_PORT'] : 25;
-            $mailer->SMTPSecure = !empty($_ENV['MAIL_SECURE']) ? $_ENV['MAIL_SECURE'] : '';
-
-            if (!empty($_ENV['MAIL_USER'])) {
-                $mailer->SMTPAuth = true;
-                $mailer->Username = $_ENV['MAIL_USER'];
-                $mailer->Password = $_ENV['MAIL_PASSWORD'];
-            } else {
-                $mailer->SMTPAuth = false;
-            }
-        } else {
-            $mailer->Mailer = 'mail';
-        }
-
-        $mailer->setFrom($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-        $mailer->addReplyTo($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-
-        $mailer->Sender = !empty($_ENV['MAIL_BOUNCE']) ? $_ENV['MAIL_BOUNCE'] : $_ENV['MAIL_FROM'];
-        $mailer->Subject = $this->subject;
-        $mailer->msgHTML($this->body);
-
-        foreach ($this->recipients as $recipient) {
-            $this->sendMail($mailer, $recipient);
-        }
-    }
-
-    private function sendMail(PHPMailer $mailer, array $recipient): void
-    {
-        $mailer->clearAddresses();
-        $mailer->addAddress($recipient[0], $recipient[1]);
-
-        $mailer->send();
-    }
-}

src/OAuth/GoogleOAuth.php

@@ -1,56 +0,0 @@
-<?php namespace MapGuesser\OAuth;
-
-use MapGuesser\Interfaces\Http\IRequest;
-
-class GoogleOAuth
-{
-    private static string $dialogUrlBase = 'https://accounts.google.com/o/oauth2/v2/auth';
-
-    private static string $tokenUrlBase = 'https://oauth2.googleapis.com/token';
-
-    private IRequest $request;
-
-    public function __construct(IRequest $request)
-    {
-        $this->request = $request;
-    }
-
-    public function getDialogUrl(string $state, string $redirectUrl, ?string $nonce = null, ?string $loginHint = null): string
-    {
-        $oauthParams = [
-            'response_type' => 'code',
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'scope' => 'openid email',
-            'redirect_uri' => $redirectUrl,
-            'state' => $state,
-        ];
-
-        if ($nonce !== null) {
-            $oauthParams['nonce'] = $nonce;
-        }
-
-        if ($loginHint !== null) {
-            $oauthParams['login_hint'] = $loginHint;
-        }
-
-        return self::$dialogUrlBase . '?' . http_build_query($oauthParams);
-    }
-
-    public function getToken(string $code, string $redirectUrl): array
-    {
-        $tokenParams = [
-            'code' => $code,
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
-            'redirect_uri' => $redirectUrl,
-            'grant_type' => 'authorization_code',
-        ];
-
-        $this->request->setUrl(self::$tokenUrlBase);
-        $this->request->setMethod(IRequest::HTTP_POST);
-        $this->request->setQuery($tokenParams);
-        $response = $this->request->send();
-
-        return json_decode($response->getBody(), true);
-    }
-}

src/PersistentData/Model/Challenge.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class Challenge extends Model
 {

src/PersistentData/Model/Guess.php

@@ -1,5 +1,6 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
+use SokoWeb\PersistentData\Model\Model;
 use MapGuesser\Util\Geo\Position;
 
 class Guess extends Model

src/PersistentData/Model/Map.php

@@ -1,5 +1,6 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
+use SokoWeb\PersistentData\Model\Model;
 use MapGuesser\Util\Geo\Bounds;
 
 class Map extends Model

src/PersistentData/Model/Model.php

@@ -1,69 +0,0 @@
-<?php namespace MapGuesser\PersistentData\Model;
-
-abstract class Model
-{
-    protected static string $table;
-
-    protected static array $fields;
-
-    protected static array $relations = [];
-
-    protected $id = null;
-
-    private array $snapshot = [];
-
-    public static function getTable(): string
-    {
-        return static::$table;
-    }
-
-    public static function getFields(): array
-    {
-        return array_merge(['id'], static::$fields);
-    }
-
-    public static function getRelations(): array
-    {
-        return static::$relations;
-    }
-
-    public function setId($id): void
-    {
-        $this->id = $id;
-    }
-
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    public function toArray(): array
-    {
-        $array = [];
-
-        foreach (self::getFields() as $key) {
-            $method = 'get' . str_replace('_', '', ucwords($key, '_'));
-
-            if (method_exists($this, $method)) {
-                $array[$key] = $this->$method();
-            }
-        }
-
-        return $array;
-    }
-
-    public function saveSnapshot(): void
-    {
-        $this->snapshot = $this->toArray();
-    }
-
-    public function resetSnapshot(): void
-    {
-        $this->snapshot = [];
-    }
-
-    public function getSnapshot(): array
-    {
-        return $this->snapshot;
-    }
-}

src/PersistentData/Model/MultiRoom.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class MultiRoom extends Model
 {

src/PersistentData/Model/Place.php

@@ -2,8 +2,8 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\Model\Model;
+use SokoWeb\Http\Request;
 use MapGuesser\Util\Geo\Position;
 use MapGuesser\Util\Panorama\Pov;
 
@@ -162,7 +162,7 @@ class Place extends Model
         $this->panoIdCached = $panoId;
         $this->panoIdCachedTimestamp = new DateTime();
 
-        (new PersistentDataManager())->saveToDb($this);
+        \Container::$persistentDataManager->saveToDb($this);
 
         return $panoId;
     }

src/PersistentData/Model/PlaceInChallenge.php

@@ -1,5 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
+use SokoWeb\PersistentData\Model\Model;
+
 class PlaceInChallenge extends Model
 {
     protected static string $table = 'place_in_challenge';

src/PersistentData/Model/User.php

@@ -1,7 +1,8 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
-use MapGuesser\Interfaces\Authentication\IUser;
+use SokoWeb\PersistentData\Model\Model;
+use SokoWeb\Interfaces\Authentication\IUser;
 
 class User extends Model implements IUser
 {

src/PersistentData/Model/UserConfirmation.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class UserConfirmation extends Model
 {

src/PersistentData/Model/UserInChallenge.php

@@ -1,5 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
+use SokoWeb\PersistentData\Model\Model;
+
 class UserInChallenge extends Model
 {
     protected static string $table = 'user_in_challenge';

src/PersistentData/Model/UserPasswordResetter.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class UserPasswordResetter extends Model
 {

src/PersistentData/Model/UserPlayedPlace.php

@@ -1,6 +1,7 @@
 <?php namespace MapGuesser\PersistentData\Model;
 
 use DateTime;
+use SokoWeb\PersistentData\Model\Model;
 
 class UserPlayedPlace extends Model
 {

src/PersistentData/PersistentDataManager.php

@@ -1,235 +0,0 @@
-<?php namespace MapGuesser\PersistentData;
-
-use Generator;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\PersistentData\Model\Model;
-
-class PersistentDataManager
-{
-    public function selectFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = [])
-    {
-        $select = $this->createSelect($select, $type, $useRelations, $withRelations);
-
-        $data = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($data === null) {
-            return null;
-        }
-
-        $model = new $type();
-        $this->fillWithData($data, $model, $withRelations);
-
-        return $model;
-    }
-
-    public function selectMultipleFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Generator
-    {
-        $select = $this->createSelect($select, $type, $useRelations, $withRelations);
-        $result = $select->execute();
-
-        while ($data = $result->fetch(IResultSet::FETCH_ASSOC)) {
-            $model = new $type();
-            $this->fillWithData($data, $model, $withRelations);
-
-            yield $model;
-        }
-    }
-
-    public function selectFromDbById($id, string $type, bool $useRelations = false)
-    {
-        $select = new Select(\Container::$dbConnection);
-        $select->whereId($id);
-
-        return $this->selectFromDb($select, $type, $useRelations);
-    }
-
-    public function fillWithData(array &$data, Model $model, array $withRelations = [], ?string $modelKey = null): void
-    {
-        $relations = $model::getRelations();
-        if (count($withRelations)) {
-            $relations = array_intersect($relations, $withRelations);
-        }
-
-        while (key($data)) {
-            $key = key($data);
-            $value = current($data);
-            $relation = key($relations);
-
-            if (strpos($key, '__') == false) {
-                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-                if (method_exists($model, $method) && isset($value)) {
-                    $model->$method($value);
-                }
-
-                next($data);
-            } else if (isset($modelKey) && substr($key, 0, strlen($modelKey . '__')) === $modelKey . '__') {
-                $key = substr($key, strlen($modelKey) + 2);
-
-                $method = 'set' . str_replace('_', '', ucwords($key, '_'));
-
-                if (method_exists($model, $method) && isset($value)) {
-                    $model->$method($value);
-                }
-
-                next($data);
-            } else if (substr($key, 0, strlen($relation . '__')) === $relation . '__') {
-                $relationType = current($relations);
-                $relationModel = new $relationType();
-                $this->fillWithData($data, $relationModel, $withRelations, $relation);
-
-                $method = 'set' . str_replace('_', '', ucwords($relation, '_'));
-                $model->$method($relationModel);
-
-                next($relations);
-            } else {
-                return;
-            }
-        }
-
-        $model->saveSnapshot();
-    }
-
-    public function loadRelationsFromDb(Model $model, bool $recursive): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
-            $camel = str_replace('_', '', ucwords($relation, '_'));
-
-            $methodGet = 'get' . $camel . 'Id';
-            $methodSet = 'set' . $camel;
-
-            $relationId = $model->$methodGet();
-
-            if ($relationId !== null) {
-                $relationModel = $this->selectFromDbById($relationId, $relationType, $recursive);
-
-                $model->$methodSet($relationModel);
-            }
-        }
-    }
-
-    public function saveToDb(Model $model): void
-    {
-        $this->syncRelations($model);
-
-        $modified = $model->toArray();
-        $id = $model->getId();
-
-        $modify = new Modify(\Container::$dbConnection, $model::getTable());
-
-        if ($id !== null) {
-            $original = $model->getSnapshot();
-
-            foreach ($original as $key => $value) {
-                if ($value === $modified[$key]) {
-                    unset($modified[$key]);
-                }
-            }
-
-            if (count($modified) > 0) {
-                $modify->setId($id);
-                $modify->fill($modified);
-                $modify->save();
-            }
-        } else {
-            $modify->fill($modified);
-            $modify->save();
-
-            $model->setId($modify->getId());
-        }
-
-        $model->saveSnapshot();
-    }
-
-    public function deleteFromDb(Model $model): void
-    {
-        $modify = new Modify(\Container::$dbConnection, $model::getTable());
-        $modify->setId($model->getId());
-        $modify->delete();
-
-        $model->setId(null);
-        $model->resetSnapshot();
-    }
-
-    private function createSelect(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Select
-    {
-        $table = call_user_func([$type, 'getTable']);
-        $fields = call_user_func([$type, 'getFields']);
-
-        $columns = [];
-
-        foreach ($fields as $field) {
-            $columns[] = [$table, $field];
-        }
-
-        $select->from($table);
-
-        if ($useRelations) {
-            $relations = call_user_func([$type, 'getRelations']);
-            if (count($withRelations)) {
-                $relations = array_intersect($relations, $withRelations);
-            }
-
-            $columns = array_merge($columns, $this->getRelationColumns($relations, $withRelations));
-
-            $this->leftJoinRelations($select, $table, $relations, $withRelations);
-            $select->columns($columns);
-        } else {
-            $select->columns($columns);
-        }
-
-        return $select;
-    }
-
-    private function getRelationColumns(array $relations, array $withRelations): array
-    {
-        $columns = [];
-
-        foreach ($relations as $relation => $relationType) {
-            $relationTable = call_user_func([$relationType, 'getTable']);
-            foreach (call_user_func([$relationType, 'getFields']) as $relationField) {
-                $columns[] = [$relationTable, $relationField, $relation . '__' . $relationField];
-            }
-
-            $nextOrderRelations = call_user_func([$relationType, 'getRelations']);
-            if (count($withRelations)) {
-                $nextOrderRelations = array_intersect($nextOrderRelations, $withRelations);
-            }
-            $columns = array_merge($columns, $this->getRelationColumns($nextOrderRelations, $withRelations));
-        }
-
-        return $columns;
-    }
-
-    private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void
-    {
-        foreach ($relations as $relation => $relationType) {
-            $relationTable = call_user_func([$relationType, 'getTable']);
-            $select->leftJoin($relationTable, [$relationTable, 'id'], '=', [$table, $relation . '_id']);
-
-            $nextOrderRelations = call_user_func([$relationType, 'getRelations']);
-            if (count($withRelations)) {
-                $nextOrderRelations = array_intersect($nextOrderRelations, $withRelations);
-            }
-            $this->leftJoinRelations($select, $relationTable, $nextOrderRelations, $withRelations);
-        }
-    }
-
-    private function syncRelations(Model $model): void
-    {
-        foreach ($model::getRelations() as $relation => $relationType) {
-            $camel = str_replace('_', '', ucwords($relation, '_'));
-
-            $methodGet = 'get' . $camel;
-            $methodSet = 'set' . $camel . 'Id';
-
-            $relationModel = $model->$methodGet();
-
-            if ($relationModel !== null) {
-                $model->$methodSet($relationModel->getId());
-            }
-        }
-    }
-}

src/Repository/ChallengeRepository.php

@@ -1,32 +1,24 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class ChallengeRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $challengeId): ?Challenge
     {
-        return $this->pdm->selectFromDbById($challengeId, Challenge::class);
+        return \Container::$persistentDataManager->selectFromDbById($challengeId, Challenge::class);
     }
 
     public function getByToken(int $token): ?Challenge
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('token', '=', $token);
-        
-        return $this->pdm->selectFromDb($select, Challenge::class);
+
+        return \Container::$persistentDataManager->selectFromDb($select, Challenge::class);
     }
 
     public function getByTokenStr(string $token_str): ?Challenge
@@ -48,9 +40,9 @@ class ChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('user_in_challenge', ['challenge', 'id'], '=', ['user_in_challenge', 'challenge_id']);
         $select->innerJoin('users', ['users', 'id'], '=', ['user_in_challenge', 'user_id']);
-        $select->where('user_id', '=', $user->getId());
+        $select->where(['user_in_challenge', 'user_id'], '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Challenge::class);
     }
 
     public function getAllByOwner(User $user): Generator
@@ -58,18 +50,18 @@ class ChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('user_in_challenge', ['challenge', 'id'], '=', ['user_in_challenge', 'challenge_id']);
         $select->innerJoin('users', ['users', 'id'], '=', ['user_in_challenge', 'user_id']);
-        $select->where('user_id', '=', $user->getId());
-        $select->where('is_owner', '=', true);
+        $select->where(['user_in_challenge', 'user_id'], '=', $user->getId());
+        $select->where(['user_in_challenge', 'is_owner'], '=', true);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Challenge::class);
     }
 
     public function getAllByPlace(Place $place): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['challenges', 'id'], '=', ['place_in_challenge', 'challenge_id']);
-        $select->where('place_id', '=', $place->getId());
+        $select->where(['place_in_challenge', 'place_id'], '=', $place->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Challenge::class);
     }
-}
+}

src/Repository/GuessRepository.php

@@ -1,30 +1,21 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class GuessRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getAllByUser(User $user): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class);
     }
 
     public function getAllByUserAndChallenge(User $user, Challenge $challenge): Generator
@@ -32,9 +23,9 @@ class GuessRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
         $select->where('user_id', '=', $user->getId());
-        $select->where('challenge_id', '=', $challenge->getId());
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class);
     }
 
     public function getByUserAndPlaceInChallenge(User $user, Challenge $challenge, Place $place): ?Guess
@@ -42,10 +33,10 @@ class GuessRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
         $select->where('user_id', '=', $user->getId());
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->where('place_id', '=', $place->getId());
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->where(['place_in_challenge', 'place_id'], '=', $place->getId());
 
-        return $this->pdm->selectFromDb($select, Guess::class);
+        return \Container::$persistentDataManager->selectFromDb($select, Guess::class);
     }
 
     public function getAllInChallengeByUser(int $userId, Challenge $challenge): Generator
@@ -53,46 +44,46 @@ class GuessRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
         $select->where('user_id', '=', $userId);
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->orderBy('round');
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->orderBy(['place_in_challenge', 'round']);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class);
     }
 
     public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator
     {
         if (count($withRelations)) {
-            $necessaryRelations = [PlaceInChallenge::class];
+            $necessaryRelations = ['place_in_challenge'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
 
         $select = new Select(\Container::$dbConnection);
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->orderBy('round');
+        $select->where(['guesses__place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->orderBy(['guesses__place_in_challenge', 'round']);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class, true, $withRelations);
     }
 
     public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator
     {
         if (count($withRelations)) {
-            $necessaryRelations = [PlaceInChallenge::class];
+            $necessaryRelations = ['place_in_challenge'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
-        
-        $select = new Select(\Container::$dbConnection);
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->where('round', '=', $round);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
+        $select = new Select(\Container::$dbConnection);
+        $select->where(['guesses__place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->where(['guesses__place_in_challenge', 'round'], '=', $round);
+
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class, true, $withRelations);
     }
 
     public function getAllByPlace(Place $place): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['place_in_challenge', 'id'], '=', ['guesses', 'place_in_challenge_id']);
-        $select->where('place_id', '=', $place->getId());
+        $select->where(['place_in_challenge', 'place_id'], '=', $place->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Guess::class);
     }
 }

src/Repository/MapRepository.php

@@ -1,23 +1,15 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class MapRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $mapId): ?Map
     {
-        return $this->pdm->selectFromDbById($mapId, Map::class);
+        return \Container::$persistentDataManager->selectFromDbById($mapId, Map::class);
     }
 
     public function getByPlace(Place $place): ?Map
@@ -30,9 +22,9 @@ class MapRepository
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('places', ['maps', 'id'], '=', ['places', 'map_id']);
         $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
-        $select->where('challenge_id', '=', $challenge->getId());
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
         $select->limit(1);
 
-        return $this->pdm->selectFromDb($select, Map::class);
+        return \Container::$persistentDataManager->selectFromDb($select, Map::class);
     }
 }

src/Repository/MultiRoomRepository.php

@@ -2,22 +2,14 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class MultiRoomRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $id): ?MultiRoom
     {
-        return $this->pdm->selectFromDbById($id, MultiRoom::class);
+        return \Container::$persistentDataManager->selectFromDbById($id, MultiRoom::class);
     }
 
     public function getByRoomId(string $roomId): ?MultiRoom
@@ -25,7 +17,7 @@ class MultiRoomRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('room_id', '=', $roomId);
 
-        return $this->pdm->selectFromDb($select, MultiRoom::class);
+        return \Container::$persistentDataManager->selectFromDb($select, MultiRoom::class);
     }
 
     public function getAllExpired(): Generator
@@ -33,6 +25,6 @@ class MultiRoomRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('updated', '<', (new DateTime('-7 day'))->format('Y-m-d H:i:s'));
 
-        yield from $this->pdm->selectMultipleFromDb($select, MultiRoom::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, MultiRoom::class);
     }
 }

src/Repository/PlaceInChallengeRepository.php

@@ -1,28 +1,19 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
-use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class PlaceInChallengeRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getAllByPlace(Place $place, array $withRelations = []) : Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('place_id', '=', $place->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, PlaceInChallenge::class, true, $withRelations);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, PlaceInChallenge::class, true, $withRelations);
     }
 
     public function getAllByChallenge(Challenge $challenge) : Generator
@@ -30,7 +21,7 @@ class PlaceInChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, PlaceInChallenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, PlaceInChallenge::class);
     }
 
     public function getByPlaceAndChallenge(Place $place, Challenge $challenge) : ?PlaceInChallenge
@@ -39,7 +30,7 @@ class PlaceInChallengeRepository
         $select->where('place_id', '=', $place->getId());
         $select->where('challenge_id', '=', $challenge->getId());
 
-        return $this->pdm->selectFromDb($select, PlaceInChallenge::class);
+        return \Container::$persistentDataManager->selectFromDb($select, PlaceInChallenge::class);
     }
 
     public function getByRoundInChallenge(int $round, Challenge $challenge, array $withRelations = []): ?PlaceInChallenge
@@ -49,6 +40,6 @@ class PlaceInChallengeRepository
         $select->orderBy('round');
         $select->limit(1, $round);
 
-        return $this->pdm->selectFromDb($select, PlaceInChallenge::class, true, $withRelations);
+        return \Container::$persistentDataManager->selectFromDb($select, PlaceInChallenge::class, true, $withRelations);
     }
 }

src/Repository/PlaceRepository.php

@@ -1,24 +1,16 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Map;
 use MapGuesser\PersistentData\Model\Place;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class PlaceRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $placeId): ?Place
     {
-        return $this->pdm->selectFromDbById($placeId, Place::class);
+        return \Container::$persistentDataManager->selectFromDbById($placeId, Place::class);
     }
 
     public function getAllForMap(Map $map): Generator
@@ -26,7 +18,7 @@ class PlaceRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('map_id', '=', $map->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, Place::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Place::class);
     }
 
     //TODO: use Map and User instead of id
@@ -41,7 +33,7 @@ class PlaceRepository
             }
 
             $oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);
-            
+
             return array_merge($unvisitedPlaces, $oldPlaces);
         }
     }
@@ -99,7 +91,7 @@ class PlaceRepository
         $select->where('id', 'NOT IN', $exclude);
         $select->limit(1, $randomOffset);
 
-        return $this->pdm->selectFromDb($select, Place::class);
+        return \Container::$persistentDataManager->selectFromDb($select, Place::class);
     }
 
     // Never visited places
@@ -118,7 +110,7 @@ class PlaceRepository
         $selectUnvisited = new Select(\Container::$dbConnection, 'places');
         $selectUnvisited->leftJoin($selectPlacesByCurrentUser, ['places', 'id'], '=', ['places_by_current_user', 'place_id']);
         $selectUnvisited->where('map_id', '=', $mapId);
-        $selectUnvisited->where('last_time', '=', null);
+        $selectUnvisited->where(['places_by_current_user', 'last_time'], '=', null);
         $numberOfUnvisitedPlaces = $selectUnvisited->count();
 
         // look for as many new places as possible but maximum $n
@@ -182,21 +174,21 @@ class PlaceRepository
     {
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->orderBy('round');
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->orderBy(['place_in_challenge', 'round']);
         $select->limit(1, $round);
 
-        return $this->pdm->selectFromDb($select, Place::class);
+        return \Container::$persistentDataManager->selectFromDb($select, Place::class);
     }
 
     public function getAllInChallenge(Challenge $challenge): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->innerJoin('place_in_challenge', ['places', 'id'], '=', ['place_in_challenge', 'place_id']);
-        $select->where('challenge_id', '=', $challenge->getId());
-        $select->orderBy('round');
+        $select->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
+        $select->orderBy(['place_in_challenge', 'round']);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Place::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, Place::class);
     }
-  
+
 }

src/Repository/UserConfirmationRepository.php

@@ -1,22 +1,14 @@
 <?php namespace MapGuesser\Repository;
 
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserConfirmation;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class UserConfirmationRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $userConfirmationId): ?UserConfirmation
     {
-        return $this->pdm->selectFromDbById($userConfirmationId, UserConfirmation::class);
+        return \Container::$persistentDataManager->selectFromDbById($userConfirmationId, UserConfirmation::class);
     }
 
     public function getByToken(string $token): ?UserConfirmation
@@ -24,7 +16,7 @@ class UserConfirmationRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('token', '=', $token);
 
-        return $this->pdm->selectFromDb($select, UserConfirmation::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserConfirmation::class);
     }
 
     public function getByUser(User $user): ?UserConfirmation
@@ -32,6 +24,6 @@ class UserConfirmationRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        return $this->pdm->selectFromDb($select, UserConfirmation::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserConfirmation::class);
     }
 }

src/Repository/UserInChallengeRepository.php

@@ -1,27 +1,19 @@
 <?php namespace MapGuesser\Repository;
 
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class UserInChallengeRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getAllByUser(User $user) : Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class);
     }
 
     public function getAllByChallenge(Challenge $challenge) : Generator
@@ -29,7 +21,7 @@ class UserInChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class);
     }
 
     public function getAllByChallengeWithUsers(Challenge $challenge) : Generator
@@ -37,7 +29,7 @@ class UserInChallengeRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserInChallenge::class, true, [User::class]);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class, true, ['user']);
     }
 
     public function getByUserIdAndChallenge(int $userId, Challenge $challenge): ?UserInChallenge
@@ -46,13 +38,13 @@ class UserInChallengeRepository
         $select->where('user_id', '=', $userId);
         $select->where('challenge_id', '=', $challenge->getId());
 
-        return $this->pdm->selectFromDb($select, UserInChallenge::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserInChallenge::class);
     }
 
     public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge
     {
         if (count($withRelations)) {
-            $necessaryRelations = [Challenge::class];
+            $necessaryRelations = ['challange'];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
 
@@ -65,9 +57,9 @@ class UserInChallengeRepository
 
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $userId);
-        $select->where('token', '=', $token);
+        $select->where(['user_in_challenge__challenge', 'token'], '=', $token);
 
-        return $this->pdm->selectFromDb($select, UserInChallenge::class, true, $withRelations);
+        return \Container::$persistentDataManager->selectFromDb($select, UserInChallenge::class, true, $withRelations);
     }
 
     public function isUserParticipatingInChallenge(int $userId, Challenge $challenge): bool

src/Repository/UserPasswordResetterRepository.php

@@ -2,23 +2,15 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class UserPasswordResetterRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $userConfirmationId): ?UserPasswordResetter
     {
-        return $this->pdm->selectFromDbById($userConfirmationId, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDbById($userConfirmationId, UserPasswordResetter::class);
     }
 
     public function getByToken(string $token): ?UserPasswordResetter
@@ -26,7 +18,7 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('token', '=', $token);
 
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserPasswordResetter::class);
     }
 
     public function getByUser(User $user): ?UserPasswordResetter
@@ -34,7 +26,7 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        return $this->pdm->selectFromDb($select, UserPasswordResetter::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserPasswordResetter::class);
     }
 
     public function getAllExpired(): Generator
@@ -42,6 +34,6 @@ class UserPasswordResetterRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('expires', '<', (new DateTime())->format('Y-m-d H:i:s'));
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPasswordResetter::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserPasswordResetter::class);
     }
 }

src/Repository/UserPlayedPlaceRepository.php

@@ -1,28 +1,19 @@
 <?php namespace MapGuesser\Repository;
 
-use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\Place;
 use MapGuesser\PersistentData\Model\UserPlayedPlace;
-use MapGuesser\PersistentData\PersistentDataManager;
 
 class UserPlayedPlaceRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getByUser(User $user): Generator
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserPlayedPlace::class);
     }
 
     public function getAllByPlace(Place $place): Generator
@@ -30,7 +21,7 @@ class UserPlayedPlaceRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('place_id', '=', $place->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserPlayedPlace::class);
     }
 
     public function getAllByUser(User $user) : Generator
@@ -38,7 +29,7 @@ class UserPlayedPlaceRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('user_id', '=', $user->getId());
 
-        yield from $this->pdm->selectMultipleFromDb($select, UserPlayedPlace::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserPlayedPlace::class);
     }
 
     public function getByUserIdAndPlaceId(int $userId, int $placeId) : ?UserPlayedPlace
@@ -47,6 +38,6 @@ class UserPlayedPlaceRepository
         $select->where('user_id', '=', $userId);
         $select->where('place_id', '=', $placeId);
 
-        return $this->pdm->selectFromDb($select, UserPlayedPlace::class);
+        return \Container::$persistentDataManager->selectFromDb($select, UserPlayedPlace::class);
     }
 }

src/Repository/UserRepository.php

@@ -2,23 +2,16 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Interfaces\Repository\IUserRepository;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
 
-class UserRepository
+class UserRepository implements IUserRepository
 {
-    private PersistentDataManager $pdm;
-
-    public function __construct()
-    {
-        $this->pdm = new PersistentDataManager();
-    }
-
     public function getById(int $userId): ?User
     {
-        return $this->pdm->selectFromDbById($userId, User::class);
+        return \Container::$persistentDataManager->selectFromDbById($userId, User::class);
     }
 
     public function getByEmail(string $email): ?User
@@ -26,7 +19,7 @@ class UserRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('email', '=', $email);
 
-        return $this->pdm->selectFromDb($select, User::class);
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
     public function getByGoogleSub(string $sub): ?User
@@ -34,7 +27,7 @@ class UserRepository
         $select = new Select(\Container::$dbConnection);
         $select->where('google_sub', '=', $sub);
 
-        return $this->pdm->selectFromDb($select, User::class);
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
     }
 
     public function getAllInactiveExpired(): Generator
@@ -43,7 +36,7 @@ class UserRepository
         $select->where('active', '=', false);
         $select->where('created', '<', (new DateTime('-1 day'))->format('Y-m-d H:i:s'));
 
-        yield from $this->pdm->selectMultipleFromDb($select, User::class);
+        yield from \Container::$persistentDataManager->selectMultipleFromDb($select, User::class);
     }
 
     public function getByGuess(Guess $guess): ?User

src/Request/Request.php

@@ -1,93 +0,0 @@
-<?php namespace MapGuesser\Request;
-
-use MapGuesser\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Request\ISession;
-use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\PersistentDataManager;
-use MapGuesser\Repository\UserRepository;
-
-class Request implements IRequest
-{
-    private string $base;
-
-    private array $get;
-
-    private array $routeParams = [];
-
-    private array $post;
-
-    private Session $session;
-
-    private UserRepository $userRepository;
-
-    private ?User $user = null;
-
-    public function __construct(string $base, array &$get, array &$post, array &$session)
-    {
-        $this->base = $base;
-        $this->get = &$get;
-        $this->post = &$post;
-        $this->session = new Session($session);
-
-        $this->userRepository = new UserRepository();
-
-        $userId = $this->session->get('userId');
-
-        if ($userId !== null) {
-            $this->user = $this->userRepository->getById($userId);
-        }
-    }
-
-    public function setParsedRouteParams(array &$routeParams): void
-    {
-        $this->routeParams = &$routeParams;
-    }
-
-    public function getBase(): string
-    {
-        return $this->base;
-    }
-
-    public function query($key)
-    {
-        if (isset($this->get[$key])) {
-            return $this->get[$key];
-        }
-
-        if (isset($this->routeParams[$key])) {
-            return $this->routeParams[$key];
-        }
-
-        return null;
-    }
-
-    public function post($key)
-    {
-        if (isset($this->post[$key])) {
-            return $this->post[$key];
-        }
-
-        return null;
-    }
-
-    public function session(): ISession
-    {
-        return $this->session;
-    }
-
-    public function setUser(?IUser $user): void
-    {
-        if ($user === null) {
-            $this->session->delete('userId');
-            return;
-        }
-
-        $this->session->set('userId', $user->getUniqueId());
-    }
-
-    public function user(): ?IUser
-    {
-        return $this->user;
-    }
-}

src/Request/Session.php

@@ -1,37 +0,0 @@
-<?php namespace MapGuesser\Request;
-
-use MapGuesser\Interfaces\Request\ISession;
-
-class Session implements ISession
-{
-    private array $data;
-
-    public function __construct(array &$data)
-    {
-        $this->data = &$data;
-    }
-
-    public function has(string $key): bool
-    {
-        return isset($this->data[$key]);
-    }
-
-    public function get(string $key)
-    {
-        if (isset($this->data[$key])) {
-            return $this->data[$key];
-        }
-
-        return null;
-    }
-
-    public function set(string $key, $value): void
-    {
-        $this->data[$key] = $value;
-    }
-
-    public function delete(string $key): void
-    {
-        unset($this->data[$key]);
-    }
-}

src/Response/ContentBase.php

@@ -1,22 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\Interfaces\Response\IContent;
-
-abstract class ContentBase implements IContent
-{
-    protected array $data;
-
-    public function setData(array $data): void
-    {
-        $this->data = $data;
-    }
-
-    public function getData(): array
-    {
-        return $this->data;
-    }
-
-    abstract public function render(): void;
-
-    abstract public function getContentType(): string;
-}

src/Response/HtmlContent.php

@@ -1,34 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\View\Linker;
-
-class HtmlContent extends ContentBase
-{
-    private string $view;
-
-    public function __construct(string $view, array $data = [])
-    {
-        $this->view = $view;
-        $this->data = $data;
-    }
-
-    public function render(): void
-    {
-        if (!empty($_ENV['DEV'])) {
-            $generator = new Linker($this->view);
-            $generator->generate();
-        }
-
-        extract($this->data);
-
-        require ROOT . '/cache/views/' . $this->view . '.php';
-
-        // @phpstan-ignore-next-line - SCRIPT_STARTED is defined in main.php
-        echo '<!-- __debug__runtime: ' . round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1) . ' -->';
-    }
-
-    public function getContentType(): string
-    {
-        return 'text/html';
-    }
-}

src/Response/JsonContent.php

@@ -1,22 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-class JsonContent extends ContentBase
-{
-    public function __construct(array $data = [])
-    {
-        $this->data = $data;
-    }
-
-    public function render(): void
-    {
-        // @phpstan-ignore-next-line - SCRIPT_STARTED is defined in main.php
-        $this->data['__debug__runtime'] = round((hrtime(true) - SCRIPT_STARTED) / 1e+6, 1);
-
-        echo json_encode($this->data);
-    }
-
-    public function getContentType(): string
-    {
-        return 'application/json';
-    }
-}

src/Response/Redirect.php

@@ -1,41 +0,0 @@
-<?php namespace MapGuesser\Response;
-
-use MapGuesser\Interfaces\Response\IRedirect;
-
-class Redirect implements IRedirect
-{
-    private string $target;
-
-    private int $type;
-
-    public function __construct(string $target, int $type = IRedirect::TEMPORARY)
-    {
-        $this->target = $target;
-        $this->type = $type;
-    }
-
-    public function getUrl(): string
-    {
-        if (preg_match('/^http(s)?/', $this->target) === 1) {
-            $link = $this->target;
-        } else {
-            $link = \Container::$request->getBase() . '/' . $this->target;
-        }
-
-        return $link;
-    }
-
-    public function getHttpCode(): int
-    {
-        switch ($this->type) {
-            case IRedirect::PERMANENT:
-                return 301;
-
-            case IRedirect::TEMPORARY:
-                return 302;
-
-            default:
-                return 302;
-        }
-    }
-}

src/Routing/Route.php

@@ -1,73 +0,0 @@
-<?php namespace MapGuesser\Routing;
-
-class Route
-{
-    private string $id;
-
-    private array $pattern;
-
-    private array $handler;
-
-    public function __construct(string $id, array $pattern, array $handler)
-    {
-        $this->id = $id;
-        $this->pattern = $pattern;
-        $this->handler = $handler;
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getHandler(): array
-    {
-        return $this->handler;
-    }
-
-    public function generateLink(array $parameters = []): string
-    {
-        $link = [];
-
-        foreach ($this->pattern as $fragment) {
-            if (preg_match('/^{(\\w+)(\\?)?}$/', $fragment, $matches) === 1) {
-                if (isset($parameters[$matches[1]])) {
-                    $link[] = $parameters[$matches[1]];
-                    unset($parameters[$matches[1]]);
-                } elseif (!isset($matches[2])) {//TODO: why? parameter not found but not optional
-                    $link[] = $fragment;
-                }
-            } else {
-                $link[] = $fragment;
-            }
-        }
-
-        $queryParams = [];
-        foreach ($parameters as $key => $value) {
-            if ($value === null) {
-                continue;
-            }
-
-            $queryParams[$key] = $value;
-        }
-
-        $query = count($queryParams) > 0 ? '?' . http_build_query($queryParams) : '';
-
-        return implode('/', $link) . $query;
-    }
-
-    public function testAgainst(array $path): ?array
-    {
-        $parameters = [];
-
-        foreach ($path as $i => $fragment) {
-            if (preg_match('/^{(\\w+)(?:\\?)?}$/', $this->pattern[$i], $matches) === 1) {
-                $parameters[$matches[1]] = $fragment;
-            } elseif ($fragment != $this->pattern[$i]) {
-                return null;
-            }
-        }
-
-        return $parameters;
-    }
-}

src/Routing/RouteCollection.php

@@ -1,88 +0,0 @@
-<?php namespace MapGuesser\Routing;
-
-use Closure;
-
-class RouteCollection
-{
-    private array $routes = [];
-
-    private array $searchTable = [
-        'get' => [],
-        'post' => []
-    ];
-
-    private array $groupStack = [];
-
-    public function get(string $id, string $pattern, array $handler): void
-    {
-        $this->addRoute('get', $id, $pattern, $handler);
-    }
-
-    public function post(string $id, string $pattern, array $handler): void
-    {
-        $this->addRoute('post', $id, $pattern, $handler);
-    }
-
-    public function group(string $pattern, Closure $group): void
-    {
-        $this->groupStack[] = $pattern;
-
-        $group($this);
-
-        array_pop($this->groupStack);
-    }
-
-    public function getRoute(string $id): ?Route
-    {
-        if (!isset($this->routes[$id])) {
-            return null;
-        }
-
-        return $this->routes[$id];
-    }
-
-    public function match(string $method, array $uri): ?array
-    {
-        $groupNumber = count($uri);
-
-        // response to HEAD request with the GET content
-        if ($method === 'head') {
-            $method = 'get';
-        }
-
-        if (!isset($this->searchTable[$method][$groupNumber])) {
-            return null;
-        }
-
-        foreach ($this->searchTable[$method][$groupNumber] as $route) {
-            if (($parameters = $route->testAgainst($uri)) !== null) {
-                return [$route, $parameters];
-            }
-        }
-
-        return null;
-    }
-
-    private function addRoute(string $method, string $id, string $pattern, array $handler): void
-    {
-        if (isset($this->routes[$id])) {
-            throw new \Exception('Route already exists: ' . $id);
-        }
-
-        $pattern = array_merge($this->groupStack, $pattern === '' ? [] : explode('/', $pattern));
-        $route = new Route($id, $pattern, $handler);
-
-        $groupNumber = count($pattern);
-
-        $this->searchTable[$method][$groupNumber][] = $route;
-
-        while (preg_match('/^{\\w+\\?}$/', end($pattern)) === 1) {
-            $groupNumber--;
-            array_pop($pattern);
-
-            $this->searchTable[$method][$groupNumber][] = $route;
-        }
-
-        $this->routes[$id] = $route;
-    }
-}

src/Session/DatabaseSessionHandler.php

@@ -1,104 +0,0 @@
-<?php namespace MapGuesser\Session;
-
-use DateTime;
-use MapGuesser\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Session\ISessionHandler;
-
-class DatabaseSessionHandler implements ISessionHandler
-{
-    private bool $exists = false;
-
-    private bool $written = false;
-
-    public function open($savePath, $sessionName): bool
-    {
-        return true;
-    }
-
-    public function close(): bool
-    {
-        return true;
-    }
-
-    public function read($id): string
-    {
-        $select = new Select(\Container::$dbConnection, 'sessions');
-        $select->columns(['data']);
-        $select->whereId(substr($id, 0, 32));
-
-        $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
-        if ($result === null) {
-            return '';
-        }
-
-        $this->exists = true;
-
-        return $result['data'];
-    }
-
-    public function write($id, $data): bool
-    {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-
-        if ($this->exists) {
-            $modify->setId(substr($id, 0, 32));
-        } else {
-            $modify->setExternalId(substr($id, 0, 32));
-        }
-
-        $modify->set('data', $data);
-        $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
-        $modify->save();
-
-        $this->written = true;
-
-        return true;
-    }
-
-    public function destroy($id): bool
-    {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-        $modify->setId(substr($id, 0, 32));
-        $modify->delete();
-
-        $this->exists = false;
-
-        return true;
-    }
-
-    public function gc($maxlifetime): bool
-    {
-        // empty on purpose
-        // old sessions are deleted by MaintainDatabaseCommand
-
-        return true;
-    }
-
-    public function create_sid(): string
-    {
-        return bin2hex(random_bytes(16));
-    }
-
-    public function validateId($id): bool
-    {
-        return preg_match('/^[a-f0-9]{32}$/', $id) === 1;
-    }
-
-    public function updateTimestamp($id, $data): bool
-    {
-        if ($this->written) {
-            return true;
-        }
-
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
-
-        $modify->setId(substr($id, 0, 32));
-        $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));
-        $modify->save();
-
-        return true;
-    }
-}

src/Util/JwtParser.php

@@ -1,33 +0,0 @@
-<?php namespace MapGuesser\Util;
-
-class JwtParser
-{
-    private array $token;
-
-    public function __construct(?string $token = null)
-    {
-        if ($token !== null) {
-            $this->setToken($token);
-        }
-    }
-
-    public function setToken(string $token): void
-    {
-        $this->token = explode('.', str_replace(['_', '-'], ['/', '+'], $token));
-    }
-
-    public function getHeader(): array
-    {
-        return json_decode(base64_decode($this->token[0]), true);
-    }
-
-    public function getPayload(): array
-    {
-        return json_decode(base64_decode($this->token[1]), true);
-    }
-
-    public function getSignature(): string
-    {
-        return base64_decode($this->token[2]);
-    }
-}

src/View/Linker.php

@@ -1,152 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class Linker
-{
-    const INLINE_ASSET_LIMIT = 2000;
-
-    private string $view;
-
-    public function __construct(string $view)
-    {
-        $this->view = $view;
-    }
-
-    public function generate(): void
-    {
-        $input = ROOT . '/views/' . $this->view . '.php';
-
-        $temporaryFiles = [];
-        $sections = ['externalCss' => '', 'inlineCss' => '', 'externalJs' => '', 'inlineJs' => ''];
-        $extra = ['', ''];
-
-        do {
-            $parser = new Parser($input);
-            $fragment = $parser->parse();
-
-            $extends = $fragment->getExtends();
-
-            $this->generateAssets($fragment, $sections);
-
-            $sections = array_merge($sections, $fragment->getSections()); //TODO: detect if section defined multiple times
-            $extra[0] = $fragment->getExtra()[0] . $extra[0];
-            $extra[1] = $extra[1] . $fragment->getExtra()[1];
-
-            if ($extends === null) {
-                $this->writeFinal($extra, $input, ROOT . '/cache/views/' . $this->view . '.php');
-                break;
-            }
-
-            $tmpFile = tempnam(sys_get_temp_dir(), 'mapg-view-');
-            $temporaryFiles[] = $tmpFile;
-
-            $this->extendTemplate($sections, ROOT . '/views/' . $extends . '.php', $tmpFile);
-
-            $input = $tmpFile;
-        } while (true);
-
-        foreach ($temporaryFiles as $tmpFile) {
-            unlink($tmpFile);
-        }
-    }
-
-    private function extendTemplate(array $sections, string $file, string $output): void
-    {
-        $inputFileHandle = fopen($file, 'r');
-        if (!$inputFileHandle) {
-            throw new \Exception('Cannot open file ' . $file);
-        }
-
-        $outputFileHandle = fopen($output, 'w');
-        if (!$outputFileHandle) {
-            throw new \Exception('Cannot open file ' . $output . 'for writing.');
-        }
-
-        $lineNumber = 0;
-        while (($line = fgets($inputFileHandle)) !== false) {
-            ++$lineNumber;
-
-            if (preg_match('/^\s*@yields\(\'([\w\/]+)\'\)\s*$/', $line, $matches) === 1) {
-                if (isset($sections[$matches[1]])) {
-                    fwrite($outputFileHandle, $sections[$matches[1]]);
-                }
-            } else {
-                fwrite($outputFileHandle, $line);
-            }
-        }
-
-        fclose($inputFileHandle);
-        fclose($outputFileHandle);
-    }
-
-    private function writeFinal(array $extra, string $file, string $output): void
-    {
-        $dirname = pathinfo($output, PATHINFO_DIRNAME);
-        if (!is_dir($dirname)) {
-            mkdir($dirname, 0755, true);
-        }
-
-        $inputFileHandle = fopen($file, 'r');
-        if (!$inputFileHandle) {
-            throw new \Exception('Cannot open file ' . $file);
-        }
-
-        $outputFileHandle = fopen($output, 'w');
-        if (!$outputFileHandle) {
-            throw new \Exception('Cannot open file ' . $output . 'for writing.');
-        }
-
-        fwrite($outputFileHandle, $extra[0]);
-        while (($line = fgets($inputFileHandle)) !== false) {
-            fwrite($outputFileHandle, $line);
-        }
-        fwrite($outputFileHandle, $extra[1]);
-
-        fclose($inputFileHandle);
-        fclose($outputFileHandle);
-    }
-
-    private function generateAssets(ParsedFragment $fragment, array &$sections): void
-    {
-        foreach ($fragment->getCss() as $cssFile) {
-            $asset = $this->parseAsset($cssFile);
-            if (isset($asset['code'])) {
-                $sections['inlineCss'] .= '<style>' . PHP_EOL;
-                $sections['inlineCss'] .= $asset['code'];
-                $sections['inlineCss'] .= '</style>' . PHP_EOL;
-            } elseif (isset($asset['file'])) {
-                $sections['externalCss'] .= '<link href="' . $asset['file'] . '" rel="stylesheet">' . PHP_EOL;
-            }
-        }
-
-        foreach ($fragment->getJs() as $jsFile) {
-            $asset = $this->parseAsset($jsFile);
-            if (isset($asset['code'])) {
-                $sections['inlineJs'] .= '<script>' . PHP_EOL;
-                $sections['inlineJs'] .= $asset['code'];
-                $sections['inlineJs'] .= '</script>' . PHP_EOL;
-            } elseif (isset($asset['file'])) {
-                $sections['externalJs'] .= '<script src="' . $asset['file'] . '"></script>' . PHP_EOL;
-            }
-        }
-    }
-
-    private function parseAsset(string $asset): array
-    {
-        $output = [];
-
-        if (preg_match('/^[\w\/\.]+$/', $asset) === 1) {
-            if (
-                empty($_ENV['DEV']) &&
-                filesize(ROOT . '/public/static/' . $asset) < self::INLINE_ASSET_LIMIT
-            ) {
-                $output['code'] = file_get_contents(ROOT . '/public/static/' . $asset);
-            } else {
-                $output['file'] = '<?= $_ENV[\'STATIC_ROOT\'] ?>/' . $asset . '?rev=<?= REVISION ?>';
-            }
-        } else {
-            $output['file'] = $asset;
-        }
-
-        return $output;
-    }
-}

src/View/ParsedFragment.php

@@ -1,48 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class ParsedFragment
-{
-    private ?string $extends;
-
-    private array $css;
-
-    private array $js;
-
-    private array $sections;
-
-    private array $extra;
-
-    public function __construct(?string $extends, array $css, array $js, array $sections, array $extra)
-    {
-        $this->extends = $extends;
-        $this->css = $css;
-        $this->js = $js;
-        $this->sections = $sections;
-        $this->extra = $extra;
-    }
-
-    public function getExtends(): ?string
-    {
-        return $this->extends;
-    }
-
-    public function getCss(): array
-    {
-        return $this->css;
-    }
-
-    public function getJs(): array
-    {
-        return $this->js;
-    }
-
-    public function getSections(): array
-    {
-        return $this->sections;
-    }
-
-    public function getExtra(): array
-    {
-        return $this->extra;
-    }
-}

src/View/Parser.php

@@ -1,159 +0,0 @@
-<?php namespace MapGuesser\View;
-
-class Parser
-{
-    private string $file;
-
-    public function __construct(string $file)
-    {
-        $this->file = $file;
-    }
-
-    public function parse(): ParsedFragment
-    {
-        $sectionOpen = null;
-        $extraOpen = false;
-
-        $extends = null;
-        $js = [];
-        $css = [];
-        $sections = [];
-        $extra = ['', ''];
-
-        $fileHandle = fopen($this->file, 'r');
-        if (!$fileHandle) {
-            throw new \Exception('Cannot open file ' . $this->file);
-        }
-
-        $lineNumber = 0;
-        while (($line = fgets($fileHandle)) !== false) {
-            ++$lineNumber;
-
-            if (($cssMatched = $this->matchCss($line)) !== null) {
-                $css[] = $cssMatched;
-
-                continue;
-            }
-
-            if (($jsMatched = $this->matchJs($line)) !== null) {
-                $js[] = $jsMatched;
-
-                continue;
-            }
-
-            if (($extendsMatched = $this->matchExtends($line)) !== null) {
-                if ($extends !== null) {
-                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - There is already an \'@extends\' declared.');
-                }
-
-                $extends = $extendsMatched;
-
-                continue;
-            }
-
-            if (($sectionMatched = $this->matchSection($line)) !== null) {
-                if ($extends === null) {
-                    throw new \Exception('Error in file ' . $this->file . ' in line ' . $lineNumber . ' - \'@section\' has no meaning if view extends nothing.');
-                }
-                if ($sectionOpen !== null) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - A \'@section\' is already open (no \'@endsection\' found).');
-                }
-
-                $sectionOpen = $sectionMatched;
-                $sections[$sectionOpen] = '';
-
-                continue;
-            }
-
-            if ($this->matchEndSection($line)) {
-                if ($sectionOpen === null) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end section until no \'@section\' is open.');
-                }
-
-                $sectionOpen = null;
-            }
-
-            if ($this->matchExtra($line)) {
-                if ($extraOpen) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - An \'@extra\' is already open (no \'@endextra\' found).');
-                }
-
-                $extraOpen = true;
-
-                continue;
-            }
-
-            if ($this->matchEndExtra($line)) {
-                if (!$extraOpen) {
-                    throw new \Exception('Parse error in file ' . $this->file . ' in line ' . $lineNumber . ' - Cannot end extra until no \'@extra\' is open.');
-                }
-
-                $extraOpen = false;
-            }
-
-            if ($sectionOpen !== null) {
-                $sections[$sectionOpen] .= $line;
-            }
-
-            if ($extraOpen) {
-                $offset = $extends === null ? 0 : 1;
-                $extra[$offset] .= $line;
-            }
-        }
-
-        fclose($fileHandle);
-
-        return new ParsedFragment($extends, $css, $js, $sections, $extra);
-    }
-
-    private function matchCss(string $line): ?string
-    {
-        if (preg_match('/^\s*@css\((.*)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchJs(string $line): ?string
-    {
-        if (preg_match('/^\s*@js\((.*)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchExtends(string $line): ?string
-    {
-        if (preg_match('/^\s*@extends\(([\w\/]+)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchSection(string $line): ?string
-    {
-        if (preg_match('/^\s*@section\((\w+)\)\s*$/', $line, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return null;
-    }
-
-    private function matchEndSection(string $line): bool
-    {
-        return preg_match('/^\s*@endsection(?:\(\))?\s*$/', $line) === 1;
-    }
-
-    private function matchExtra(string $line): bool
-    {
-        return preg_match('/^\s*@extra(?:\(\))?\s*$/', $line) === 1;
-    }
-
-    private function matchEndExtra(string $line): bool
-    {
-        return preg_match('/^\s*@endextra(?:\(\))?\s*$/', $line) === 1;
-    }
-}

tests/OAuth/GoogleOAuthTest.php

@@ -1,86 +0,0 @@
-<?php
-
-namespace MapGuesser\Tests\OAuth;
-
-use MapGuesser\Interfaces\Http\IRequest;
-use MapGuesser\Interfaces\Http\IResponse;
-use MapGuesser\OAuth\GoogleOAuth;
-use PHPUnit\Framework\TestCase;
-
-final class GoogleOAuthTest extends TestCase
-{
-    public function testCanCreateDialogUrl(): void
-    {
-        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'xyz';
-        $state = 'random_state_string';
-        $nonce = 'random_nonce_string';
-        $redirectUrl = 'http://example.com/oauth';
-
-        $requestMock = $this->getMockBuilder(IRequest::class)
-            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
-            ->getMock();
-        $googleOAuth = new GoogleOAuth($requestMock);
-
-        $dialogUrl = $googleOAuth->getDialogUrl($state, $redirectUrl, $nonce);
-        $dialogUrlParsed = explode('?', $dialogUrl);
-
-        $this->assertEquals('https://accounts.google.com/o/oauth2/v2/auth', $dialogUrlParsed[0]);
-
-        parse_str($dialogUrlParsed[1], $dialogUrlQueryParams);
-
-        $expectedQueryParams = [
-            'response_type' => 'code',
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'scope' => 'openid email',
-            'redirect_uri' => $redirectUrl,
-            'state' => $state,
-            'nonce' => $nonce,
-        ];
-
-        $this->assertEquals($expectedQueryParams, $dialogUrlQueryParams);
-    }
-
-    public function testCanRequestToken(): void
-    {
-        $_ENV['GOOGLE_OAUTH_CLIENT_ID'] = 'abc';
-        $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'] = 'xxx';
-        $code = 'code_from_google';
-        $redirectUrl = 'http://example.com/oauth';
-
-        $requestMock = $this->getMockBuilder(IRequest::class)
-            ->setMethods(['setUrl', 'setMethod', 'setQuery', 'setHeaders', 'send'])
-            ->getMock();
-        $responseMock = $this->getMockBuilder(IResponse::class)
-            ->setMethods(['getBody', 'getHeaders'])
-            ->getMock();
-        $googleOAuth = new GoogleOAuth($requestMock);
-
-        $expectedQueryParams = [
-            'code' => $code,
-            'client_id' => $_ENV['GOOGLE_OAUTH_CLIENT_ID'],
-            'client_secret' => $_ENV['GOOGLE_OAUTH_CLIENT_SECRET'],
-            'redirect_uri' => $redirectUrl,
-            'grant_type' => 'authorization_code',
-        ];
-
-        $requestMock->expects($this->once())
-            ->method('setUrl')
-            ->with($this->equalTo('https://oauth2.googleapis.com/token'));
-        $requestMock->expects($this->once())
-            ->method('setMethod')
-            ->with($this->equalTo(IRequest::HTTP_POST));
-        $requestMock->expects($this->once())
-            ->method('setQuery')
-            ->with($this->equalTo($expectedQueryParams));
-        $requestMock->expects($this->once())
-            ->method('send')
-            ->will($this->returnValue($responseMock));
-        $responseMock->expects($this->once())
-            ->method('getBody')
-            ->will($this->returnValue('{"test":"json"}'));
-
-        $token = $googleOAuth->getToken($code, $redirectUrl);
-
-        $this->assertEquals(['test' => 'json'], $token);
-    }
-}

tests/PersistentData/Model/ModelTest.php

@@ -1,93 +0,0 @@
-<?php namespace MapGuesser\Tests\Util;
-
-use MapGuesser\PersistentData\Model\Model;
-use PHPUnit\Framework\TestCase;
-
-class OtherModel
-{
-}
-
-class DummyModel extends Model
-{
-    protected static string $table = 'test_table';
-
-    protected static array $fields = ['name', 'valid'];
-
-    protected static array $relations = ['other_model' => OtherModel::class];
-
-    private string $name;
-
-    private bool $valid;
-
-    public function setName(string $name): void
-    {
-        $this->name = $name;
-    }
-
-    public function setValid(bool $valid): void
-    {
-        $this->valid = $valid;
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    public function getValid(): bool
-    {
-        return $this->valid;
-    }
-}
-
-final class ModelTest extends TestCase
-{
-    public function testCanReturnTable(): void
-    {
-        $this->assertEquals('test_table', DummyModel::getTable());
-    }
-
-    public function testCanReturnFields(): void
-    {
-        $this->assertEquals(['id', 'name', 'valid'], DummyModel::getFields());
-    }
-
-    public function testCanReturnRelations(): void
-    {
-        $this->assertEquals(['other_model' => OtherModel::class], DummyModel::getRelations());
-    }
-
-    public function testCanBeConvertedToArray(): void
-    {
-        $model = new DummyModel();
-        $model->setId(123);
-        $model->setName('John');
-        $model->setValid(true);
-
-        $this->assertEquals([
-            'id' => 123,
-            'name' => 'John',
-            'valid' => true
-        ], $model->toArray());
-    }
-
-    public function testCanSaveAndResetSnapshot(): void
-    {
-        $model = new DummyModel();
-        $model->setId(123);
-        $model->setName('John');
-        $model->setValid(true);
-
-        $model->saveSnapshot();
-
-        $this->assertEquals([
-            'id' => 123,
-            'name' => 'John',
-            'valid' => true
-        ], $model->getSnapshot());
-
-        $model->resetSnapshot();
-
-        $this->assertEquals([], $model->getSnapshot());
-    }
-}

tests/Util/JwtParserTest.php

@@ -1,51 +0,0 @@
-<?php namespace MapGuesser\Tests\Util;
-
-use MapGuesser\Util\JwtParser;
-use PHPUnit\Framework\TestCase;
-
-final class JwtParserTest extends TestCase
-{
-    private JwtParser $jwtParser;
-
-    protected function setUp(): void
-    {
-        $this->jwtParser = new JwtParser(
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
-        );
-    }
-
-    public function testSettingTokenIsTheSameAsCreatingWithToken(): void
-    {
-        $jwtParser2 = new JwtParser();
-        $jwtParser2->setToken(
-            'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c'
-        );
-
-        $this->assertEquals($this->jwtParser, $jwtParser2);
-    }
-
-    public function testCanParseTokenHeader(): void
-    {
-        $this->assertEquals([
-            'alg' => 'HS256',
-            'typ' => 'JWT'
-        ], $this->jwtParser->getHeader());
-    }
-
-    public function testCanParseTokenPayload(): void
-    {
-        $this->assertEquals([
-            'sub' => '1234567890',
-            'name' => 'John Doe',
-            'iat' => 1516239022
-        ], $this->jwtParser->getPayload());
-    }
-
-    public function testCanParseTokenSignature(): void
-    {
-        $this->assertEquals(
-            '49f94ac7044948c78a285d904f87f0a4c7897f7e8f3a4eb2255fda750b2cc397',
-            bin2hex($this->jwtParser->getSignature())
-        );
-    }
-}

tests/View/ParserTest.php

@@ -1,144 +0,0 @@
-<?php namespace MapGuesser\Tests\View\Parser;
-
-use MapGuesser\View\ParsedFragment;
-use MapGuesser\View\Parser;
-use PHPUnit\Framework\TestCase;
-
-final class ParserTest extends TestCase
-{
-    const TEST_VIEWS_PATH = __DIR__ . '/../../views/tests';
-
-    public function testCanParseViewWithoutExtends(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_without_extends.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            null,
-            [],
-            [],
-            [],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseViewWithAssets(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_assets.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            null,
-            [
-                'test.css'
-            ],
-            [
-                'test.js',
-                'test_<?= $some[\'expression\'] ?>'
-            ],
-            [],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseViewWithExtends(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_with_extends.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            'parent',
-            [],
-            [],
-            [
-                'section1' => '<div>Test HTML with @extends</div>' . "\n"
-            ],
-            ['', '']
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testCanParseComplexView(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_complex.php');
-
-        $parser = new Parser($file);
-        $fragment = $parser->parse();
-
-        $expected = new ParsedFragment(
-            'parent',
-            [
-                'test1.css'
-            ],
-            [
-                'test1.js',
-                'test2_<?= $some[\'expression\'] ?>'
-            ],
-            [
-                'section1' => '<div>Test HTML with @extends - section 1</div>' . "\n",
-                'section2' => '<div>Test HTML with @extends - section 2</div>' . "\n"
-            ],
-            [
-                '<?php phpinfo() ?>' . "\n",
-                '<?php $a = \'test_string\' ?>' . "\n" . 'EXTRA' . "\n",
-            ]
-        );
-
-        $this->assertEquals($expected, $fragment);
-    }
-
-    public function testFailsIfMultipleExtendsGiven(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_extends.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Error in file ' . $file . ' in line 3 - There is already an \'@extends\' declared.');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfSectionWithoutExtendsGiven(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_without_extends.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Error in file ' . $file . ' in line 1 - \'@section\' has no meaning if view extends nothing.');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfOpeningSectionBeforePreviousClosed(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_multiple_sections_open.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - A \'@section\' is already open (no \'@endsection\' found).');
-
-        $parser->parse();
-    }
-
-    public function testFailsIfClosingSectionWhenNoSectionIsOpen(): void
-    {
-        $file = realpath(self::TEST_VIEWS_PATH . '/view_invalid_section_not_open.php');
-
-        $parser = new Parser($file);
-
-        $this->expectExceptionMessage('Parse error in file ' . $file . ' in line 4 - Cannot end section until no \'@section\' is open.');
-
-        $parser->parse();
-    }
-}

views/account/account.php

@@ -9,24 +9,24 @@
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to modify your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to modify your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>
             <hr>
             <?php /* TODO: disabled for the time being, email modification should be implemented */ ?>
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $user['email'] ?>" disabled>
-            <input class="big fullWidth marginTop" type="password" name="password_new" placeholder="New password" minlength="6">
-            <input class="big fullWidth marginTop" type="password" name="password_new_confirm" placeholder="New password confirmation" minlength="6">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $user['email'] ?>" disabled>
+            <input type="password" class="text big fullWidth marginTop" name="password_new" placeholder="New password" autocomplete="new-password" minlength="6">
+            <input type="password" class="text big fullWidth marginTop" name="password_new_confirm" placeholder="New password confirmation" autocomplete="new-password" minlength="6">
             <p id="accountFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit" name="submit" disabled>Save</button>

views/account/delete.php

@@ -7,19 +7,20 @@
     <div class="box">
         <form id="deleteAccountForm" action="/account/delete" method="post" data-redirect-on-success="/">
             <p class="justify marginBottom">Are you sure you want to delete your account? This cannot be undone!</p>
+            <input type="email" style="display: none;" name="email" autocomplete="username" value="<?= $user['email'] ?>">
             <?php if ($user['password'] !== null && $user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password or with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="password" name="password" placeholder="Current password" required minlength="6" autofocus><!--
+                    <input type="password" class="text" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php elseif ($user['password'] !== null): ?>
                 <p class="justify small">Please confirm your identity with your password to delete your account.</p>
-                <input class="big fullWidth" type="password" name="password" placeholder="Current password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth" name="password" placeholder="Current password" autocomplete="current-password" required minlength="6" autofocus>
             <?php elseif ($user['google_sub'] !== null): ?>
                 <p class="justify small">Please confirm your identity with Google to delete your account.</p>
                 <div class="inputWithButton">
-                    <input type="text" name="password" placeholder="Authenticate with Google..." disabled><!--
+                    <input type="text" class="text" name="password" placeholder="Authenticate with Google..." disabled><!--
                  --><button id="authenticateWithGoogleButton" class="yellow" type="button">Google</button>
                 </div>
             <?php endif; ?>

views/admin/map_editor.php

@@ -19,7 +19,7 @@
                 </button>
            </span><!--
         --><span class="inline hideOnMobile">
-               <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
+               <input type="text" class="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
                <button id="jumpButton" disabled >Jump</button>
            </span><!--
         --><span><!--
@@ -52,8 +52,8 @@
 <div id="metadata" class="modal">
     <h2>Edit map data</h2>
     <form id="metadataForm" class="marginTop" data-no-submit="true">
-        <input class="fullWidth" type="text" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
-        <textarea  class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
+        <input type="text" class="text fullWidth" name="name" value="<?= $mapName ?>" placeholder="Name of the map">
+        <textarea class="fullWidth marginTop" name="description" rows="4" placeholder="Description of the map"><?= $mapDescription ?></textarea>
         <div class="marginTop">
             <input type="checkbox" id="unlisted" name="unlisted" <?= $mapUnlisted ? 'checked' : '' ?>><label for="unlisted">Unlisted</label>
         </div>

views/error/500.php

@@ -0,0 +1,11 @@
+@extends(templates/layout_normal)
+
+@section(main)
+    <h2>500 | Internal server error</h2>
+    <p>An error occured during processing your request. <a href="<?= Container::$routeCollection->getRoute('index')->generateLink() ?>" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
+    <?php if (isset($exceptionToPrint)): ?>
+            <pre class="marginTop">
+<?= $exceptionToPrint ?>
+            </pre>
+    <?php endif; ?>
+@endsection

views/login/google_signup.php

@@ -5,13 +5,13 @@
 @section(main)
     <h2>Sign up</h2>
     <div class="box">
-        <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="/">
+        <form id="googleSignupForm" action="/signup/google" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
             <?php if ($found): ?>
                 <p class="justify">Please confirm that you link your account to your Google account.</p>
             <?php else: ?>
                 <p class="justify">Please confirm your sign up request. Your account will be linked to your Google account.</p>
             <?php endif; ?>
-            <input class="big fullWidth marginTop" type="email" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
+            <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
             <div class="right">
                 <button class="marginTop marginRight" type="submit">
                     <?php if ($found): ?>

views/login/login.php

@@ -3,9 +3,9 @@
 @section(main)
     <h2>Login</h2>
     <div class="box">
-        <form id="loginForm" action="/login" method="post" data-redirect-on-success="/">
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" required autofocus>
-            <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6">
+        <form id="loginForm" action="/login" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" required autofocus>
+            <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password autocomplete="current-password"" required minlength="6">
             <p id="loginFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Login</button>

views/login/password_reset_request.php

@@ -1,10 +1,17 @@
+@js(https://www.google.com/recaptcha/api.js)
+
 @extends(templates/layout_normal)
 
 @section(main)
     <h2>Request password reset</h2>
     <div class="box">
         <form id="passwordResetForm" action="/password/requestReset" method="post" data-redirect-on-success="/password/requestReset/success">
-            <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= isset($email) ? $email : '' ?>" required autofocus>
+            <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= isset($email) ? $email : '' ?>" required autofocus>
+            <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
+                <div class="marginTop">
+                    <div class="g-recaptcha" data-sitekey="<?= $_ENV['RECAPTCHA_SITEKEY'] ?>"></div>
+                </div>
+            <?php endif; ?>
             <p id="passwordResetFormError" class="formError justify marginTop"></p>
             <div class="right marginTop">
                 <button type="submit">Continue</button>

views/login/reset_password.php

@@ -4,10 +4,10 @@
     <h2>Reset password</h2>
     <div class="box">
         <?php if ($success) : ?>
-            <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="/">
-                <input class="big fullWidth" type="email" name="email" placeholder="Email address" value="<?= $email ?>" disabled>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6" autofocus>
-                <input class="big fullWidth marginTop" type="password" name="password_confirm" placeholder="Password confirmation" required minlength="6">
+            <form id="resetPasswordForm" action="/password/reset/<?= $token ?>" method="post" data-redirect-on-success="<?= $redirectUrl ?>">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" value="<?= $email ?>" disabled>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="new-password" required minlength="6" autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" autocomplete="new-password" required minlength="6">
                 <p id="resetPasswordFormError" class="formError justify marginTop"></p>
                 <div class="right">
                     <button class="marginTop" type="submit">Reset password</button>

views/login/signup.php

@@ -1,3 +1,4 @@
+@js(https://www.google.com/recaptcha/api.js)
 @js(js/login/signup.js)
 
 @extends(templates/layout_normal)
@@ -8,12 +9,17 @@
         <form id="signupForm" action="/signup" method="post" data-redirect-on-success="/signup/success">
             <?php if (isset($email)): ?>
                 <p class="justify">No user found with the given email address. Sign up with one click!</p>
-                <input class="big fullWidth marginTop" type="email" name="email" placeholder="Email address" value="<?= $email ?>" required>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password confirmation" required minlength="6" autofocus>
+                <input type="email" class="text big fullWidth marginTop" name="email" placeholder="Email address" autocomplete="username" value="<?= $email ?>" required>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password confirmation" autocomplete="new-password" required minlength="6" autofocus>
             <?php else: ?>
-                <input class="big fullWidth" type="email" name="email" placeholder="Email address" required autofocus>
-                <input class="big fullWidth marginTop" type="password" name="password" placeholder="Password" required minlength="6">
-                <input class="big fullWidth marginTop" type="password" name="password_confirm" placeholder="Password confirmation" minlength="6">
+                <input type="email" class="text big fullWidth" name="email" placeholder="Email address" autocomplete="username" required autofocus>
+                <input type="password" class="text big fullWidth marginTop" name="password" placeholder="Password" autocomplete="new-password" required minlength="6">
+                <input type="password" class="text big fullWidth marginTop" name="password_confirm" placeholder="Password confirmation" autocomplete="new-password" minlength="6">
+            <?php endif; ?>
+            <?php if (!empty($_ENV['RECAPTCHA_SITEKEY'])): ?>
+                <div class="marginTop">
+                    <div class="g-recaptcha" data-sitekey="<?= $_ENV['RECAPTCHA_SITEKEY'] ?>"></div>
+                </div>
             <?php endif; ?>
             <p id="signupFormError" class="formError justify marginTop"></p>
             <div class="right">

views/maps.php

@@ -25,7 +25,7 @@ TODO: condition!
         <a id="createNewRoomButton" class="button fullWidth green" href="" title="Create new room">Create new room</a>
         <p class="bold center marginTop marginBottom">OR</p>
         <div class="inputWithButton">
-            <input type="text" name="roomId" placeholder="Room to connect" required minlength="6" maxlength="6"><!--
+            <input type="text" class="text" name="roomId" placeholder="Room to connect" required minlength="6" maxlength="6"><!--
          --><button id="authenticateWithGoogleButton" type="submit">Connect</button>
         </div>
         <div class="right">
@@ -36,13 +36,6 @@ TODO: condition!
 <div id="challenge" class="modal">
     <h2>Challenge (gamma)</h2>
     <form id="challengeForm" class="marginTop" method="get">
-        <!--
-        <div class="inputWithButton">
-            <input type="text" name="challengeToken" placeholder="Challenge to enter" required minlength="6" maxlength="6">
-        </div>
-        <p class="bold center marginTop marginBottom">OR</p>
-        -->
-
         <div id="restrictions" class="marginTop marginBottom">
             <h3>Optional restrictions</h3>
             <div class="marginTop">
@@ -103,16 +96,12 @@ TODO: condition!
                     </div>
                 </div>
                 <div class="buttonContainer">
-                    <?php if (!empty($_ENV['ENABLE_GAME_FOR_GUESTS']) || Container::$request->user()): ?>
-                        <?php if ($isAdmin): ?>
-                            <button class="button fullWidth noRightRadius playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
-                            <a class="button yellow fullWidth noLeftRadius noRightRadius" href="/admin/mapEditor/<?= $map['id']; ?>" title="Edit map '<?= $map['name'] ?>'">Edit</a>
-                            <button class="button red fullWidth noLeftRadius deleteButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Delete map '<?= $map['name'] ?>'">Delete</button>
-                        <?php else: ?>
-                            <button class="button fullWidth playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
-                        <?php endif; ?>
+                    <?php if ($isAdmin): ?>
+                        <button class="button fullWidth noRightRadius playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
+                        <a class="button yellow fullWidth noLeftRadius noRightRadius" href="/admin/mapEditor/<?= $map['id']; ?>" title="Edit map '<?= $map['name'] ?>'">Edit</a>
+                        <button class="button red fullWidth noLeftRadius deleteButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Delete map '<?= $map['name'] ?>'">Delete</button>
                     <?php else: ?>
-                        <a href="/login" class="button fullWidth" title="Play map '<?= $map['name'] ?>'">Play this map</a>
+                        <button class="button fullWidth playButton" data-map-id="<?= $map['id'] ?>" data-map-name="<?= htmlspecialchars($map['name']) ?>" title="Play map '<?= $map['name'] ?>'">Play this map</button>
                     <?php endif; ?>
                 </div>
             </div>

views/tests/view_complex.php

@@ -1,22 +0,0 @@
-@css(test1.css)
-@js(test1.js)
-@js(test2_<?= $some['expression'] ?>)
-
-@extra
-<?php phpinfo() ?>
-@endextra
-
-@extends(parent)
-
-@section(section1)
-<div>Test HTML with @extends - section 1</div>
-@endsection
-
-@section(section2)
-<div>Test HTML with @extends - section 2</div>
-@endsection
-
-@extra
-<?php $a = 'test_string' ?>
-EXTRA
-@endextra

views/tests/view_invalid_multiple_extends.php

@@ -1,5 +0,0 @@
-@extends(parent1)
-
-@extends(parent2)
-
-<div>Test HTML with multiple @extends</div>