From 84fb308b3a672692033976da8d8dac8258f4feb2 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 16 Aug 2022 19:03:59 +0200
Subject: [PATCH] fix stupid asignments

---
 DataStorage/Database/Mapper/DataMapperFactory.php | 14 ++++++++------
 Log/FileLogger.php                                |  8 ++++----
 Message/Http/HttpRequest.php                      |  1 -
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/DataStorage/Database/Mapper/DataMapperFactory.php b/DataStorage/Database/Mapper/DataMapperFactory.php
index 6e31d3ce3..8f9410b95 100644
--- a/DataStorage/Database/Mapper/DataMapperFactory.php
+++ b/DataStorage/Database/Mapper/DataMapperFactory.php
@@ -598,11 +598,12 @@ class DataMapperFactory
                             $secondaryId
                         );
 
-                    $cloned->where('', $where)
+                    $cloned
+                        ->where('', $where)
                         ->sort($primarySortField, OrderType::DESC);
                 }
 
-                $data = $mapper->execute();
+                $data = $cloned->execute();
 
                 $hasNext = $count > $pageLimit;
                 if ($hasNext) {
@@ -632,7 +633,7 @@ class DataMapperFactory
                 $data = \array_reverse($data);
             }
         } elseif ($type === 'n') {
-            $mapper->sort($sortBy, $sortOrder)
+            $mapper = $mapper->sort($sortBy, $sortOrder)
                 ->where($sortBy, $secondaryId, $sortOrder === OrderType::DESC ? '<=' : '>=')
                 ->limit($pageLimit + 2);
 
@@ -645,7 +646,8 @@ class DataMapperFactory
                         $secondaryId
                     );
 
-                $mapper->where('', $where)
+                $mapper = $mapper
+                    ->where('', $where)
                     ->sort($primarySortField, OrderType::DESC);
             }
 
@@ -677,11 +679,11 @@ class DataMapperFactory
                 --$count;
             }
         } else {
-            $mapper = $mapper->sort($sortBy, $sortOrder)
+            $mapper->sort($sortBy, $sortOrder)
                 ->limit($pageLimit + 1);
 
             if (!$sortById) {
-                $mapper = $mapper->sort($primarySortField, OrderType::DESC);
+                $mapper->sort($primarySortField, OrderType::DESC);
             }
 
             $data = $mapper->execute();
diff --git a/Log/FileLogger.php b/Log/FileLogger.php
index a90ad49f6..fb67dc8e1 100644
--- a/Log/FileLogger.php
+++ b/Log/FileLogger.php
@@ -98,7 +98,7 @@ final class FileLogger implements LoggerInterface
      *
      * @since 1.0.0
      */
-    public function __construct(string $lpath, bool $verbose = false)
+    public function __construct(string $lpath = '', bool $verbose = false)
     {
         $path          = \realpath(empty($lpath) ? __DIR__ . '/../../' : $lpath);
         $this->verbose = $verbose;
@@ -126,17 +126,17 @@ final class FileLogger implements LoggerInterface
     /**
      * Returns instance.
      *
-     * @param string $path    Logging path
+     * @param string $lpath   Logging path
      * @param bool   $verbose Verbose logging
      *
      * @return FileLogger
      *
      * @since 1.0.0
      */
-    public static function getInstance(string $path = '', bool $verbose = false) : self
+    public static function getInstance(string $lpath = '', bool $verbose = false) : self
     {
         if (!isset(self::$instance)) {
-            self::$instance = new self($path, $verbose);
+            self::$instance = new self($lpath, $verbose);
         }
 
         return self::$instance;
diff --git a/Message/Http/HttpRequest.php b/Message/Http/HttpRequest.php
index 3e0fb2f35..e0fbf4a67 100644
--- a/Message/Http/HttpRequest.php
+++ b/Message/Http/HttpRequest.php
@@ -91,7 +91,6 @@ final class HttpRequest extends RequestAbstract
     public function initRequest() : void
     {
         $this->initCurrentRequest();
-        $this->lock();
         self::cleanupGlobals();
 
         $this->data = \array_change_key_case($this->data, \CASE_LOWER);