From a5e544b8e2f350cc3befd9865d25a6e3e8bec66d Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nnes.com@googlemail.com>
Date: Fri, 15 Mar 2024 21:57:48 +0000
Subject: [PATCH] more code fixes

---
 Controller/ApiController.php | 6 +++---
 Controller/CliController.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index c516138..de996e1 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -399,7 +399,7 @@ final class ApiController extends Controller
             $mail->template,
             [
                 '{reset_link}' => $resetLink,
-                '{user_name}'  => $account->login,
+                '{user_name}'  => (string) $account->login,
             ]
         );
 
@@ -534,7 +534,7 @@ final class ApiController extends Controller
             $mail->template,
             [
                 '{new_password}' => $pass,
-                '{user_name}'    => $account->login,
+                '{user_name}'    => (string) $account->login,
             ]
         );
 
@@ -1964,7 +1964,7 @@ final class ApiController extends Controller
                     '{confirmation_link}' => UriFactory::hasQuery('/' . \strtolower($app->name))
                         ? UriFactory::build('{/' . \strtolower($app->name) . '}/' . \strtolower($app->name) . '/signup/confirmation?hash=' . $dataChange->getHash())
                         : UriFactory::build('{/tld}/{/lang}/' . \strtolower($app->name) . '/signup/confirmation?hash=' . $dataChange->getHash()),
-                    '{user_name}' => $account->login,
+                    '{user_name}' => (string) $account->login,
                 ]
             );
 
diff --git a/Controller/CliController.php b/Controller/CliController.php
index 1b8a699..ed95e44 100755
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -148,7 +148,7 @@ final class CliController extends Controller
         $mapper = SettingMapper::yield()
             ->where('isEncrypted', true);
 
-        foreach ($mapper->execute() as $setting) {
+        foreach ($mapper->executeYield() as $setting) {
             $decrypted = empty($data['old']) || empty($setting->content)
                 ? $setting->content
                 : EncryptionHelper::decryptShared($setting->content ?? '', $data['old']);