MAPG-243 replace and adapt to soko-web

.env.example

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

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']);

main.php

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

mapg

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

public/index.php

@@ -19,14 +19,14 @@ if ($match !== null) {
     $handler = $route->getHandler();
     $controller = new $handler[0](Container::$request);
 
-    if ($controller instanceof MapGuesser\Interfaces\Authorization\ISecured) {
+    if ($controller instanceof SokoWeb\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']);
+        $content = new SokoWeb\Response\JsonContent(['error' => 'no_valid_anti_csrf_token']);
         header('Content-Type: text/html; charset=UTF-8', true, 403);
         $content->render();
         return;
@@ -35,12 +35,12 @@ if ($match !== null) {
     if ($authorized) {
         $response = call_user_func([$controller, $handler[1]]);
 
-        if ($response instanceof MapGuesser\Interfaces\Response\IContent) {
+        if ($response instanceof SokoWeb\Interfaces\Response\IContent) {
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
             $response->render();
 
             return;
-        } elseif ($response instanceof MapGuesser\Interfaces\Response\IRedirect) {
+        } elseif ($response instanceof SokoWeb\Interfaces\Response\IRedirect) {
             header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
 
             return;
@@ -48,6 +48,6 @@ if ($match !== null) {
     }
 }
 
-$content = new MapGuesser\Response\HtmlContent('error/404');
+$content = new SokoWeb\Response\HtmlContent('error/404');
 header('Content-Type: text/html; charset=UTF-8', true, 404);
 $content->render();

src/Cli/AddUserCommand.php

@@ -1,7 +1,7 @@
 <?php namespace MapGuesser\Cli;
 
 use DateTime;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;

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,10 @@
 <?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 SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;

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;

src/Controller/GameController.php

@@ -2,24 +2,24 @@
 
 use DateTime;
 use Faker\Factory;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Request\IRequest;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Response\HtmlContent;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IRedirect;
 use MapGuesser\Multi\MultiConnector;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\MultiRoom;
 use MapGuesser\PersistentData\Model\PlaceInChallenge;
 use MapGuesser\PersistentData\Model\UserInChallenge;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\MapRepository;
 use MapGuesser\Repository\MultiRoomRepository;
 use MapGuesser\Repository\PlaceRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Response\Redirect;
 
 class GameController implements ISecured
 {
@@ -103,7 +103,7 @@ class GameController implements ISecured
     }
 
     public function getChallenge(): IContent
-    {   
+    {
         $challengeToken = $this->request->query('challengeToken');
 
         return new HtmlContent('game', ['challengeToken' => $challengeToken]);
@@ -120,7 +120,7 @@ class GameController implements ISecured
         $challenge = new Challenge();
         $challenge->setToken($challengeToken);
         $challenge->setCreatedDate(new DateTime());
-        
+
         if ($this->request->post('timerEnabled') !== null && $this->request->post('timeLimit') !== null) {
             $challenge->setTimeLimit($this->request->post('timeLimit'));
         }

src/Controller/GameFlowController.php

@@ -1,13 +1,13 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\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 SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\Challenge;
 use MapGuesser\PersistentData\Model\Guess;
 use MapGuesser\PersistentData\Model\Map;

src/Controller/HomeController.php

@@ -1,10 +1,10 @@
 <?php namespace MapGuesser\Controller;
 
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Response\JsonContent;
+use SokoWeb\Response\JsonContent;
-use MapGuesser\Response\Redirect;
+use SokoWeb\Response\Redirect;
 
 class HomeController
 {

src/Controller/LoginController.php

@@ -2,25 +2,25 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
+use SokoWeb\Http\Request;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\Mailing\Mail;
+use SokoWeb\Mailing\Mail;
-use MapGuesser\OAuth\GoogleOAuth;
+use SokoWeb\OAuth\GoogleOAuth;
 use MapGuesser\PersistentData\Model\User;
 use MapGuesser\PersistentData\Model\UserConfirmation;
 use MapGuesser\PersistentData\Model\UserPasswordResetter;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
 use MapGuesser\Repository\UserRepository;
-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\CaptchaValidator;
+use SokoWeb\Util\CaptchaValidator;
-use MapGuesser\Util\JwtParser;
+use SokoWeb\Util\JwtParser;
 
 class LoginController
 {

src/Controller/MapAdminController.php

@@ -1,15 +1,15 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Interfaces\Authentication\IUser;
+use SokoWeb\Interfaces\Authentication\IUser;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Request\IRequest;
-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 SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Repository\ChallengeRepository;
 use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\MapRepository;
@@ -17,8 +17,8 @@ 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;
 

src/Controller/MapsController.php

@@ -1,12 +1,12 @@
 <?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\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Response\HtmlContent;
+use SokoWeb\Response\HtmlContent;
 
 class MapsController
 {

src/Controller/UserController.php

@@ -1,24 +1,23 @@
 <?php namespace MapGuesser\Controller;
 
 use DateTime;
-use MapGuesser\Http\Request;
+use SokoWeb\Http\Request;
-use MapGuesser\Interfaces\Authorization\ISecured;
+use SokoWeb\Interfaces\Authorization\ISecured;
-use MapGuesser\Interfaces\Request\IRequest;
+use SokoWeb\Interfaces\Request\IRequest;
-use MapGuesser\Interfaces\Response\IContent;
+use SokoWeb\Interfaces\Response\IContent;
-use MapGuesser\Interfaces\Response\IRedirect;
+use SokoWeb\Interfaces\Response\IRedirect;
-use MapGuesser\OAuth\GoogleOAuth;
+use SokoWeb\OAuth\GoogleOAuth;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\PersistentData\Model\User;
-use MapGuesser\PersistentData\Model\UserInChallenge;
 use MapGuesser\Repository\GuessRepository;
 use MapGuesser\Repository\UserConfirmationRepository;
 use MapGuesser\Repository\UserInChallengeRepository;
 use MapGuesser\Repository\UserPasswordResetterRepository;
 use MapGuesser\Repository\UserPlayedPlaceRepository;
-use MapGuesser\Response\HtmlContent;
+use 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
 {

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/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,9 @@
 
 use DateInterval;
 use DateTime;
-use MapGuesser\Http\Request;
+use SokoWeb\PersistentData\Model\Model;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\Http\Request;
+use SokoWeb\PersistentData\PersistentDataManager;
 use MapGuesser\Util\Geo\Position;
 use MapGuesser\Util\Panorama\Pov;
 

src/PersistentData/Model/PlaceInChallenge.php

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

src/PersistentData/Model/User.php

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

src/PersistentData/Model/UserConfirmation.php

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

src/PersistentData/Model/UserInChallenge.php

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

src/PersistentData/Model/UserPasswordResetter.php

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

src/PersistentData/Model/UserPlayedPlace.php

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

src/Repository/ChallengeRepository.php

@@ -1,11 +1,11 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class ChallengeRepository
 {
@@ -25,7 +25,7 @@ class ChallengeRepository
     {
         $select = new Select(\Container::$dbConnection);
         $select->where('token', '=', $token);
-        
+
         return $this->pdm->selectFromDb($select, Challenge::class);
     }
 
@@ -72,4 +72,4 @@ class ChallengeRepository
 
         yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
     }
-}
+}

src/Repository/GuessRepository.php

@@ -1,14 +1,13 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class GuessRepository
 {
@@ -79,7 +78,7 @@ class GuessRepository
             $necessaryRelations = [PlaceInChallenge::class];
             $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
         }
-        
+
         $select = new Select(\Container::$dbConnection);
         $select->where('challenge_id', '=', $challenge->getId());
         $select->where('round', '=', $round);

src/Repository/MapRepository.php

@@ -1,10 +1,10 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class MapRepository
 {

src/Repository/MultiRoomRepository.php

@@ -2,9 +2,9 @@
 
 use DateTime;
 use Generator;
-use MapGuesser\Database\Query\Select;
+use SokoWeb\Database\Query\Select;
 use MapGuesser\PersistentData\Model\MultiRoom;
-use MapGuesser\PersistentData\PersistentDataManager;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class MultiRoomRepository
 {

src/Repository/PlaceInChallengeRepository.php

@@ -1,12 +1,11 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class PlaceInChallengeRepository
 {

src/Repository/PlaceRepository.php

@@ -1,11 +1,11 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class PlaceRepository
 {
@@ -41,7 +41,7 @@ class PlaceRepository
             }
 
             $oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);
-            
+
             return array_merge($unvisitedPlaces, $oldPlaces);
         }
     }
@@ -198,5 +198,5 @@ class PlaceRepository
 
         yield from $this->pdm->selectMultipleFromDb($select, Place::class);
     }
-  
+
 }

src/Repository/UserConfirmationRepository.php

@@ -1,9 +1,9 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserConfirmationRepository
 {

src/Repository/UserInChallengeRepository.php

@@ -1,11 +1,11 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserInChallengeRepository
 {

src/Repository/UserPasswordResetterRepository.php

@@ -2,10 +2,10 @@
 
 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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserPasswordResetterRepository
 {

src/Repository/UserPlayedPlaceRepository.php

@@ -1,12 +1,11 @@
 <?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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
 class UserPlayedPlaceRepository
 {

src/Repository/UserRepository.php

@@ -2,12 +2,13 @@
 
 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;
+use SokoWeb\PersistentData\PersistentDataManager;
 
-class UserRepository
+class UserRepository implements IUserRepository
 {
     private PersistentDataManager $pdm;
 

web.php

@@ -10,17 +10,17 @@ if (!empty($_ENV['DEV'])) {
     ini_set('display_errors', '0');
 }
 
-Container::$routeCollection = new MapGuesser\Routing\RouteCollection();
+Container::$routeCollection = new SokoWeb\Routing\RouteCollection();
 
 Container::$routeCollection->get('index', '', [MapGuesser\Controller\MapsController::class, 'getMaps']);
 Container::$routeCollection->get('startSession', 'startSession.json', [MapGuesser\Controller\HomeController::class, 'startSession']);
-Container::$routeCollection->group('login', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('login', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('login', '', [MapGuesser\Controller\LoginController::class, 'getLoginForm']);
     $routeCollection->post('login-action', '', [MapGuesser\Controller\LoginController::class, 'login']);
     $routeCollection->get('login-google', 'google', [MapGuesser\Controller\LoginController::class, 'getGoogleLoginRedirect']);
     $routeCollection->get('login-google-action', 'google/code', [MapGuesser\Controller\LoginController::class, 'loginWithGoogle']);
 });
-Container::$routeCollection->group('signup', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('signup', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('signup', '', [MapGuesser\Controller\LoginController::class, 'getSignupForm']);
     $routeCollection->post('signup-action', '', [MapGuesser\Controller\LoginController::class, 'signup']);
     $routeCollection->get('signup-google', 'google', [MapGuesser\Controller\LoginController::class, 'getSignupWithGoogleForm']);
@@ -31,7 +31,7 @@ Container::$routeCollection->group('signup', function (MapGuesser\Routing\RouteC
     $routeCollection->get('signup.activate', 'activate/{token}', [MapGuesser\Controller\LoginController::class, 'activate']);
     $routeCollection->get('signup.cancel', 'cancel/{token}', [MapGuesser\Controller\LoginController::class, 'cancel']);
 });
-Container::$routeCollection->group('password', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('password', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('password-requestReset', 'requestReset', [MapGuesser\Controller\LoginController::class, 'getRequestPasswordResetForm']);
     $routeCollection->post('password-requestReset-action', 'requestReset', [MapGuesser\Controller\LoginController::class, 'requestPasswordReset']);
     $routeCollection->get('password-requestReset.success', 'requestReset/success', [MapGuesser\Controller\LoginController::class, 'getRequestPasswordResetSuccess']);
@@ -39,7 +39,7 @@ Container::$routeCollection->group('password', function (MapGuesser\Routing\Rout
     $routeCollection->post('password-reset.action', 'reset/{token}', [MapGuesser\Controller\LoginController::class, 'resetPassword']);
 });
 Container::$routeCollection->get('logout', 'logout', [MapGuesser\Controller\LoginController::class, 'logout']);
-Container::$routeCollection->group('account', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('account', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('account', '', [MapGuesser\Controller\UserController::class, 'getAccount']);
     $routeCollection->post('account-action', '', [MapGuesser\Controller\UserController::class, 'saveAccount']);
     $routeCollection->get('account.delete', 'delete', [MapGuesser\Controller\UserController::class, 'getDeleteAccount']);
@@ -48,13 +48,13 @@ Container::$routeCollection->group('account', function (MapGuesser\Routing\Route
     $routeCollection->get('account.googleAuthenticate-action', 'googleAuthenticate/code', [MapGuesser\Controller\UserController::class, 'authenticateWithGoogle']);
 });
 //Container::$routeCollection->get('maps', 'maps', [MapGuesser\Controller\MapsController::class, 'getMaps']);
-Container::$routeCollection->group('game', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('game', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('game', '{mapId}', [MapGuesser\Controller\GameController::class, 'getGame']);
     $routeCollection->post('game.prepare-json', '{mapId}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareGame']);
     $routeCollection->post('game.initialData-json', '{mapId}/initialData.json', [MapGuesser\Controller\GameFlowController::class, 'initialData']);
     $routeCollection->post('game.guess-json', '{mapId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'guess']);
 });
-Container::$routeCollection->group('multiGame', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('multiGame', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('multiGame.new', 'new/{mapId}', [MapGuesser\Controller\GameController::class, 'getNewMultiGame']);
     $routeCollection->get('multiGame', '{roomId}', [MapGuesser\Controller\GameController::class, 'getMultiGame']);
     $routeCollection->post('multiGame.prepare-json', '{roomId}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareMultiGame']);
@@ -62,14 +62,14 @@ Container::$routeCollection->group('multiGame', function (MapGuesser\Routing\Rou
     $routeCollection->post('multiGame.nextRound-json', '{roomId}/nextRound.json', [MapGuesser\Controller\GameFlowController::class, 'multiNextRound']);
     $routeCollection->post('multiGame.guess-json', '{roomId}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'multiGuess']);
 });
-Container::$routeCollection->group('challenge', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('challenge', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->post('challenge.create', 'create.json', [\MapGuesser\Controller\GameController::class, 'createNewChallenge']);
     $routeCollection->get('challenge', '{challengeToken}', [MapGuesser\Controller\GameController::class, 'getChallenge']);
     $routeCollection->post('challenge.prepare-json', '{challengeToken}/prepare.json', [MapGuesser\Controller\GameController::class, 'prepareChallenge']);
     $routeCollection->post('challenge.initialData-json', '{challengeToken}/initialData.json', [MapGuesser\Controller\GameFlowController::class, 'challengeInitialData']);
     $routeCollection->post('challenge.guess-json', '{challengeToken}/guess.json', [MapGuesser\Controller\GameFlowController::class, 'challengeGuess']);
 });
-Container::$routeCollection->group('admin', function (MapGuesser\Routing\RouteCollection $routeCollection) {
+Container::$routeCollection->group('admin', function (SokoWeb\Routing\RouteCollection $routeCollection) {
     $routeCollection->get('admin.mapEditor', 'mapEditor/{mapId?}', [MapGuesser\Controller\MapAdminController::class, 'getMapEditor']);
     $routeCollection->get('admin.place', 'place.json/{placeId}', [MapGuesser\Controller\MapAdminController::class, 'getPlace']);
     $routeCollection->post('admin.saveMap', 'saveMap/{mapId}/json', [MapGuesser\Controller\MapAdminController::class, 'saveMap']);
@@ -77,7 +77,7 @@ Container::$routeCollection->group('admin', function (MapGuesser\Routing\RouteCo
 });
 
 if (isset($_COOKIE['COOKIES_CONSENT'])) {
-    Container::$sessionHandler = new MapGuesser\Session\DatabaseSessionHandler();
+    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler();
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([
@@ -106,7 +106,13 @@ if (isset($_COOKIE['COOKIES_CONSENT'])) {
     $_SESSION = [];
 }
 
-Container::$request = new MapGuesser\Request\Request($_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'], $_GET, $_POST, $_SESSION);
+Container::$request = new SokoWeb\Request\Request(
+    $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST'],
+    $_GET,
+    $_POST,
+    $_SESSION,
+    new MapGuesser\Repository\UserRepository()
+);
 
 if (!Container::$request->session()->has('anti_csrf_token')) {
     Container::$request->session()->set('anti_csrf_token', bin2hex(random_bytes(16)));