Merge pull request 'do not recreate docker runner group and user' (!84) from do-no-recreate-group-and-user into develop

Reviewed-on: #84

.env.example

@@ -1,4 +1,5 @@
 APP_NAME=MapGuesser
+APP_URL=mapguesser.dev
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser

Jenkinsfile

@@ -8,10 +8,14 @@ pipeline {
 
     stages {
         stage('Install composer') {
+            environment {
+                COMPOSER_HOME="${WORKSPACE}/.composer"
+            }
             agent {
                 dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                     dir '.'
+                    additionalBuildArgs '--target mapg_base'
                     reuseNode true
                 }
             }
@@ -23,8 +27,9 @@ pipeline {
         stage('Unit Testing') {
             agent {
                 dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                     dir '.'
+                    additionalBuildArgs '--target mapg_base'
                     reuseNode true
                 }
             }
@@ -32,7 +37,7 @@ pipeline {
                 sh 'vendor/bin/phpunit --log-junit unit_test_results.xml --testdox tests'
             }
             post {
-                success {
+                always {
                     archiveArtifacts 'unit_test_results.xml'
                 }
             }
@@ -41,8 +46,9 @@ pipeline {
         stage('Static Code Analysis') {
             agent {
                 dockerfile {
-                    filename 'docker/Dockerfile-test'
+                    filename 'docker/Dockerfile'
                     dir '.'
+                    additionalBuildArgs '--target mapg_base'
                     reuseNode true
                 }
             }
@@ -50,10 +56,51 @@ pipeline {
                 sh 'php -d memory_limit=1G vendor/bin/phpstan analyse -c phpstan.neon --error-format=prettyJson > static_code_analysis_results.json'
             }
             post {
-                success {
+                always {
                     archiveArtifacts 'static_code_analysis_results.json'
                 }
             }
         }
+
+        stage('Prepare Docker release') {
+            environment {
+                COMPOSER_HOME="${WORKSPACE}/.composer"
+                npm_config_cache="${WORKSPACE}/.npm"
+            }
+            agent {
+                dockerfile {
+                    filename 'docker/Dockerfile'
+                    dir '.'
+                    additionalBuildArgs '--target mapg_base'
+                    reuseNode true
+                }
+            }
+            steps {
+                script {
+                    sh script: 'git clean -ffdx', label: 'Clean repository'
+                    env.VERSION = sh(script: 'git describe --tags --always --match "Release_*" HEAD', returnStdout: true).trim()
+                    sh script: 'docker/scripts/release.sh', label: 'Release script'
+                    sh script: "rm -rf ${env.COMPOSER_HOME} ${env.npm_config_cache}"
+                }
+            }
+        }
+
+        stage('Release Docker image') {
+            steps {
+                script {
+                    withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) {
+                        sh script: 'docker buildx create --use --bootstrap --platform=linux/arm64,linux/amd64 --name multi-platform-builder'
+                        sh script: """docker buildx build \
+                                        --platform linux/amd64,linux/arm64 \
+                                        -f docker/Dockerfile \
+                                        --target mapg_release \
+                                        -t git.esoko.eu/esoko/mapguesser:${env.VERSION} \
+                                        --push \
+                                        .""",
+                           label: 'Build Docker image'
+                    }
+                }
+            }
+        }
     }
 }

README.md

@@ -1,58 +1,16 @@
 # MapGuesser
 
-[![Build Status](https://jenkins.e5tv.hu/job/mapguesser/job/develop/badge/icon)](https://jenkins.e5tv.hu/job/mapguesser/job/develop/)
+[![Build Status](https://ci.esoko.eu/job/mapguesser/job/develop/badge/icon)](https://ci.esoko.eu/job/mapguesser/job/develop/)
 
 This is the MapGuesser Application project. This is a game about guessing where you are based on a street view panorama - inspired by existing applications.
 
 ## Installation
 
-### Clone the Git repository
-
-The first step is obviously cloning the repository to your machine:
-
-```
-git clone https://gitea.e5tv.hu/esoko/mapguesser.git
-```
-
-All the commands listed here should be executed from the repository root.
-
-### Setup Docker stack (recommended)
-
-The easiest way to build up a fully working application with web server and database is to use Docker Compose with the included `docker-compose.yml`.
-
-All you have to do is executing the following command:
-
-```
-docker-compose up -d
-```
-
-Attach shell to the container of `mapguesser_app`:
-
-```
-docker exec -it mapguesser_app_1 bash
-```
-
-All of the following commands should be executed there.
-
-### Manual setup (alternative)
-
-If you don't use the Docker stack you need to install your environment manually. Check `docker-compose.yml` and `docker/Dockerfile` to see the system requirements.
-
-### Initialize project
-
-This command installes all of the Composer requirements and creates a copy of the example `.env` file.
-
-```
-composer create-project
-```
-
 ### Set environment variables
 
-The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment.
+The `.env` file contains several environment variables that are needed by the application to work properly. These should be configured for your environment. Check `.env.example` for reference.
 
-One very important variable is `DEV`. This indicates that the application operates in development (staging) and not in production mode.
+**Important: `DEV` should NOT be set for production! See section Development if you want to use the application in development mode.**
-
-**Hint:** If you install the application in the Docker stack for development (staging) environment, only the variables for external dependencies (API keys, map attribution, etc.) should be adapted. All other variables (for DB connection, static root, mailing, multiplayer, etc.) are fine with the default value.
 
 #### API keys
 
@@ -75,31 +33,72 @@ LEAFLET_TILESERVER_SUBDOMAINS=abc
 LEAFLET_TILESERVER_ATTRIBUTION="&copy; <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors"
 ```
 
-### (Production only) Create cron job
+### Docker Compose
 
-To maintain database (delete inactive users, old sessions etc.), the command `db:maintain` should be regularly executed. It is recommended to create a cron job that runs every hour:
+Create a `docker-compose.yml` file. The example code below assumes that `.env` is placed in the same folder.
+
+```yml
+version: '3'
+services:
+    app:
+        image: git.esoko.eu/esoko/mapguesser:latest
+        depends_on:
+            mariadb:
+                condition: service_healthy
+        ports:
+            - 80:80
+            - 8090:8090
+        volumes:
+            - .env:/var/www/mapguesser/.env
+    mariadb:
+        image: mariadb:10.3
+        volumes:
+            - mysql:/var/lib/mysql
+        environment:
+            MYSQL_ROOT_PASSWORD: 'root'
+            MYSQL_DATABASE: 'mapguesser'
+            MYSQL_USER: 'mapguesser'
+            MYSQL_PASSWORD: 'mapguesser'
+        healthcheck:
+            test: ["CMD-SHELL", "mysqladmin -u $$MYSQL_USER -p$$MYSQL_PASSWORD ping -h localhost || exit 1"]
+            start_period: 5s
+            start_interval: 1s
+            interval: 5s
+            timeout: 5s
+            retries: 5
+volumes:
+    mysql:
 
 ```
-0 * * * * /path/to/your/installation/mapg db:maintain >>/var/log/cron-mapguesser.log 2>&1
+
+Execute the following command:
+```bash
+docker compose up -d
 ```
 
-### Finalize installation
 
-After you followed the above steps, execute the following command:
+**And you are done!** The application is ready to use. You can create the first administrative user with the following command after attaching to the `app` container:
 
 ```
-scripts/install.sh
+./mapg user:add EMAIL USERNAME PASSWORD admin
 ```
 
-**Warning: Because of a known issue the image `mapguesser_multi` fails to run without the installation steps. You have to relauch `docker-compose up -d` after you finished the installation process.**
+## Development
 
-**And you are done!** The application is ready to use and develop. In development mode an administrative user is also created by the installation script, email is **mapg@mapg.dev**, password is **123456**. In production mode you should create the first administrative user with the following command:
+### Set environment variables
 
-```
+`.env.example` should be copied to `.env` into the repo root. Only the variables for external dependencies (API keys, map attribution, etc.) should be adapted in. All other variables (for DB connection, static root, mailing, multiplayer, etc.) are fine with the default value. **`DEV=1` should be set for development!**
-./mapg user:add EMAIL PASSWORD admin
+
+### Docker Compose
+
+Execute the following command from the repo root:
+```bash
+docker compose up -d
 ```
 
-If you installed it in the Docker stack, you can reach it on http://localhost. The mails that are sent by the application can be found on http://localhost:8080/. If needed, the database server can be directly reached on localhost:3306.
+**And you are done!** You can reach the application on http://localhost. The mails that are sent by the application can be found on http://localhost:8080. If needed, the database server can be directly reached on localhost:3306, or you can use Adminer web interface on http://localhost:9090
+
+You might have to attach to the `app` container, e.g. for creating users, `composer update`, etc.
 
 ---
 

composer.json

@@ -3,15 +3,18 @@
   "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",
+    "esoko/soko-web": "0.15"
-    "symfony/console": "^5.1",
-    "phpmailer/phpmailer": "^6.1",
-    "fzaninotto/faker": "^1.9"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9",
+    "phpunit/phpunit": "^10.3",
-    "phpstan/phpstan": "^0.12.32"
+    "phpstan/phpstan": "^1.10"
   },
   "autoload": {
     "psr-4": {

database/mapguesser.sql

@@ -15,6 +15,14 @@ CREATE TABLE `maps` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 
+CREATE TABLE `migrations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `migration` varchar(255) NOT NULL,
+  `type` enum('structure', 'data') NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+
 DROP TABLE IF EXISTS `places`;
 CREATE TABLE `places` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,

database/migrations/data/20200602_2306_migrations.php

@@ -1 +0,0 @@
-<?php //empty on purpose

database/migrations/data/20200612_2124_map_area.php

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

database/migrations/data/20230923_1905_username.php

@@ -0,0 +1,20 @@
+<?php
+
+use MapGuesser\PersistentData\Model\User;
+use MapGuesser\Repository\UserRepository;
+use MapGuesser\Util\UsernameGenerator;
+use SokoWeb\Database\Query\Select;
+
+$select = new Select(Container::$dbConnection);
+$users = Container::$persistentDataManager->selectMultipleFromDb($select, User::class);
+$userRepository = new UserRepository();
+$usernameGenerator = new UsernameGenerator();
+
+foreach ($users as $user) {
+    do {
+        $username = $usernameGenerator->generate();
+    } while ($userRepository->getByUsername($username));
+
+    $user->setUsername($username);
+    Container::$persistentDataManager->saveToDb($user);
+}

database/migrations/structure/20200602_2306_migrations.sql

@@ -1,6 +0,0 @@
-CREATE TABLE `migrations` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `migration` varchar(255) NOT NULL,
-  `type` enum('structure', 'data') NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

database/migrations/structure/20230923_1905_username.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `users`
+  ADD `username` VARCHAR(255) CHARACTER SET ascii COLLATE ascii_bin DEFAULT NULL AFTER `email`,
+  ADD UNIQUE `username` (`username`);

docker-compose.yml

@@ -2,22 +2,20 @@ version: '3'
 services:
     app:
         build:
-            context: ./docker
+            context: .
-            dockerfile: Dockerfile-app
+            dockerfile: docker/Dockerfile
+            target: mapg_dev
+        depends_on:
+            mariadb:
+                condition: service_healthy
         ports:
             - 80:80
-        volumes:
-            - .:/var/www/mapguesser
-    multi:
-        build:
-            context: ./docker
-            dockerfile: Dockerfile-multi
-        ports:
             - 5000:5000
             - 8090:8090
             - 9229:9229
         volumes:
             - .:/var/www/mapguesser
+        working_dir: /var/www/mapguesser
     mariadb:
         image: mariadb:10.3
         ports:
@@ -29,6 +27,19 @@ services:
             MYSQL_DATABASE: 'mapguesser'
             MYSQL_USER: 'mapguesser'
             MYSQL_PASSWORD: 'mapguesser'
+        healthcheck:
+            test: ["CMD-SHELL", "mysqladmin -u $$MYSQL_USER -p$$MYSQL_PASSWORD ping -h localhost || exit 1"]
+            start_period: 5s
+            start_interval: 1s
+            interval: 5s
+            timeout: 5s
+            retries: 5
+    adminer:
+        image: adminer:4.8.1-standalone
+        ports:
+        - 9090:8080
+        environment:
+            - ADMINER_DEFAULT_SERVER=mariadb
     mail:
         image: marcopas/docker-mailslurper:latest
         ports:

docker/Dockerfile

@@ -0,0 +1,44 @@
+FROM ubuntu:22.04 AS mapg_base
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt update --fix-missing && apt install -y sudo curl git unzip mariadb-client nginx \
+    php-apcu php8.1-cli php8.1-curl php8.1-fpm php8.1-mbstring php8.1-mysql php8.1-zip php8.1-xml
+
+RUN mkdir -p /run/php
+COPY docker/configs/nginx.conf /etc/nginx/sites-available/default
+
+COPY docker/scripts/install-composer.sh install-composer.sh
+RUN ./install-composer.sh
+
+COPY docker/scripts/install-nodejs.sh install-nodejs.sh
+RUN ./install-nodejs.sh
+RUN npm install -g uglify-js clean-css-cli svgo yarn
+
+
+FROM mapg_base AS mapg_dev
+
+RUN apt update --fix-missing && apt install -y php-xdebug
+
+RUN echo "xdebug.remote_enable = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_autostart = 1" >> /etc/php/8.1/mods-available/xdebug.ini &&\
+    echo "xdebug.remote_connect_back = 1" >> /etc/php/8.1/mods-available/xdebug.ini
+
+EXPOSE 80
+EXPOSE 5000
+EXPOSE 8090
+EXPOSE 9229
+ENTRYPOINT docker/scripts/entry-point-dev.sh
+
+
+FROM mapg_base AS mapg_release
+
+RUN apt update --fix-missing && apt install -y cron
+
+WORKDIR /var/www/mapguesser
+COPY ./ /var/www/mapguesser
+RUN rm -rf /var/www/mapguesser/.git
+
+EXPOSE 80
+EXPOSE 8090
+ENTRYPOINT docker/scripts/entry-point.sh

docker/Dockerfile-app

@@ -1,30 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install Nginx, PHP and further necessary packages
-RUN apt update --fix-missing
-RUN apt install -y curl git unzip mariadb-client nginx \
-    php-apcu php-xdebug php7.4-cli php7.4-curl php7.4-fpm php7.4-mbstring php7.4-mysql php7.4-zip php7.4-xml
-
-# Configure Nginx with PHP
-RUN mkdir -p /run/php
-COPY configs/nginx.conf /etc/nginx/sites-available/default
-RUN echo "xdebug.remote_enable = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-RUN echo "xdebug.remote_autostart = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-RUN echo "xdebug.remote_connect_back = 1" >> /etc/php/7.4/mods-available/xdebug.ini
-
-# Install Composer
-COPY scripts/install-composer.sh install-composer.sh
-RUN ./install-composer.sh
-
-# Install Node.js and required packages
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
-RUN npm install -g uglify-js clean-css-cli svgo yarn
-
-EXPOSE 80
-VOLUME /var/www/mapguesser
-WORKDIR /var/www/mapguesser
-
-ENTRYPOINT /usr/sbin/php-fpm7.4 -F & /usr/sbin/nginx -g 'daemon off;'

docker/Dockerfile-multi

@@ -1,16 +0,0 @@
-FROM ubuntu:focal
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Install necessary packages
-RUN apt update --fix-missing
-RUN apt install -y curl build-essential
-
-# Install Node.js and required packages
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
-RUN apt install -y nodejs
-
-VOLUME /var/www/mapguesser
-WORKDIR /var/www/mapguesser
-
-ENTRYPOINT /usr/bin/node --inspect=0.0.0.0:9229 multi

docker/Dockerfile-test

@@ -1,4 +0,0 @@
-FROM php:7.4.7-cli-buster
-
-RUN apt-get update && apt-get install -y unzip
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

docker/configs/nginx.conf

@@ -1,11 +1,15 @@
+map $http_x_forwarded_proto $forwarded_scheme {
+        default $scheme;
+        http http;
+        https https;
+}
+
 server {
         listen 80 default_server;
         listen [::]:80 default_server;
 
         root /var/www/mapguesser/public;
-
         index index.php index.html index.htm index.nginx-debian.html;
-
         server_name mapguesser-dev.ch;
 
         location / {
@@ -14,7 +18,8 @@ server {
 
         location ~ \.php$ {
                 include snippets/fastcgi-php.conf;
-                fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
+                fastcgi_pass unix:/var/run/php/php8.1-fpm.sock;
+                fastcgi_param REQUEST_SCHEME $forwarded_scheme;
         }
 
         location ~ /\.ht {

docker/scripts/cron

@@ -0,0 +1 @@
+0 * * * * /var/www/mapguesser/mapg db:maintain

docker/scripts/entry-point-dev.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+set -e
+
+echo "Installing Composer packages..."
+if [ -f .env ]; then
+    composer install
+else
+    composer create-project
+fi
+
+echo "Installing NPM packages..."
+(cd multi && npm install)
+
+echo "Installing Yarn packages..."
+(cd public/static && yarn install)
+
+echo "Migrating DB..."
+./mapg db:migrate
+
+echo "Set runner user based on owner of .env..."
+if ! getent group mapg; then
+    USER_GID=$(stat -c "%g" .env)
+    groupadd --gid $USER_GID mapg
+fi
+if ! id -u mapg; then
+    USER_UID=$(stat -c "%u" .env)
+    useradd --uid $USER_UID --gid $USER_GID mapg
+fi
+sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf
+
+set +e
+
+/usr/sbin/php-fpm8.1 -F &
+/usr/sbin/nginx -g 'daemon off;' &
+sudo -u mapg -g mapg /usr/bin/node --inspect=0.0.0.0:9229 multi &
+
+wait -n
+
+exit $?

docker/scripts/entry-point.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -e
+
+echo "Migrating DB..."
+./mapg db:migrate
+
+echo "Installing crontab..."
+/usr/bin/crontab docker/scripts/cron
+
+echo "Set runner user based on owner of .env..."
+if ! getent group mapg; then
+    USER_GID=$(stat -c "%g" .env)
+    groupadd --gid $USER_GID mapg
+fi
+if ! id -u mapg; then
+    USER_UID=$(stat -c "%u" .env)
+    useradd --uid $USER_UID --gid $USER_GID mapg
+fi
+chown mapg:mapg cache
+sed -i -e "s/^user = .*$/user = mapg/g" -e "s/^group = .*$/group = mapg/g" /etc/php/8.1/fpm/pool.d/www.conf
+
+set +e
+
+/usr/sbin/cron -f &
+/usr/sbin/php-fpm8.1 -F &
+/usr/sbin/nginx -g 'daemon off;' &
+sudo -u mapg -g mapg /usr/bin/node multi &
+
+wait -n
+
+exit $?

docker/scripts/install-nodejs.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+apt update
+apt install -y ca-certificates curl gnupg
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+
+NODE_MAJOR=18
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+
+apt update
+apt install -y nodejs

docker/scripts/release.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+echo "Installing Composer packages..."
+composer create-project --no-dev
+
+echo "Installing NPM packages..."
+(cd multi && npm install)
+
+echo "Installing Yarn packages..."
+(cd public/static && yarn install)
+
+echo "Updating version info..."
+VERSION=$(git describe --tags --always --match "Release_*" HEAD)
+REVISION=$(git rev-parse --short HEAD)
+REVISION_DATE=$(git show -s --format=%aI HEAD)
+sed -i -E "s/const VERSION = '(.*)';/const VERSION = '${VERSION}';/" main.php
+sed -i -E "s/const REVISION = '(.*)';/const REVISION = '${REVISION}';/" main.php
+sed -i -E "s/const REVISION_DATE = '(.*)';/const REVISION_DATE = '${REVISION_DATE}';/" main.php
+
+echo "Minifying JS, CSS and SVG files..."
+find public/static/js -type f -iname '*.js' -exec uglifyjs {} -c -m -o {} \;
+find public/static/css -type f -iname '*.css' -exec cleancss {} -o {} \;
+find public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;
+
+echo "Linking view files..."
+./mapg view:link
+
+rm .env

main.php

@@ -14,10 +14,12 @@ $dotenv->load();
 
 class Container
 {
-    static MapGuesser\Interfaces\Database\IConnection $dbConnection;
+    static SokoWeb\Interfaces\Database\IConnection $dbConnection;
-    static MapGuesser\Routing\RouteCollection $routeCollection;
+    static SokoWeb\Interfaces\PersistentData\IPersistentDataManager $persistentDataManager;
-    static MapGuesser\Interfaces\Session\ISessionHandler $sessionHandler;
+    static SokoWeb\Interfaces\Routing\IRouteCollection $routeCollection;
-    static MapGuesser\Interfaces\Request\IRequest $request;
+    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();

multi/package-lock.json

@@ -1,17 +1,43 @@
 {
     "name": "mapguesser-multi",
+    "lockfileVersion": 3,
     "requires": true,
-    "lockfileVersion": 1,
+    "packages": {
+        "": {
+            "name": "mapguesser-multi",
+            "license": "GNU AGPL 3.0",
             "dependencies": {
-        "dotenv": {
+                "dotenv": "^8.2.0",
+                "ws": "^7.4.4"
+            }
+        },
+        "node_modules/dotenv": {
             "version": "8.2.0",
             "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
+            "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+            "engines": {
+                "node": ">=8"
+            }
         },
-        "ws": {
+        "node_modules/ws": {
             "version": "7.4.4",
             "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz",
-            "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="
+            "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==",
+            "engines": {
+                "node": ">=8.3.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": "^5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
         }
     }
 }

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

@@ -376,7 +376,7 @@ header>p>span {
     padding-left: 6px;
 }
 
-header>p>span>a:link, header>p>span>a:visited {
+header>p>span>a:link, header>p>span>a:visited, footer>p>a:link, footer>p>a:visited {
     color: inherit;
 }
 

public/static/js/game.js

@@ -231,17 +231,6 @@ const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
 
         prepare: function () {
             var data = new FormData();
-            var userNames;
-
-            if (roomId) {
-                var userNames = localStorage.userNames ? JSON.parse(localStorage.userNames) : {};
-                if (!userNames.hasOwnProperty(roomId)) {
-                    userNames[roomId] = prompt('Your name: ');
-                    localStorage.userNames = JSON.stringify(userNames);
-                }
-
-                data.append('userName', userNames[roomId]);
-            }
 
             document.getElementById('loading').style.visibility = 'visible';
             var url = Game.getGameIdentifier() + '/prepare.json';
@@ -618,7 +607,7 @@ const GameType = Object.freeze({ 'SINGLE': 0, 'MULTI': 1, 'CHALLENGE': 2 });
                     break;
 
                 case 'anonymous_user':
-                    MapGuesser.showModalWithContent('Error', 'You have to login to join a challenge!');
+                    MapGuesser.showModalWithContent('Error', 'You have to login to join this game!');
                     break;
 
                 default:

public/static/js/mapguesser.js

@@ -89,6 +89,9 @@ var MapGuesser = {
 
                     formError.style.display = 'block';
                     formError.innerHTML = this.response.error.errorText;
+                    if (typeof grecaptcha !== 'undefined') {
+                        grecaptcha.reset();
+                    }
 
                     return;
                 }
@@ -183,12 +186,23 @@ var MapGuesser = {
         document.getElementById('cover').style.visibility = 'hidden';
     },
 
-    observeInput: function (input, buttonToToggle) {
+    observeInput: function (form, observedInputs) {
-        if (input.defaultValue !== input.value) {
+        var anyChanged = false;
-            buttonToToggle.disabled = false;
+
-        } else {
+        for (var i = 0; i < observedInputs.length; i++) {
-            buttonToToggle.disabled = true;
+            var input = form.elements[observedInputs[i]];
+            if (input.type === 'checkbox') {
+                if (input.defaultChecked !== input.checked) {
+                    anyChanged = true;
                 }
+            } else {
+                if (input.defaultValue !== input.value) {
+                    anyChanged = true;
+                }
+            }
+        }
+
+        form.elements['submit_button'].disabled = !anyChanged;
     },
 
     observeInputsInForm: function (form, observedInputs) {
@@ -199,19 +213,19 @@ var MapGuesser = {
                 case 'INPUT':
                 case 'TEXTAREA':
                     input.oninput = function () {
-                        MapGuesser.observeInput(this, form.elements.submit);
+                        MapGuesser.observeInput(form, observedInputs);
                     };
                     break;
                 case 'SELECT':
                     input.onchange = function () {
-                        MapGuesser.observeInput(this, form.elements.submit);
+                        MapGuesser.observeInput(form, observedInputs);
                     };
                     break;
             }
         }
 
         form.onreset = function () {
-            form.elements.submit.disabled = true;
+            form.elements['submit_button'].disabled = true;
         }
     }
 };

public/static/js/maps.js

@@ -131,19 +131,19 @@
         }, formData);
     };
 
+    if (document.getElementById('multiButton')) {
         document.getElementById('multiButton').onclick = function () {
             MapGuesser.showModal('multi');
             document.getElementById('createNewRoomButton').href = '/multiGame/new/' + this.dataset.mapId;
             document.getElementById('multiForm').elements.roomId.select();
             document.getElementById('playMode').style.visibility = 'hidden';
         }
+    }
 
     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);
         };

scripts/deploy-to-multiple-worktrees.py

@@ -1,162 +0,0 @@
-#!/usr/bin/python3
-
-# Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH
-
-import sys
-import os
-import subprocess
-import re
-
-WORKTREE_REGEX = r"^worktree (.*)\nHEAD ([a-f0-9]*)\n(?:branch refs\/heads\/(.*)|detached)$"
-
-if len(sys.argv) < 4:
-    print("Usage: ./deploy-to-multiple-worktrees.py REPO_PATH WORKTREE_DEVELOPMENT_PATH WORKTREE_PRODUCTION_PATH")
-    exit(1)
-
-REPO = os.path.abspath(sys.argv[1])
-WORKTREE_DEVELOPMENT = os.path.abspath(sys.argv[2])
-WORKTREE_PRODUCTION = os.path.abspath(sys.argv[3])
-
-class Worktree:
-    def __init__(self, path, branch, revision, version):
-        self.path = path
-        self.branch = branch
-        self.revision = revision
-        self.version = version
-        self.newRevision = None
-        self.newVersion = None
-
-def getDataForWorktrees():
-    ret = subprocess.check_output(["git", "worktree", "list", "--porcelain"], cwd=REPO).decode().strip()
-    blocks = ret.split("\n\n")
-
-    worktrees = []
-
-    for block in blocks:
-        matches = re.search(WORKTREE_REGEX, block)
-
-        if matches:
-            path = matches.group(1)
-            revision = matches.group(2)
-            branch = matches.group(3)
-            version = getVersion(revision)
-
-            worktrees.append(Worktree(path, branch, revision, version))
-
-    return worktrees
-
-def findWorktree(path):
-    for worktree in worktrees:
-        if worktree.path == path:
-            return worktree
-
-    return None
-
-def getVersion(branch):
-    return subprocess.check_output(["git", "describe", "--tags", "--always", "--match", "Release_*", branch], cwd=REPO).decode().strip()
-
-def getRevisionForRef(ref):
-    return subprocess.check_output(["git", "rev-list", "-1", ref], cwd=REPO).decode().strip()
-
-def getLatestReleaseTag():
-    process = subprocess.Popen(["git", "for-each-ref", "refs/tags/Release*", "--sort=-creatordate", "--format=%(refname:short)"], stdout=subprocess.PIPE, cwd=REPO)
-
-    for line in process.stdout:
-        tag = line.decode().rstrip()
-
-        if isTagVerified(tag):
-            return tag
-
-        print(f"[WARNING] Tag '{tag}' is not verified, skipping.")
-
-    raise Exception("No verified 'Release*' tag found!")
-
-def isTagVerified(tag):
-    process = subprocess.run(["git", "tag", "--verify", tag], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=REPO)
-
-    return process.returncode == 0
-
-def updateRepoFromRemote():
-    subprocess.call(["git", "fetch", "origin", "--prune", "--prune-tags"], cwd=REPO)
-
-def checkoutWorktree(worktreePath, ref):
-    subprocess.call(["git", "checkout", "-f", ref], cwd=worktreePath)
-
-def cleanWorktree(worktreePath):
-    subprocess.call(["git", "clean", "-f", "-d"], cwd=worktreePath)
-
-def updateAppInWorktree(worktreePath):
-    subprocess.call([worktreePath + "/scripts/update.sh"], cwd=worktreePath)
-
-def updateAppVersionInWorktree(worktreePath):
-    subprocess.call([worktreePath + "/scripts/update-version.sh"], cwd=worktreePath)
-
-worktrees = getDataForWorktrees()
-
-updateRepoFromRemote()
-
-print("Repo is updated from origin")
-
-print("----------------------------------------------")
-print("----------------------------------------------")
-
-developmentWorktree = findWorktree(WORKTREE_DEVELOPMENT)
-
-developmentWorktree.newRevision = getRevisionForRef(developmentWorktree.branch)
-developmentWorktree.newVersion = getVersion(developmentWorktree.revision)
-
-print("DEVELOPMENT (" + developmentWorktree.path + ") is on branch " + developmentWorktree.branch)
-print(developmentWorktree.revision + " = " + developmentWorktree.branch + " (" + developmentWorktree.version + ")")
-print(developmentWorktree.newRevision + " = origin/" + developmentWorktree.branch + " (" + developmentWorktree.newVersion + ")")
-
-if developmentWorktree.revision != developmentWorktree.newRevision:
-    print("-> DEVELOPMENT (" + developmentWorktree.path + ") will be UPDATED")
-    print("----------------------------------------------")
-
-    checkoutWorktree(developmentWorktree.path, developmentWorktree.branch)
-    cleanWorktree(developmentWorktree.path)
-
-    print(developmentWorktree.path + " is checked out to " + developmentWorktree.branch + " and cleaned")
-
-    updateAppInWorktree(developmentWorktree.path)
-    updateAppVersionInWorktree(developmentWorktree.path)
-
-    print("MapGuesser is updated in " + developmentWorktree.path)
-elif developmentWorktree.version != developmentWorktree.newVersion:
-    print("-> DEVELOPMENT " + developmentWorktree.path + "'s version info will be UPDATED")
-
-    updateAppVersionInWorktree(developmentWorktree.path)
-
-    print("MapGuesser version is updated in " + developmentWorktree.path)
-else:
-    print("-> DEVELOPMENT (" + developmentWorktree.path + ") WON'T be updated")
-
-print("----------------------------------------------")
-print("----------------------------------------------")
-
-productionWorktree = findWorktree(WORKTREE_PRODUCTION)
-
-productionWorktree.newVersion = getLatestReleaseTag()
-productionWorktree.newRevision = getRevisionForRef(productionWorktree.newVersion)
-
-print("PRODUCTION (" + productionWorktree.path + ")")
-print(productionWorktree.revision + " = " + productionWorktree.version)
-print(productionWorktree.newRevision + " = " + productionWorktree.newVersion)
-
-if productionWorktree.revision != productionWorktree.newRevision:
-    print("-> PRODUCTION (" + productionWorktree.path + ") will be UPDATED")
-
-    checkoutWorktree(productionWorktree.path, productionWorktree.newRevision)
-    cleanWorktree(productionWorktree.path)
-
-    print(productionWorktree.path + " is checked out to " + productionWorktree.newRevision + " and cleaned")
-
-    updateAppInWorktree(productionWorktree.path)
-    updateAppVersionInWorktree(productionWorktree.path)
-
-    print("MapGuesser is updated in " + productionWorktree.path)
-else:
-    print("-> PRODUCTION (" + productionWorktree.path + ") WON'T be updated")
-
-print("----------------------------------------------")
-print("----------------------------------------------")

scripts/install.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-if [ -f ${ROOT_DIR}/installed ]; then
-    echo "MapGuesser is already installed! To force reinstall, delete file 'installed' from the root directory!"
-    exit 1
-fi
-
-echo "Installing NPM packages..."
-(cd ${ROOT_DIR}/multi && npm install)
-
-echo "Installing Yarn packages..."
-(cd ${ROOT_DIR}/public/static && yarn install)
-
-echo "Installing MapGuesser DB..."
-mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/database/mapguesser.sql
-
-echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./mapg db:migrate)
-
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    echo "Minifying JS, CSS and SVG files..."
-    ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./mapg view:link)
-else
-    echo "Creating the first user..."
-    (cd ${ROOT_DIR} && ./mapg user:add mapg@mapg.dev 123456 admin)
-fi
-
-touch ${ROOT_DIR}/installed

scripts/minify.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-find ${ROOT_DIR}/public/static/js -type f -iname '*.js' -exec uglifyjs {} -c -m -o {} \;
-
-find ${ROOT_DIR}/public/static/css -type f -iname '*.css' -exec cleancss {} -o {} \;
-
-find ${ROOT_DIR}/public/static/img -type f -iname '*.svg' -exec svgo {} -o {} \;

scripts/update-version.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-cd ${ROOT_DIR}
-
-echo "Updating version info..."
-
-VERSION=$(git describe --tags --always --match "Release_*" HEAD)
-REVISION=$(git rev-parse --short HEAD)
-REVISION_DATE=$(git show -s --format=%aI HEAD)
-
-sed -i -E "s/const VERSION = '(.*)';/const VERSION = '${VERSION}';/" main.php
-sed -i -E "s/const REVISION = '(.*)';/const REVISION = '${REVISION}';/" main.php
-sed -i -E "s/const REVISION_DATE = '(.*)';/const REVISION_DATE = '${REVISION_DATE}';/" main.php

scripts/update.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-ROOT_DIR=$(dirname $(readlink -f "$0"))/..
-
-. ${ROOT_DIR}/.env
-
-echo "Installing Composer packages..."
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    (cd ${ROOT_DIR} && composer install --no-dev)
-else
-    (cd ${ROOT_DIR} && composer install --dev)
-fi
-
-echo "Installing NPM packages..."
-(cd ${ROOT_DIR}/multi && npm install)
-
-echo "Installing Yarn packages..."
-(cd ${ROOT_DIR}/public/static && yarn install)
-
-echo "Migrating DB..."
-(cd ${ROOT_DIR} && ./mapg db:migrate)
-
-if [ -z "${DEV}" ] || [ "${DEV}" -eq "0" ]; then
-    echo "Minifying JS, CSS and SVG files..."
-    ${ROOT_DIR}/scripts/minify.sh
-
-    echo "Linking view files..."
-    (cd ${ROOT_DIR} && ./mapg view:link)
-fi

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;
@@ -15,6 +14,7 @@ class AddUserCommand extends Command
         $this->setName('user:add')
             ->setDescription('Adding of user.')
             ->addArgument('email', InputArgument::REQUIRED, 'Email of user')
+            ->addArgument('username', InputArgument::REQUIRED, 'Username of user')
             ->addArgument('password', InputArgument::REQUIRED, 'Password of user')
             ->addArgument('type', InputArgument::OPTIONAL, 'Type of user');;
     }
@@ -23,6 +23,7 @@ class AddUserCommand extends Command
     {
         $user = new User();
         $user->setEmail($input->getArgument('email'));
+        $user->setUsername($input->getArgument('username'));
         $user->setPlainPassword($input->getArgument('password'));
         $user->setActive(true);
         $user->setCreatedDate(new DateTime());
@@ -32,8 +33,7 @@ class AddUserCommand extends Command
         }
 
         try {
-            $pdm = new PersistentDataManager();
+            \Container::$persistentDataManager->saveToDb($user);
-            $pdm->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 SokoWeb\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\Database\IResultSet;
-use MapGuesser\PersistentData\PersistentDataManager;
 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 SokoWeb\Database\Query\Modify;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\Database\IResultSet;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -19,6 +19,8 @@ class MigrateDatabaseCommand extends Command
     {
         $db = \Container::$dbConnection;
 
+        $this->createBaseDb();
+
         $db->startTransaction();
 
         $success = [];
@@ -62,10 +64,8 @@ class MigrateDatabaseCommand extends Command
         return 0;
     }
 
-    private function readDir(string $type): array
+    private function createBaseDb()
     {
-        $done = [];
-
         $migrationTableExists = \Container::$dbConnection->query('SELECT count(*)
             FROM information_schema.tables
             WHERE table_schema = \'' . $_ENV['DB_NAME'] . '\'
@@ -73,6 +73,16 @@ class MigrateDatabaseCommand extends Command
             ->fetch(IResultSet::FETCH_NUM)[0];
 
         if ($migrationTableExists != 0) {
+            return;
+        }
+
+        \Container::$dbConnection->multiQuery(file_get_contents(ROOT . '/database/mapguesser.sql'));
+    }
+
+    private function readDir(string $type): array
+    {
+        $done = [];
+
         $select = new Select(\Container::$dbConnection, 'migrations');
         $select->columns(['migration']);
         $select->where('type', '=', $type);
@@ -83,7 +93,6 @@ class MigrateDatabaseCommand extends Command
         while ($migration = $result->fetch(IResultSet::FETCH_ASSOC)) {
             $done[] = $migration['migration'];
         }
-        }
 
         $path = ROOT . '/database/migrations/' . $type;
         $dir = opendir($path);

src/Controller/GameController.php

@@ -1,34 +1,28 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use Faker\Factory;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Response\HtmlContent;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Interfaces\Response\IContent;
-use MapGuesser\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\PersistentData\Model\User;
 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]);
     }
@@ -121,27 +113,27 @@ class GameController implements ISecured
         $challenge->setToken($challengeToken);
         $challenge->setCreatedDate(new DateTime());
 
-        if ($this->request->post('timerEnabled') !== null && $this->request->post('timeLimit') !== null) {
+        if (\Container::$request->post('timerEnabled') !== null && \Container::$request->post('timeLimit') !== null) {
-            $challenge->setTimeLimit($this->request->post('timeLimit'));
+            $challenge->setTimeLimit(\Container::$request->post('timeLimit'));
         }
-        if ($this->request->post('timeLimitType') !== null) {
+        if (\Container::$request->post('timeLimitType') !== null) {
-            $challenge->setTimeLimitType($this->request->post('timeLimitType'));
+            $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,13 +190,17 @@ class GameController implements ISecured
 
     public function prepareMultiGame(): IContent
     {
-        $roomId = $this->request->query('roomId');
+        /**
-        $userName = $this->request->post('userName');
+         * @var User|null $user
-        if (empty($userName)) {
+         */
-            $faker = Factory::create();
+        $user = \Container::$request->user();
-            $userName = $faker->userName;
+        if ($user === null)
+        {
+            return new JsonContent(['error' => 'anonymous_user']);
         }
 
+        $roomId = \Container::$request->query('roomId');
+
         $room = $this->multiRoomRepository->getByRoomId($roomId);
 
         if (!isset($room)) {
@@ -228,12 +224,12 @@ 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,
             'token' => $token,
-            'userName' => $userName
+            'userName' => $user->getDisplayName()
         ]);
 
         return new JsonContent([
@@ -248,8 +244,8 @@ class GameController implements ISecured
 
     public function prepareChallenge(): IContent
     {
-        $challengeToken_str = $this->request->query('challengeToken');
+        $challengeToken_str = \Container::$request->query('challengeToken');
-        $session = $this->request->session();
+        $session = \Container::$request->session();
         $userId = $session->get('userId');
 
         if (!isset($userId))
@@ -270,7 +266,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 +280,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 SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use MapGuesser\Interfaces\Request\IRequest;
 use MapGuesser\Util\Geo\Position;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
+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');
+        $mapId = (int) \Container::$request->query('mapId');
-        $session = $this->request->session();
+        $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');
+        $roomId = \Container::$request->query('roomId');
-        $session = $this->request->session();
+        $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 = [];
@@ -158,7 +138,7 @@ class GameFlowController implements ISecured
         // 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];
+            $withRelations = ['user', 'place_in_challange', 'place'];
             foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) {
                 $round = $guess->getPlaceInChallenge()->getRound();
 
@@ -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');
+        $challengeToken_str = \Container::$request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
 
         if (!isset($userInChallenge)) {
             return new JsonContent(['error' => 'game_not_found']);
@@ -257,15 +237,15 @@ class GameFlowController implements ISecured
 
     public function guess(): IContent
     {
-        $mapId = (int) $this->request->query('mapId');
+        $mapId = (int) \Container::$request->query('mapId');
-        $session = $this->request->session();
+        $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');
+        $roomId = \Container::$request->query('roomId');
-        $session = $this->request->session();
+        $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');
+        $challengeToken_str = \Container::$request->query('challengeToken');
-        $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]);
+        $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')) {
+        if (\Container::$request->post('lat') && \Container::$request->post('lng')) {
-            $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($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');
+        $roomId = \Container::$request->query('roomId');
-        $session = $this->request->session();
+        $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 SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\Redirect;
-use MapGuesser\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,32 +2,27 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
+use SokoWeb\Http\Request;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Mailing\Mail;
-use MapGuesser\Mailing\Mail;
+use SokoWeb\OAuth\GoogleOAuth;
-use MapGuesser\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\Util\UsernameGenerator;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\HtmlContent;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Util\CaptchaValidator;
+use SokoWeb\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Util\CaptchaValidator;
+use SokoWeb\Util\JwtParser;
 
 class LoginController
 {
-    private IRequest $request;
-
-    private PersistentDataManager $pdm;
-
     private UserRepository $userRepository;
 
     private UserConfirmationRepository $userConfirmationRepository;
@@ -36,23 +31,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) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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
@@ -60,13 +59,13 @@ class LoginController
         $state = bin2hex(random_bytes(16));
         $nonce = bin2hex(random_bytes(16));
 
-        $this->request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \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
         );
 
@@ -75,50 +74,56 @@ class LoginController
 
     public function getSignupForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
         }
 
-        if ($this->request->session()->has('tmp_user_data')) {
+        if (\Container::$request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('tmp_user_data');
+            $tmpUserData = \Container::$request->session()->get('tmp_user_data');
-
-            $data = ['email' => $tmpUserData['email']];
         } else {
-            $data = [];
+            $tmpUserData = [];
         }
 
-        return new HtmlContent('login/signup', $data);
+        return new HtmlContent('login/signup', $tmpUserData);
     }
 
-    public function getSignupSuccess(): IContent
+    public function getSignupSuccess()
     {
+        if (\Container::$request->user() !== null) {
+            $this->deleteRedirectUrl();
+            return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
+        }
+
         return new HtmlContent('login/signup_success');
     }
 
     public function getSignupWithGoogleForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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
@@ -128,11 +133,12 @@ class LoginController
 
     public function getResetPasswordForm()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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()) {
@@ -141,19 +147,27 @@ 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'));
+        if (
+            filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false &&
+            preg_match('/^[a-zA-Z0-9_\-\.]+$/', \Container::$request->post('email')) !== 1
+        ) {
+            return new JsonContent(['error' => ['errorText' => 'This is not a valid email address or username.']]);
+        }
+
+        $user = $this->userRepository->getByEmailOrUsername(\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!'
@@ -162,16 +176,20 @@ class LoginController
             }
 
             $tmpUser = new User();
-            $tmpUser->setPlainPassword($this->request->post('password'));
+            $tmpUser->setPlainPassword(\Container::$request->post('password'));
 
-            $this->request->session()->set('tmp_user_data', [
+            $tmpUserData = ['password_hashed' => $tmpUser->getPassword()];
-                'email' => $this->request->post('email'),
+            if (filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
-                'password_hashed' => $tmpUser->getPassword()
+                $tmpUserData['username'] = \Container::$request->post('email');
-            ]);
+            } else {
+                $tmpUserData['email'] = \Container::$request->post('email');
+            }
+
+            \Container::$request->session()->set('tmp_user_data', $tmpUserData);
 
             return new JsonContent([
                 'redirect' => [
-                    'target' => '/' . \Container::$routeCollection->getRoute('signup')->generateLink()
+                    'target' => \Container::$routeCollection->getRoute('signup')->generateLink()
                 ]
             ]);
         }
@@ -181,13 +199,13 @@ class LoginController
 
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
+                    'errorText' => 'User found with the given email address / username, but the account is not activated. ' .
                         'Please check your email and click on the activation link!'
                 ]
             ]);
         }
 
-        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=' .
@@ -196,25 +214,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) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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'),
+            \Container::$request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('login-google-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -224,7 +244,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');
         }
 
@@ -235,50 +255,73 @@ 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) {
+        if (\Container::$request->user() !== null) {
-            return new JsonContent(['redirect' => ['target' => '/' . \Container::$routeCollection->getRoute('home')->generateLink()]]);
+            $this->deleteRedirectUrl();
+            return new JsonContent(['redirect' => ['target' => $this->redirectUrl]]);
         }
 
-        $user = $this->userRepository->getByEmail($this->request->post('email'));
+        $newUser = new User();
+
+        $googleUserData = \Container::$request->session()->get('google_user_data');
+        if ($googleUserData !== null) {
+            $user = $this->userRepository->getByEmail($googleUserData['email']);
+
+            if ($user !== null) {
+                return new JsonContent([
+                    'error' => [
+                        'errorText' => 'There is a user already registered with the email address of this Google account, ' .
+                            'but Google account is not linked to the user. Please <a href="/login?email=' .
+                            urlencode($googleUserData['email']) . '" title="Login">login</a> first to link your Google account!'
+                    ]
+                ]);
+            }
+
+            $newUser->setActive(true);
+            $newUser->setEmail($googleUserData['email']);
+            $newUser->setGoogleSub($googleUserData['sub']);
+        } else {
+            $user = $this->userRepository->getByEmailOrUsername(\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, ' .
+                                'errorText' => 'There is a user already registered with the given email address / username, ' .
                                     'but the given password is wrong. You can <a href="/password/requestReset?email=' .
                                     urlencode($user->getEmail()) . '" title="Request password reset">request password reset</a>!'
                             ]
                         ]);
                     }
 
-                $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' => [
-                        'errorText' => 'There is a user already registered with the given email address. ' .
+                            'errorText' => 'There is a user already registered with the given email address / username. ' .
                                 'Please check your email and click on the activation link!'
                         ]
                     ];
@@ -287,32 +330,32 @@ class LoginController
             }
 
             if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
-            if (!$this->request->post('g-recaptcha-response')) {
+                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($this->request->post('g-recaptcha-response'));
+                $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($this->request->post('email'), FILTER_VALIDATE_EMAIL) === false) {
+            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')) {
+            if (\Container::$request->session()->has('tmp_user_data')) {
-            $tmpUserData = $this->request->session()->get('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!'
@@ -320,172 +363,163 @@ 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();
+            $newUser->setActive(false);
-        $user->setEmail($this->request->post('email'));
+            $newUser->setEmail(\Container::$request->post('email'));
-        $user->setPlainPassword($this->request->post('password'));
+            $newUser->setPlainPassword(\Container::$request->post('password'));
-        $user->setCreatedDate(new DateTime());
+        }
 
-        \Container::$dbConnection->startTransaction();
+        if (strlen(\Container::$request->post('username')) > 0) {
+            $username = \Container::$request->post('username');
 
-        $this->pdm->saveToDb($user);
+            if (preg_match('/^[a-zA-Z0-9_\-\.]+$/', $username) !== 1) {
+                return new JsonContent(['error' => ['errorText' => 'Username can contain only english letters, digits, - (hyphen), . (dot), _ (underscore).']]);
+            }
 
+            if ($this->userRepository->getByUsername($username) !== null) {
+                return new JsonContent(['error' => ['errorText' => 'The given username is already taken.']]);
+            }
+        } else {
+            $usernameGenerator = new UsernameGenerator();
+            do {
+                $username = $usernameGenerator->generate();
+            } while ($this->userRepository->getByUsername($username));
+        }
+
+        $newUser->setUsername($username);
+        $newUser->setCreatedDate(new DateTime());
+
+        \Container::$persistentDataManager->saveToDb($newUser);
+
+        if ($googleUserData !== null) {
+            $this->sendWelcomeEmail($newUser->getEmail());
+
+            \Container::$request->setUser($newUser);
+        } else {
             $token = bin2hex(random_bytes(16));
 
             $confirmation = new UserConfirmation();
-        $confirmation->setUser($user);
+            $confirmation->setUser($newUser);
             $confirmation->setToken($token);
             $confirmation->setLastSentDate(new DateTime());
 
-        $this->pdm->saveToDb($confirmation);
+            \Container::$persistentDataManager->saveToDb($confirmation);
 
-        \Container::$dbConnection->commit();
+            $this->sendConfirmationEmail($newUser->getEmail(), $token, $newUser->getCreatedDate());
-
-        $this->sendConfirmationEmail($user->getEmail(), $token, $user->getCreatedDate());
-
-        $this->request->session()->delete('tmp_user_data');
-
-        return new JsonContent(['success' => true]);
         }
 
-    public function signupWithGoogle(): IContent
+        \Container::$request->session()->delete('tmp_user_data');
-    {
+        \Container::$request->session()->delete('google_user_data');
-        if ($this->request->user() !== null) {
-            return new JsonContent(['success' => true]);
-        }
-
-        $userData = $this->request->session()->get('google_user_data');
-
-        $user = $this->userRepository->getByEmail($userData['email']);
-
-        if ($user === null) {
-            $sendWelcomeEmail = true;
-
-            $user = new User();
-            $user->setEmail($userData['email']);
-            $user->setCreatedDate(new DateTime());
-        } else {
-            $sendWelcomeEmail = false;
-        }
-
-        $user->setActive(true);
-        $user->setGoogleSub($userData['sub']);
-
-        $this->pdm->saveToDb($user);
-
-        if ($sendWelcomeEmail) {
-            $this->sendWelcomeEmail($user->getEmail());
-        }
-
-        $this->request->session()->delete('google_user_data');
-        $this->request->setUser($user);
 
         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) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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();
+        \Container::$persistentDataManager->deleteFromDb($confirmation);
-
-        $this->pdm->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);
+        $this->deleteRedirectUrl();
-
+        return new Redirect($this->redirectUrl, IRedirect::TEMPORARY);
-        return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
     }
 
     public function cancel()
     {
-        if ($this->request->user() !== null) {
+        if (\Container::$request->user() !== null) {
-            return new Redirect(\Container::$routeCollection->getRoute('index')->generateLink(), IRedirect::TEMPORARY);
+            $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();
+        \Container::$persistentDataManager->deleteFromDb($confirmation);
-
-        $this->pdm->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::$persistentDataManager->deleteFromDb($user);
-
-        \Container::$dbConnection->commit();
 
         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
                 ]
             ]);
         }
 
         if (!empty($_ENV['RECAPTCHA_SITEKEY'])) {
-            if (!$this->request->post('g-recaptcha-response')) {
+            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($this->request->post('g-recaptcha-response'));
+            $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($this->request->post('email'));
+        if (
+            filter_var(\Container::$request->post('email'), FILTER_VALIDATE_EMAIL) === false &&
+            preg_match('/^[a-zA-Z0-9_\-\.]+$/', \Container::$request->post('email')) !== 1
+        ) {
+            return new JsonContent(['error' => ['errorText' => 'This is not a valid email address or username.']]);
+        }
+
+        $user = $this->userRepository->getByEmailOrUsername(\Container::$request->post('email'));
 
         if ($user === null) {
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'No user found with the given email address. You can <a href="/signup" title="Sign up">sign up</a>!'
+                    'errorText' => 'No user found with the given email address / username. You can <a href="/signup" title="Sign up">sign up</a>!'
                 ]
             ]);
         }
@@ -495,7 +529,7 @@ class LoginController
 
             return new JsonContent([
                 'error' => [
-                    'errorText' => 'User found with the given email address, but the account is not activated. ' .
+                    'errorText' => 'User found with the given email address / username, but the account is not activated. ' .
                         'Please check your email and click on the activation link!'
                 ]
             ]);
@@ -519,15 +553,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::$persistentDataManager->saveToDb($passwordResetter);
-
-        \Container::$dbConnection->commit();
 
         $this->sendPasswordResetEmail($user->getEmail(), $token, $expires);
 
@@ -537,26 +567,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!'
@@ -564,23 +595,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();
+        \Container::$persistentDataManager->deleteFromDb($resetter);
-
-        $this->pdm->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();
+        \Container::$request->setUser($user);
-
-        $this->request->setUser($user);
 
+        $this->deleteRedirectUrl();
         return new JsonContent(['success' => true]);
     }
 
@@ -591,9 +619,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')
         ]);
@@ -610,7 +638,7 @@ class LoginController
 
         $confirmation->setLastSentDate(new DateTime());
 
-        $this->pdm->saveToDb($confirmation);
+        \Container::$persistentDataManager->saveToDb($confirmation);
 
         $this->sendConfirmationEmail($user->getEmail(), $confirmation->getToken(), $user->getCreatedDate());
 
@@ -635,10 +663,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 SokoWeb\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Response\IContent;
+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 SokoWeb\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
+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 \Container::$request->user()->hasPermission(IUser::PERMISSION_ADMIN);
-
-        return $user !== null && $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');
+        $mapId = (int) \Container::$request->query('mapId');
-
-        \Container::$dbConnection->startTransaction();
 
         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::$persistentDataManager->saveToDb($map);
-
-        \Container::$dbConnection->commit();
 
         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::$persistentDataManager->deleteFromDb($map);
-
-        \Container::$dbConnection->commit();
 
         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) {
+        foreach ($this->guessRepository->getAllInChallenge($challenge, ['place_in_challange']) as $guess) {
-            $this->pdm->deleteFromDb($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 SokoWeb\Database\Query\Select;
-use MapGuesser\Database\RawExpression;
+use SokoWeb\Database\RawExpression;
-use MapGuesser\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\Database\IResultSet;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Response\HtmlContent;
-use MapGuesser\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,30 +1,26 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Http\Request;
+use SokoWeb\Http\Request;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\OAuth\GoogleOAuth;
-use MapGuesser\OAuth\GoogleOAuth;
-use MapGuesser\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\Repository\GuessRepository;
+use MapGuesser\Repository\UserRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Response\Redirect;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Util\JwtParser;
 
-class UserController implements ISecured
+class UserController implements IAuthenticationRequired
 {
-    private IRequest $request;
+    private UserRepository $userRepository;
-
-    private PersistentDataManager $pdm;
 
     private UserConfirmationRepository $userConfirmationRepository;
 
@@ -36,10 +32,9 @@ class UserController implements ISecured
 
     private GuessRepository $guessRepository;
 
-    public function __construct(IRequest $request)
+    public function __construct()
     {
-        $this->request = $request;
+        $this->userRepository = new UserRepository();
-        $this->pdm = new PersistentDataManager();
         $this->userConfirmationRepository = new UserConfirmationRepository();
         $this->userPasswordResetterRepository = new UserPasswordResetterRepository();
         $this->userPlayedPlaceRepository = new UserPlayedPlaceRepository();
@@ -47,11 +42,9 @@ class UserController implements ISecured
         $this->guessRepository = new GuessRepository();
     }
 
-    public function authorize(): bool
+    public function isAuthenticationRequired(): bool
     {
-        $user = $this->request->user();
+        return true;
-
-        return $user !== null;
     }
 
     public function getAccount(): IContent
@@ -59,29 +52,153 @@ class UserController implements ISecured
         /**
          * @var User $user
          */
-        $user = $this->request->user();
+        $user = \Container::$request->user();
 
         return new HtmlContent('account/account', ['user' => $user->toArray()]);
     }
 
+    public function getGoogleConnectRedirect(): IRedirect
+    {
+        /**
+         * @var User $user
+         */
+        $user = \Container::$request->user();
+
+        $state = bin2hex(random_bytes(16));
+        $nonce = bin2hex(random_bytes(16));
+
+        \Container::$request->session()->set('oauth_state', $state);
+        \Container::$request->session()->set('oauth_nonce', $nonce);
+
+        $oAuth = new GoogleOAuth(new Request());
+
+        $url = $oAuth->getDialogUrl(
+            $state,
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleConnect-confirm')->generateLink(),
+            $nonce,
+            $user->getEmail()
+        );
+
+        return new Redirect($url, IRedirect::TEMPORARY);
+    }
+
+    public function getGoogleConnectConfirm(): IContent
+    {
+        $defaultError = 'Authentication with Google failed. Please <a href="' . \Container::$routeCollection->getRoute('account.googleConnect')->generateLink() . '" title="Connect with Google">try again</a>!';
+
+        if (\Container::$request->query('state') !== \Container::$request->session()->get('oauth_state')) {
+            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
+        }
+
+        $oAuth = new GoogleOAuth(new Request());
+        $tokenData = $oAuth->getToken(
+            \Container::$request->query('code'),
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleConnect-confirm')->generateLink()
+        );
+        if (!isset($tokenData['id_token'])) {
+            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
+        }
+
+        $jwtParser = new JwtParser($tokenData['id_token']);
+        $idToken = $jwtParser->getPayload();
+        if ($idToken['nonce'] !== \Container::$request->session()->get('oauth_nonce')) {
+            return new HtmlContent('account/google_connect', ['success' => false, 'error' => $defaultError]);
+        }
+
+        $anotherUser = $this->userRepository->getByGoogleSub($idToken['sub']);
+        if ($anotherUser !== null) {
+            return new HtmlContent('account/google_connect', [
+                'success' => false,
+                'error' => 'This Google account is linked to another account.'
+            ]);
+        }
+
+        \Container::$request->session()->set('google_user_data', $idToken);
+
+        /**
+         * @var User $user
+         */
+        $user = \Container::$request->user();
+
+        return new HtmlContent('account/google_connect', [
+            'success' => true,
+            'googleAccount' => $idToken['email'],
+            'userEmail' => $user->getEmail()
+        ]);
+    }
+
+    public function connectGoogle(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = \Container::$request->user();
+        if (!$user->checkPassword(\Container::$request->post('password'))) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'The given password is wrong.'
+                ]
+            ]);
+        }
+
+        $googleUserData = \Container::$request->session()->get('google_user_data');
+        $user->setGoogleSub($googleUserData['sub']);
+        \Container::$persistentDataManager->saveToDb($user);
+
+        return new JsonContent(['success' => true]);
+    }
+
+    public function getGoogleDisconnectConfirm(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = \Container::$request->user();
+
+        return new HtmlContent('account/google_disconnect', [
+            'success' => true,
+            'userEmail' => $user->getEmail()
+        ]);
+    }
+
+    public function disconnectGoogle(): IContent
+    {
+        /**
+         * @var User $user
+         */
+        $user = \Container::$request->user();
+        if (!$user->checkPassword(\Container::$request->post('password'))) {
+            return new JsonContent([
+                'error' => [
+                    'errorText' => 'The given password is wrong.'
+                ]
+            ]);
+        }
+
+        $user->setGoogleSub(null);
+        \Container::$persistentDataManager->saveToDb($user);
+
+        return new JsonContent(['success' => true]);
+    }
+
     public function getGoogleAuthenticateRedirect(): IRedirect
     {
         /**
          * @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);
+        \Container::$request->session()->set('oauth_state', $state);
-        $this->request->session()->set('oauth_nonce', $nonce);
+        \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 +211,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'),
+            \Container::$request->query('code'),
-            $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
+            \Container::$request->getBase() . \Container::$routeCollection->getRoute('account.googleAuthenticate-action')->generateLink()
         );
 
         if (!isset($tokenData['id_token'])) {
@@ -113,7 +230,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 +242,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 +255,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 +265,49 @@ 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'),
+            \Container::$request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
+            \Container::$request->post('password'),
             $error
         )) {
             return new JsonContent(['error' => ['errorText' => $error]]);
         }
 
-        if (strlen($this->request->post('password_new')) > 0) {
+        $newEmail = \Container::$request->post('email');
-            if (strlen($this->request->post('password_new')) < 6) {
+        if ($newEmail !== $user->getEmail()) {
+            if (!filter_var($newEmail, FILTER_VALIDATE_EMAIL)) {
+                return new JsonContent(['error' => ['errorText' => 'The given email address is not valid.']]);
+            }
+
+            if ($this->userRepository->getByEmail($newEmail) !== null) {
+                return new JsonContent(['error' => ['errorText' => 'The given email address belongs to another account.']]);
+            }
+
+            $user->setEmail($newEmail);
+        }
+
+        $newUsername = \Container::$request->post('username');
+        if ($newUsername !== $user->getUsername()) {
+            if (strlen($newUsername) == 0) {
+                return new JsonContent(['error' => ['errorText' => 'Username cannot be empty.']]);
+            }
+
+            if (preg_match('/^[a-zA-Z0-9_\-\.]+$/', $newUsername) !== 1) {
+                return new JsonContent(['error' => ['errorText' => 'Username can contain only english letters, digits, - (hyphen), . (dot), _ (underscore).']]);
+            }
+
+            if ($this->userRepository->getByUsername($newUsername) !== null) {
+                return new JsonContent(['error' => ['errorText' => 'The given username is already taken.']]);
+            }
+
+            $user->setUsername($newUsername);
+        }
+
+        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 +315,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 +323,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 +338,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'),
+            \Container::$request->session()->get('authenticated_with_google_until'),
-            $this->request->post('password'),
+            \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();
+        \Container::$request->session()->delete('authenticated_with_google_until');
-
-        $this->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 SokoWeb\PersistentData\Model\Model;
-use MapGuesser\PersistentData\PersistentDataManager;
+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,18 +1,21 @@
 <?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
 {
     protected static string $table = 'users';
 
-    protected static array $fields = ['email', 'password', 'type', 'active', 'google_sub', 'created'];
+    protected static array $fields = ['email', 'username', 'password', 'type', 'active', 'google_sub', 'created'];
 
     private static array $types = ['user', 'admin'];
 
     private string $email = '';
 
+    private string $username = '';
+
     private ?string $password = null;
 
     private string $type = 'user';
@@ -28,6 +31,11 @@ class User extends Model implements IUser
         $this->email = $email;
     }
 
+    public function setUsername(string $username): void
+    {
+        $this->username = $username;
+    }
+
     public function setPassword(?string $hashedPassword): void
     {
         $this->password = $hashedPassword;
@@ -70,6 +78,11 @@ class User extends Model implements IUser
         return $this->email;
     }
 
+    public function getUsername(): string
+    {
+        return $this->username;
+    }
+
     public function getPassword(): ?string
     {
         return $this->password;
@@ -119,7 +132,7 @@ class User extends Model implements IUser
 
     public function getDisplayName(): string
     {
-        return $this->email;
+        return $this->username;
     }
 
     public function checkPassword(string $password): bool

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,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\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
@@ -26,7 +18,7 @@ class ChallengeRepository
         $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(['user_in_challenge', 'user_id'], '=', $user->getId());
-        $select->where('is_owner', '=', true);
+        $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_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->where('place_id', '=', $place->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->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->orderBy('round');
+        $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->where(['guesses__place_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->orderBy('round');
+        $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(['guesses__place_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->where('round', '=', $round);
+        $select->where(['guesses__place_in_challenge', 'round'], '=', $round);
 
-        yield from $this->pdm->selectMultipleFromDb($select, Guess::class, true, $withRelations);
+        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
@@ -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
@@ -117,8 +109,8 @@ class PlaceRepository
         // count the places never visited
         $selectUnvisited = new Select(\Container::$dbConnection, 'places');
         $selectUnvisited->leftJoin($selectPlacesByCurrentUser, ['places', 'id'], '=', ['places_by_current_user', 'place_id']);
-        $selectUnvisited->where('map_id', '=', $mapId);
+        $selectUnvisited->where(['places', '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
@@ -148,11 +140,11 @@ class PlaceRepository
         // count places that were visited at least once
         $selectOldPlaces = new Select(\Container::$dbConnection, 'places');
         $selectOldPlaces->innerJoin($selectPlacesByCurrentUser, ['places', 'id'], '=', ['places_by_current_user', 'place_id']);
-        $selectOldPlaces->where('map_id', '=', $mapId);
+        $selectOldPlaces->where(['places', 'map_id'], '=', $mapId);
         $numberOfOldPlaces = $selectOldPlaces->count();
 
         // set order by datetime, oldest first
-        $selectOldPlaces->orderBy('last_time');
+        $selectOldPlaces->orderBy(['places_by_current_user', 'last_time']);
 
         // selection algorithm with preference (weighting) for older places using Box-Muller transform
         $pickGaussianRandomInt = function($numberOfPlaces) {
@@ -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->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->orderBy('round');
+        $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->where(['place_in_challenge', 'challenge_id'], '=', $challenge->getId());
-        $select->orderBy('round');
+        $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,24 @@ 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 getByUsername(string $username): ?User
+    {
+        $select = new Select(\Container::$dbConnection);
+        $select->where('username', '=', $username);
+
+        return \Container::$persistentDataManager->selectFromDb($select, User::class);
+    }
+
+    public function getByEmailOrUsername(string $emailOrUsername): ?User
+    {
+        if (filter_var($emailOrUsername, FILTER_VALIDATE_EMAIL)) {
+            return $this->getByEmail($emailOrUsername);
+        }
+
+        return $this->getByUsername($emailOrUsername);
     }
 
     public function getByGoogleSub(string $sub): ?User
@@ -34,7 +44,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 +53,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;
-        }
-    }
-}