src/Interfaces/Request/IRequest.php

@@ -4,7 +4,7 @@ use SokoWeb\Interfaces\Authentication\IUser;
 
 interface IRequest
 {
-    public function setParsedRouteParams(array $routeParams): void;
+    public function setParsedRouteParams(array &$routeParams): void;
 
     public function getBase(): string;
 

src/Request/Request.php

@@ -17,23 +17,23 @@ class Request implements IRequest
 
     private array $headers;
 
-    private ISession $session;
+    private Session $session;
 
     private ?IUser $user = null;
 
     public function __construct(
         string $base,
-        array $get,
+        array &$get,
-        array $post,
+        array &$post,
         array $headers,
-        ISession $session,
+        array &$session,
         IUserRepository $userRepository)
     {
         $this->base = $base;
-        $this->get = $get;
+        $this->get = &$get;
-        $this->post = $post;
+        $this->post = &$post;
         $this->headers = $headers;
-        $this->session = $session;
+        $this->session = new Session($session);
 
         $userId = $this->session->get('userId');
         if ($userId !== null) {
@@ -41,9 +41,9 @@ class Request implements IRequest
         }
     }
 
-    public function setParsedRouteParams(array $routeParams): void
+    public function setParsedRouteParams(array &$routeParams): void
     {
-        $this->routeParams = $routeParams;
+        $this->routeParams = &$routeParams;
     }
 
     public function getBase(): string

src/Session/DatabaseSessionHandler.php

@@ -11,16 +11,13 @@ class DatabaseSessionHandler implements ISessionHandler
 {
     private IConnection $dbConnection;
 
-    private string $table;
-
     private bool $exists = false;
 
     private bool $written = false;
 
-    public function __construct(IConnection $dbConnection, string $table)
+    public function __construct(IConnection $dbConnection)
     {
         $this->dbConnection = $dbConnection;
-        $this->table = $table;
     }
 
     public function open($savePath, $sessionName): bool
@@ -35,7 +32,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function read($id): string
     {
-        $select = new Select($this->dbConnection, $this->table);
+        $select = new Select($this->dbConnection, 'sessions');
         $select->columns(['data']);
         $select->whereId(substr($id, 0, 32));
 
@@ -52,7 +49,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function write($id, $data): bool
     {
-        $modify = new Modify($this->dbConnection, $this->table);
+        $modify = new Modify($this->dbConnection, 'sessions');
 
         if ($this->exists) {
             $modify->setId(substr($id, 0, 32));
@@ -71,7 +68,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function destroy($id): bool
     {
-        $modify = new Modify($this->dbConnection, $this->table);
+        $modify = new Modify($this->dbConnection, 'sessions');
         $modify->setId(substr($id, 0, 32));
         $modify->delete();
 
@@ -104,7 +101,7 @@ class DatabaseSessionHandler implements ISessionHandler
             return true;
         }
 
-        $modify = new Modify($this->dbConnection, $this->table);
+        $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/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::$dbConnection, 'sessions');
+    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler(Container::$dbConnection);
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([