Fix more errors

diff --git a/src/App.php b/src/App.php
index 48574662fd385c65c05ccd626800b92b27ad7e32..58c617c1184ad69533cded7c0202b2f928325f41 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -447,6 +447,7 @@ class App implements AppHelper
                $requeststring = ($server['REQUEST_METHOD'] ?? '') . ' ' . ($server['REQUEST_URI'] ?? '') . ' ' . ($server['SERVER_PROTOCOL'] ?? '');
                $this->logger->debug('Request received', ['address' => $server['REMOTE_ADDR'] ?? '', 'request' => $requeststring, 'referer' => $server['HTTP_REFERER'] ?? '', 'user-agent' => $server['HTTP_USER_AGENT'] ?? '']);
                $request_start = microtime(true);
+               $request = $_REQUEST;
 
                $this->profiler->set($start_time, 'start');
                $this->profiler->set(microtime(true), 'classinit');
@@ -581,7 +582,7 @@ class App implements AppHelper
 
                        // Processes data from GET requests
                        $httpinput = $httpInput->process();
-                       $input     = array_merge($httpinput['variables'], $httpinput['files'], $request ?? $_REQUEST);
+                       $input     = array_merge($httpinput['variables'], $httpinput['files'], $request);
 
                        // Let the module run its internal process (init, get, post, ...)
                        $timestamp = microtime(true);

diff --git a/src/BaseModule.php b/src/BaseModule.php
index e0c97afce2d6278c0c7d43023241941f76ec154d..a98da3a088802f48af612e2ca2fdd0bdf4b959c9 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -269,7 +269,7 @@ abstract class BaseModule implements ICanHandleRequests
                        $request[$parameter] = $this->getRequestValue($input, $parameter, $defaultvalue);
                }
 
-               foreach ($input ?? [] as $parameter => $value) {
+               foreach ($input as $parameter => $value) {
                        if ($parameter == 'pagename') {
                                continue;
                        }

diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php
index 978a35a74beb3ddf7f89677a9fc1ed4bc4c70b10..90a35630e1f5f06d93c04ece27f394dccfb0798a 100644 (file)
--- a/src/Console/MoveToAvatarCache.php
+++ b/src/Console/MoveToAvatarCache.php
@@ -12,7 +12,6 @@ use Friendica\Contact\Avatar;
 use Friendica\Core\L10n;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
-use Friendica\Util\Images;
 use Friendica\Object\Image;
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Protocol;
@@ -115,6 +114,10 @@ HELP;
 
        private function storeAvatar(string $resourceid, array $contact, bool $quit_on_invalid)
        {
+               $photo   = false;
+               $imgdata = false;
+               $image   = null;
+
                $valid = !empty($resourceid);
                if ($valid) {
                        $this->out('1', false);
@@ -143,7 +146,7 @@ HELP;
                        }
                }
 
-               if ($valid) {
+               if ($valid && $image instanceof Image) {
                        $this->out('4', false);
                        $fields = Avatar::storeAvatarByImage($contact, $image);
                } else {