Merge pull request 'feature/get-rid-of-container-usage' (#11) from feature/get-rid-of-container-usage into master

Reviewed-on: #11

dummy.php

@@ -3,12 +3,3 @@
 require 'vendor/autoload.php';
 
 const ROOT = __DIR__;
-
-class Container
-{
-    static SokoWeb\Interfaces\Database\IConnection $dbConnection;
-    static SokoWeb\Interfaces\Database\IAuditLogger $auditLogger;
-    static SokoWeb\Routing\RouteCollection $routeCollection;
-    static SokoWeb\Interfaces\Session\ISessionHandler $sessionHandler;
-    static SokoWeb\Interfaces\Request\IRequest $request;
-}

src/Interfaces/PersistentData/IPersistentDataManager.php

@@ -0,0 +1,20 @@
+<?php namespace SokoWeb\Interfaces\PersistentData;
+
+use Generator;
+use SokoWeb\Database\Query\Select;
+use SokoWeb\PersistentData\Model\Model;
+
+interface IPersistentDataManager
+{
+    public function selectFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []);
+
+    public function selectMultipleFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = []): Generator;
+
+    public function selectFromDbById($id, string $type, bool $useRelations = false);
+
+    public function loadRelationsFromDb(Model $model, bool $recursive): void;
+
+    public function saveToDb(Model $model): void;
+
+    public function deleteFromDb(Model $model): void;
+}

src/Interfaces/Response/IRedirect.php

@@ -6,7 +6,7 @@ interface IRedirect
 
     const TEMPORARY = 2;
 
-    public function getUrl(): string;
+    public function getTarget(): string;
 
     public function getHttpCode(): int;
 }

src/Interfaces/Routing/IRoute.php

@@ -0,0 +1,12 @@
+<?php namespace SokoWeb\Interfaces\Routing;
+
+interface IRoute
+{
+    public function getId(): string;
+
+    public function getHandler(): array;
+
+    public function generateLink(array $parameters = []): string;
+
+    public function testAgainst(array $path): ?array;
+}

src/Interfaces/Routing/IRouteCollection.php

@@ -0,0 +1,16 @@
+<?php namespace SokoWeb\Interfaces\Routing;
+
+use Closure;
+
+interface IRouteCollection
+{
+    public function get(string $id, string $pattern, array $handler): void;
+
+    public function post(string $id, string $pattern, array $handler): void;
+
+    public function group(string $pattern, Closure $group): void;
+
+    public function getRoute(string $id): ?IRoute;
+
+    public function match(string $method, string $uri): ?array;
+}

src/PersistentData/PersistentDataManager.php

@@ -3,11 +3,24 @@
 use Generator;
 use SokoWeb\Database\Query\Modify;
 use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IConnection;
+use SokoWeb\Interfaces\Database\IAuditLogger;
 use SokoWeb\Interfaces\Database\IResultSet;
+use SokoWeb\Interfaces\PersistentData\IPersistentDataManager;
 use SokoWeb\PersistentData\Model\Model;
 
