Merge pull request 'use the correct table alias in joins 'on clause'' (#17) from bugfix/fix-multiple-level-join-table-alias into master

Reviewed-on: #17

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/PersistentData/PersistentDataManager.php

@@ -150,7 +150,7 @@ class PersistentDataManager implements IPersistentDataManager
 
             $columns = array_merge($columns, $this->getRelationColumns($table, $relations, $withRelations));
 
-            $this->leftJoinRelations($select, $table, $relations, $withRelations);
+            $this->leftJoinRelations($select, $table, $table, $relations, $withRelations);
             $select->columns($columns);
         } else {
             $select->columns($columns);
@@ -180,19 +180,19 @@ class PersistentDataManager implements IPersistentDataManager
         return $columns;
     }
 
-    private function leftJoinRelations(Select $select, string $table, array $relations, array $withRelations): void
+    private function leftJoinRelations(Select $select, string $table, string $tableAlias, array $relations, array $withRelations): void
     {
         foreach ($relations as $relation => $relationType) {
             $relationTableAlias = $table . '__' . $relation;
             $relationTable = call_user_func([$relationType, 'getTable']);
             $select->setTableAliases([$relationTableAlias => $relationTable]);
-            $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$table, $relation . '_id']);
+            $select->leftJoin($relationTableAlias, [$relationTableAlias, 'id'], '=', [$tableAlias, $relation . '_id']);
 
             $relationsOfRelation = call_user_func([$relationType, 'getRelations']);
             if (count($withRelations)) {
                 $relationsOfRelation = array_intersect_key($relationsOfRelation, array_flip($withRelations));
             }
-            $this->leftJoinRelations($select, $relationTable, $relationsOfRelation, $withRelations);
+            $this->leftJoinRelations($select, $relationTable, $relationTableAlias, $relationsOfRelation, $withRelations);
         }
     }
 

src/Request/Request.php

@@ -17,23 +17,23 @@ class Request implements IRequest
 
     private array $headers;
 
-    private Session $session;
+    private ISession $session;
 
     private ?IUser $user = null;
 
     public function __construct(
         string $base,
-        array &$get,
-        array &$post,
+        array $get,
+        array $post,
         array $headers,
-        array &$session,
+        ISession $session,
         IUserRepository $userRepository)
     {
         $this->base = $base;
-        $this->get = &$get;
-        $this->post = &$post;
+        $this->get = $get;
+        $this->post = $post;
         $this->headers = $headers;
-        $this->session = new Session($session);
+        $this->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,13 +11,19 @@ class DatabaseSessionHandler implements ISessionHandler
 {
     private IConnection $dbConnection;
 
+    private string $table;
+
+    private DateTime $shouldBeNewerThan;
+
     private bool $exists = false;
 
     private bool $written = false;
 
-    public function __construct(IConnection $dbConnection)
+    public function __construct(IConnection $dbConnection, string $table, DateTime $shouldBeNewerThan)
     {
         $this->dbConnection = $dbConnection;
+        $this->table = $table;
+        $this->shouldBeNewerThan = $shouldBeNewerThan;
     }
 
     public function open($savePath, $sessionName): bool
@@ -32,24 +38,27 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function read($id): string
     {
-        $select = new Select($this->dbConnection, 'sessions');
-        $select->columns(['data']);
+        $select = new Select($this->dbConnection, $this->table);
+        $select->columns(['data', 'updated']);
         $select->whereId(substr($id, 0, 32));
 
         $result = $select->execute()->fetch(IResultSet::FETCH_ASSOC);
-
         if ($result === null) {
             return '';
         }
 
         $this->exists = true;
 
+        if (new DateTime($result['updated']) < $this->shouldBeNewerThan) {
+            return '';
+        }
+
         return $result['data'];
     }
 
     public function write($id, $data): bool
     {
-        $modify = new Modify($this->dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
 
         if ($this->exists) {
             $modify->setId(substr($id, 0, 32));
@@ -68,7 +77,7 @@ class DatabaseSessionHandler implements ISessionHandler
 
     public function destroy($id): bool
     {
-        $modify = new Modify($this->dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
         $modify->setId(substr($id, 0, 32));
         $modify->delete();
 
@@ -101,7 +110,7 @@ class DatabaseSessionHandler implements ISessionHandler
             return true;
         }
 
-        $modify = new Modify($this->dbConnection, 'sessions');
+        $modify = new Modify($this->dbConnection, $this->table);
 
         $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);
+    Container::$sessionHandler = new SokoWeb\Session\DatabaseSessionHandler(Container::$dbConnection, 'sessions');
 
     session_set_save_handler(Container::$sessionHandler, true);
     session_start([