From 51a2201b8e7102e14d98ab3ff16d3cc683d6f97d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 26 Jun 2021 14:38:08 +0200
Subject: [PATCH] fix phpstan/phpcs

---
 Models/SessionMapper.php | 16 ++++++++--------
 composer.json            |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php
index 8aca8e0..f76f616 100755
--- a/Models/SessionMapper.php
+++ b/Models/SessionMapper.php
@@ -119,8 +119,8 @@ final class SessionMapper extends DataMapperAbstract
         $depth = 3;
         $query = self::getQuery();
         $query->innerJoin($join, 'tm')
-            ->on(self::$table . '_' . $depth . '.hr_timerecording_session_employee', '=', 'tm.hr_timerecording_session_employee')
-            ->andOn(self::$table . '_' . $depth . '.hr_timerecording_session_start', '=', 'tm.maxDate');
+            ->on(self::$table . '_d' . $depth . '.hr_timerecording_session_employee', '=', 'tm.hr_timerecording_session_employee')
+            ->andOn(self::$table . '_d' . $depth . '.hr_timerecording_session_start', '=', 'tm.maxDate');
 
         return self::getAllByQuery($query, RelationType::ALL, $depth);
     }
@@ -145,9 +145,9 @@ final class SessionMapper extends DataMapperAbstract
 
         $depth = 3;
         $query = self::getQuery();
-        $query->where(self::$table . '_' . $depth . '.hr_timerecording_session_employee', '=', $employee)
-            ->andWhere(self::$table . '_' . $depth . '.hr_timerecording_session_start', '>', $dt)
-            ->orderBy(self::$table . '_' . $depth . '.hr_timerecording_session_start', 'DESC')
+        $query->where(self::$table . '_d' . $depth . '.hr_timerecording_session_employee', '=', $employee)
+            ->andWhere(self::$table . '_d' . $depth . '.hr_timerecording_session_start', '>', $dt)
+            ->orderBy(self::$table . '_d' . $depth . '.hr_timerecording_session_start', 'DESC')
             ->limit(1);
 
         /** @var Session[] $sessions */
@@ -181,9 +181,9 @@ final class SessionMapper extends DataMapperAbstract
         $depth = 3;
         $query = new Builder(self::$db);
         $query = self::getQuery($query)
-            ->where(self::$table . '_' . $depth . '.hr_timerecording_session_employee', '=', $employee)
-            ->andWhere(self::$table . '_' . $depth . '.' . self::$createdAt, '<=', $start->format('Y-m-d H:i:s'))
-            ->orderBy(self::$table . '_' . $depth . '.' . self::$createdAt, 'DESC')
+            ->where(self::$table . '_d' . $depth . '.hr_timerecording_session_employee', '=', $employee)
+            ->andWhere(self::$table . '_d' . $depth . '.' . self::$createdAt, '<=', $start->format('Y-m-d H:i:s'))
+            ->orderBy(self::$table . '_d' . $depth . '.' . self::$createdAt, 'DESC')
             ->offset($offset)
             ->limit($limit);
 
diff --git a/composer.json b/composer.json
index 8f2fb6d..7ad134b 100755
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
     ],
     "require-dev": {
         "phpunit/phpunit": ">=9.4",
-        "friendsofphp/php-cs-fixer": ">=2.18",
+        "friendsofphp/php-cs-fixer": ">=3.0",
         "squizlabs/php_codesniffer": ">=3.5",
         "phpmd/phpmd": ">=2.9",
         "phpstan/phpstan": ">=0.12.58",