diff --git a/.gitignore b/.gitignore index 3f5dc1196..6f7ac05c2 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,3 @@ /storage/psalm-reports /psalm.sarif.json /.psalm-cache -.kiro/ diff --git a/app/Console/Commands/Admin/SendUpdateActor.php b/app/Console/Commands/Admin/SendUpdateActor.php index 6ac28c27b..194974d46 100644 --- a/app/Console/Commands/Admin/SendUpdateActor.php +++ b/app/Console/Commands/Admin/SendUpdateActor.php @@ -57,13 +57,13 @@ class SendUpdateActor extends Command return Instance::where('domain', 'like', '%'.$input.'%')->pluck('domain')->toArray(); }); if (! $this->confirm('Are you sure you want to send actor updates to '.$domain.'?')) { - return; + return null; } if ($cur = Instance::whereDomain($domain)->whereNotNull('actors_last_synced_at')->first()) { if (! $this->option('force')) { $this->error('ERROR: Cannot re-sync this instance, it was already synced on '.$cur->actors_last_synced_at); - return; + return null; } } $this->touchStorageCache($domain); @@ -73,7 +73,7 @@ class SendUpdateActor extends Command if (! $sharedInbox) { $this->error('ERROR: Cannot find the sharedInbox of '.$domain); - return; + return null; } $url = $sharedInbox->sharedInbox; $this->line(' '); diff --git a/app/Http/Controllers/Admin/AdminDirectoryController.php b/app/Http/Controllers/Admin/AdminDirectoryController.php index f9e933210..b65ac1f38 100644 --- a/app/Http/Controllers/Admin/AdminDirectoryController.php +++ b/app/Http/Controllers/Admin/AdminDirectoryController.php @@ -306,7 +306,7 @@ trait AdminDirectoryController $bannerImage = ConfigCache::whereK('app.banner_image')->first(); $directory = ConfigCache::whereK('pixelfed.directory')->first(); if (! $bannerImage && ! $directory || empty($directory->v)) { - return; + return null; } $directoryArr = json_decode($directory->v, true); $path = isset($directoryArr['banner_image']) ? $directoryArr['banner_image'] : false; @@ -316,7 +316,7 @@ trait AdminDirectoryController 'public/headers/missing.png', ]; if (! $path || in_array($path, $protected)) { - return; + return null; } if (Storage::exists($directoryArr['banner_image'])) { Storage::delete($directoryArr['banner_image']); diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index f67cc92b7..f1eccd5e2 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -308,7 +308,7 @@ trait AdminReportController Cache::forget('profiles:private'); DeleteAccountPipeline::dispatch($user); - return; + return null; } if ($action == 'dismiss') { @@ -792,6 +792,7 @@ trait AdminReportController return [200]; } + return null; } protected function reportsHandleProfileAction($report, $action) @@ -819,7 +820,7 @@ trait AdminReportController } if (! $profile) { - return; + return null; } abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.'); @@ -879,7 +880,7 @@ trait AdminReportController } if (! $profile) { - return; + return null; } abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.'); @@ -939,7 +940,7 @@ trait AdminReportController } if (! $profile) { - return; + return null; } abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot moderate an admin account.'); @@ -1003,7 +1004,7 @@ trait AdminReportController } if (! $profile) { - return; + return null; } abort_if($profile->user && $profile->user->is_admin, 400, 'Cannot delete an admin account.'); @@ -1069,6 +1070,7 @@ trait AdminReportController return [200]; } + return null; } protected function reportsHandleStatusAction($report, $action) @@ -1220,6 +1222,7 @@ trait AdminReportController return [200]; } + return null; } public function reportsApiSpamAll(Request $request) diff --git a/app/Jobs/InboxPipeline/DeleteWorker.php b/app/Jobs/InboxPipeline/DeleteWorker.php index 84cf88058..38d8665ce 100644 --- a/app/Jobs/InboxPipeline/DeleteWorker.php +++ b/app/Jobs/InboxPipeline/DeleteWorker.php @@ -53,14 +53,14 @@ class DeleteWorker implements ShouldQueue if (! $headers) { Log::info('DeleteWorker: Headers not provided, skipping job'); - return; + return null; } // Verify payload exists if (! $payload) { Log::info('DeleteWorker: Payload not provided, skipping job'); - return; + return null; } $payload = json_decode($payload, true, 8); @@ -68,13 +68,13 @@ class DeleteWorker implements ShouldQueue if (! isset($headers['signature']) || ! isset($headers['date'])) { Log::info('DeleteWorker: Missing signature or date in headers, skipping job'); - return; + return null; } if (! $headers || ! $payload) { Log::info('DeleteWorker: Empty headers or payload, skipping job'); - return; + return null; } if ($payload['type'] === 'Delete' && diff --git a/app/Services/NotificationAppGatewayService.php b/app/Services/NotificationAppGatewayService.php index 928a2c76f..df3441179 100644 --- a/app/Services/NotificationAppGatewayService.php +++ b/app/Services/NotificationAppGatewayService.php @@ -119,7 +119,8 @@ class NotificationAppGatewayService $response->throw(); } catch (RequestException|Exception) { - return; + return null; } + return null; } } diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index d5a7dcca6..dd734b6ca 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -1102,7 +1102,7 @@ class Helpers public static function storePoll($profile, $res, $url, $ts, $reply_to, $cw, $scope, $id) { if (! isset($res['endTime']) || ! isset($res['oneOf']) || ! is_array($res['oneOf']) || count($res['oneOf']) > 4) { - return; + return null; } $options = collect($res['oneOf'])->map(function ($option) {