From ae4fe1dc6914ffce7bd5b8ba45c82db54cb9778e Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Sun, 24 Sep 2023 14:56:44 +0000
Subject: [PATCH] rector fixes

---
 .../PdfDefaultTemplate/pdfTemplate.pdf.php    |  6 +----
 Controller/ApiController.php                  | 24 ++++++++-----------
 tests/Bootstrap.php                           |  4 ++--
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/Admin/Install/Media/PdfDefaultTemplate/pdfTemplate.pdf.php b/Admin/Install/Media/PdfDefaultTemplate/pdfTemplate.pdf.php
index 91827c6..f1db8e7 100755
--- a/Admin/Install/Media/PdfDefaultTemplate/pdfTemplate.pdf.php
+++ b/Admin/Install/Media/PdfDefaultTemplate/pdfTemplate.pdf.php
@@ -161,11 +161,7 @@ class DefaultPdf extends TCPDF
             $dx = ($this->original_lMargin - $this->original_rMargin);
         }
 
-        if ($this->rtl) {
-            $x = $this->w + $dx;
-        } else {
-            $x = 0 + $dx;
-        }
+        $x = $this->rtl ? $this->w + $dx : 0 + $dx;
 
         $this->printTemplate($this->header_xobjid, $x, 0, 0, 0, '', '', false);
         if ($this->header_xobj_autoreset) {
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index f179a83..ded07e6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -712,7 +712,7 @@ final class ApiController extends Controller
      */
     private function createSettingFromRequest(RequestAbstract $request) : Setting
     {
-        $setting = new Setting(
+        return new Setting(
             id: $request->getDataInt('id') ?? 0,
             name: $request->getDataString('name') ?? '',
             content: $request->getDataString('content') ?? '',
@@ -724,8 +724,6 @@ final class ApiController extends Controller
             account: $request->getDataInt('account'),
             isEncrypted: $request->getDataBool('encrypted') ?? false
         );
-
-        return $setting;
     }
 
     /**
@@ -1845,17 +1843,17 @@ final class ApiController extends Controller
             $request->setData('status', AccountStatus::INACTIVE, true);
             $request->setData('type', AccountType::USER, true);
             $request->setData('create_profile', (string) true);
-            $request->setData('name1', !$request->hasData('name1')
-                ? (!$request->hasData('user')
-                    ? \explode('@', $request->getDataString('email') ?? '')[0]
-                    : $request->getDataString('user')
+            $request->setData('name1', $request->hasData('name1')
+                ? ($request->getDataString('name1')
                 )
-                : $request->getDataString('name1')
+                : ($request->hasData('user')
+                    ? $request->getDataString('user')
+                    : \explode('@', $request->getDataString('email') ?? '')[0])
                 , true);
 
-            $request->setData('user', !$request->hasData('user')
-                ? $request->getDataString('email')
-                : $request->getDataString('user')
+            $request->setData('user', $request->hasData('user')
+                ? $request->getDataString('user')
+                : $request->getDataString('email')
                 , true);
 
             $this->apiAccountCreate($request, $response, $data);
@@ -3600,9 +3598,7 @@ final class ApiController extends Controller
      */
     private function createDataChangeFromRequest() : DataChange
     {
-        $data = new DataChange();
-
-        return $data;
+        return new DataChange();
     }
 
     /**
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index b904f0c..44438e2 100755
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -381,7 +381,7 @@ function phpServe() : void
 
     // Execute the command and store the process ID
     $output = [];
-    echo \sprintf('Starting server...') . \PHP_EOL;
+    echo 'Starting server...' . \PHP_EOL;
     echo \sprintf(' Current directory: %s', \getcwd()) . \PHP_EOL;
     echo \sprintf(' %s', $command);
     \exec($command, $output);
@@ -406,7 +406,7 @@ function phpServe() : void
 
     // Kill the web server when the process ends
     \register_shutdown_function(function() use ($killCommand, $pid) : void {
-        echo \PHP_EOL . \sprintf('Stopping server...') . \PHP_EOL;
+        echo \PHP_EOL . 'Stopping server...' . \PHP_EOL;
         echo \sprintf(' %s - Killing process with ID %d', \date('r'), $pid) . \PHP_EOL;
         \exec($killCommand . $pid);
     });