Fix upload image issue #2919

Author: marcelfolaron

app/Domain/Files/Repositories/Files.php

@@ -61,7 +61,7 @@ public function addFile($values, $module): false|string
             return $this->db->database->lastInsertId();
         }
 
-        public function getFile($id): mixed
+        public function getFile($id): array|false
         {
 
             $sql = 'SELECT

app/Domain/Setting/Repositories/Setting.php

@@ -29,7 +29,7 @@ public function __construct(DbCore $db, SettingCache $cache)
         /**
          * @return false|mixed
          */
-        public function getSetting($type): mixed
+        public function getSetting($type, $default = false): mixed
         {
             if ($this->checkIfInstalled() === false) {
                 return false;
@@ -70,7 +70,7 @@ public function getSetting($type): mixed
             $this->cache->set($type, false);
 
             // TODO: This needs to return null or throw an exception if the setting doesn't exist.
-            return false;
+            return $default;
         }
 
         public function saveSetting($type, $value): bool

app/Domain/Setting/Services/Setting.php

@@ -79,9 +79,9 @@ public function saveSetting($key, $value): bool
          *
          * @api
          */
-        public function getSetting($key): mixed
+        public function getSetting($key, $default = false): mixed
         {
-            return $this->settingsRepo->getSetting($key);
+            return $this->settingsRepo->getSetting($key, $default);
         }
 
         /**

app/Domain/Users/Repositories/Users.php

@@ -38,7 +38,8 @@ class Users
         public function __construct(
             protected Environment $config,
             protected DbCore $db,
-            protected Avatarcreator $avatarcreator
+            protected Avatarcreator $avatarcreator,
+            protected Files $files
         ) {
 
             $this->db = $db;
@@ -551,16 +552,16 @@ public function setPicture(array $_FILE, $id): void
             $values = $stmn->fetch();
             $stmn->closeCursor();
 
-            $files = app()->make(files::class);
-
             if (isset($values['profileId']) && $values['profileId'] > 0) {
-                $file = $files->getFile($values['profileId']);
-                $img = 'userdata/'.$file['encName'].$file['extension'];
 
-                $files->deleteFile($values['profileId']);
+                $file = $this->files->getFile($values['profileId']);
+                if (is_array($file)) {
+                    $img = 'userdata/'.$file['encName'].$file['extension'];
+                    $this->files->deleteFile($values['profileId']);
+                }
             }
 
-            $lastId = $files->upload($_FILE, 'user', $id, true, 200, 200);
+            $lastId = $this->files->upload($_FILE, 'user', $id, true, 200, 200);
 
             if (isset($lastId['fileId'])) {
                 $sql = 'UPDATE
@@ -580,11 +581,6 @@ public function setPicture(array $_FILE, $id): void
             }
         }
 
-        /**
-         * @return string[]|SVG
-         *
-         * @throws BindingResolutionException
-         */
         /**
          * @return string[]|SVG
          *
@@ -614,8 +610,7 @@ public function getProfilePicture($id): array|SVG
             // If user uploaded return uploaded file
             if (! empty($value['profileId'])) {
 
-                $files = app()->make(Files::class);
-                $file = $files->getFile($value['profileId']);
+                $file = $this->files->getFile($value['profileId']);
 
                 if ($file) {
                     $filePath = $file['encName'].'.'.$file['extension'];