-class PersistentDataManager
+class PersistentDataManager implements IPersistentDataManager
 {
+    private IConnection $dbConnection;
+
+    private IAuditLogger $auditLogger;
+
+    public function __construct(IConnection $dbConnection, IAuditLogger $auditLogger)
+    {
+        $this->dbConnection = $dbConnection;
+        $this->auditLogger = $auditLogger;
+    }
+
     public function selectFromDb(Select $select, string $type, bool $useRelations = false, array $withRelations = [])
     {
         $select = $this->createSelect($select, $type, $useRelations, $withRelations);
@@ -39,7 +52,7 @@ class PersistentDataManager
 
     public function selectFromDbById($id, string $type, bool $useRelations = false)
     {
-        $select = new Select(\Container::$dbConnection);
+        $select = new Select($this->dbConnection);
         $select->whereId($id);
 
         return $this->selectFromDb($select, $type, $useRelations);
@@ -117,7 +130,7 @@ class PersistentDataManager
         $modified = $model->toArray();
         $id = $model->getId();
 
-        $modify = new Modify(\Container::$dbConnection, $model::getTable(), \Container::$auditLogger);
+        $modify = new Modify($this->dbConnection, $model::getTable(), $this->auditLogger);
 
         if ($id !== null) {
             $original = $model->getSnapshot();
@@ -149,7 +162,7 @@ class PersistentDataManager
 
     public function deleteFromDb(Model $model): void
     {
-        $modify = new Modify(\Container::$dbConnection, $model::getTable(), \Container::$auditLogger);
+        $modify = new Modify($this->dbConnection, $model::getTable(), $this->auditLogger);
         $modify->setId($model->getId());
         $modify->fill($model->toArray());
         $modify->delete();

src/Response/HttpResponse.php

@@ -64,7 +64,7 @@ class HttpResponse
         list($route, $params) = $match;
         $this->request->setParsedRouteParams($params);
         $handler = $route->getHandler();
-        $controller = new $handler[0]($this->request);
+        $controller = new $handler[0]();
 
         if (
             $controller instanceof IAuthenticationRequired &&
@@ -103,7 +103,7 @@ class HttpResponse
             header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
             $response->render();
         } elseif ($response instanceof IRedirect) {
-            header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+            header('Location: ' . $this->getRedirectUrl($response), true, $response->getHttpCode());
         } else {
             $this->render404();
         }
@@ -113,7 +113,7 @@ class HttpResponse
     {
         $this->request->session()->set('redirect_after_login', $this->rawUrl);
         $response = new Redirect($this->routeCollection->getRoute($this->appConfig['loginRouteId'])->generateLink(), IRedirect::TEMPORARY);
-        header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
+        header('Location: ' . $this->getRedirectUrl($response), true, $response->getHttpCode());
     }
 
     private function renderAntiCsrfError(): void
@@ -142,4 +142,13 @@ class HttpResponse
         header('Content-Type: text/html; charset=UTF-8', true, 500);
         $content->render();
     }
+
+    private function getRedirectUrl(IRedirect $redirect): string
+    {
+        $url = $redirect->getTarget();
+        if (preg_match('/^http(s)?/', $url) !== 1) {
+            $url = $this->request->getBase() . $url;
+        }
+        return $url;
+    }
 }

src/Response/Redirect.php

@@ -14,15 +14,9 @@ class Redirect implements IRedirect
         $this->type = $type;
     }
 
-    public function getUrl(): string
+    public function getTarget(): string
     {
-        if (preg_match('/^http(s)?/', $this->target) === 1) {
+        return $this->target;
-            $link = $this->target;
-        } else {
-            $link = \Container::$request->getBase() . $this->target;
-        }
-
-        return $link;
     }
 
     public function getHttpCode(): int

src/Routing/Route.php

@@ -1,6 +1,8 @@
 <?php namespace SokoWeb\Routing;
 
-class Route
+use SokoWeb\Interfaces\Routing\IRoute;
+
+class Route implements IRoute
 {
     private string $id;
 

src/Routing/RouteCollection.php

@@ -1,8 +1,10 @@
 <?php namespace SokoWeb\Routing;
 
 use Closure;
+use SokoWeb\Interfaces\Routing\IRoute;
+use SokoWeb\Interfaces\Routing\IRouteCollection;
 
-class RouteCollection
+class RouteCollection implements IRouteCollection
 {
     private array $routes = [];
 
@@ -32,7 +34,7 @@ class RouteCollection
         array_pop($this->groupStack);
     }
 
-    public function getRoute(string $id): ?Route
+    public function getRoute(string $id): ?IRoute
     {
         if (!isset($this->routes[$id])) {
             return null;

src/Session/DatabaseSessionHandler.php

@@ -3,15 +3,23 @@
 use DateTime;
 use SokoWeb\Database\Query\Modify;
 use SokoWeb\Database\Query\Select;
+use SokoWeb\Interfaces\Database\IConnection;
 use SokoWeb\Interfaces\Database\IResultSet;
 use SokoWeb\Interfaces\Session\ISessionHandler;
 
 class DatabaseSessionHandler implements ISessionHandler
 {
+    private IConnection $dbConnection;
+
     private bool $exists = false;
 
     private bool $written = false;
 
+    public function __construct(IConnection $dbConnection)
+    {
+        $this->dbConnection = $dbConnection;
+    }
+
     public function open($savePath, $sessionName): bool
     {
         return true;
@@ -24,7 +32,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function read($id): string
     {
-        $select = new Select(\Container::$dbConnection, 'sessions');
+        $select = new Select($this->dbConnection, 'sessions');
         $select->columns(['data']);
         $select->whereId(substr($id, 0, 32));
 
@@ -41,7 +49,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function write($id, $data): bool
     {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, 'sessions');
 
         if ($this->exists) {
             $modify->setId(substr($id, 0, 32));
@@ -60,7 +68,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function destroy($id): bool
     {
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, 'sessions');
         $modify->setId(substr($id, 0, 32));
         $modify->delete();
 
@@ -93,7 +101,7 @@ class DatabaseSessionHandler implements ISessionHandler
             return true;
         }
 
-        $modify = new Modify(\Container::$dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, 'sessions');
 
         $modify->setId(substr($id, 0, 32));
         $modify->set('updated', (new DateTime())->format('Y-m-d H:i:s'));

templates/app.php.tpl

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

templates/web.php.tpl

@@ -14,7 +14,7 @@ Container::$routeCollection = new SokoWeb\Routing\RouteCollection();
 Container::$routeCollection->get('index', '', [{app}\Controller\HomeController::class, 'getIndex']);
 
 if (isset($_COOKIE['COOKIES_CONSENT'])) {
-    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler();
+    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler(Container::$dbConnection);
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([