Fix receiving of reshared posts

[friendica.git] / src / Core / Worker.php

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 726dade8cf300b958210832a59e0de66e88b302d..f7ab2bc7c81e1e560f0b7ebf357aab6ac803e19e 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -104,7 +104,7 @@ class Worker
                        foreach ($r as $entry) {
                                // The work will be done
                                if (!self::execute($entry)) {
-                                       Logger::notice('Process execution failed, quitting.');
+                                       Logger::warning('Process execution failed, quitting.', ['entry' => $entry]);
                                        return;
                                }
 
@@ -787,10 +787,10 @@ class Worker
        /**
         * Returns waiting jobs for the current process id
         *
-        * @return array waiting workerqueue jobs
+        * @return array|bool waiting workerqueue jobs or FALSE on failture
         * @throws \Exception
         */
-       private static function getWaitingJobForPID(): array
+       private static function getWaitingJobForPID()
        {
                $stamp = (float)microtime(true);
                $r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
@@ -1011,7 +1011,9 @@ class Worker
 
                DI::lock()->release(self::LOCK_PROCESS);
 
-               return self::getWaitingJobForPID();
+               // Prevents "Return value of Friendica\Core\Worker::workerProcess() must be of the type array, bool returned"
+               $process = self::getWaitingJobForPID();
+               return (is_array($process) ? $process : []);
        }
 
        /**