aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6290 from pixelfed/emptyv1

Browse Source 
Larastan: 'empty() always exists and is not falsy' errors - Low risk
pull/6311/head^2
dansup 6 days ago committed by GitHub
parent b7813cca7d 72e840345e
commit 6df58e67f2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

2
app/Http/Controllers/GroupController.php
Unescape Escape View File

@ -636,7 +636,7 @@ class GroupController extends GroupFederationController
{
abort_unless(config('groups.enabled'), 404);
$group = GroupService::get($id);
abort_if(! $group || empty($group), 404);
abort_if(! $group, 404);
return view('groups.invite-claim', compact('group'));
}

2
app/Http/Controllers/ProfileAliasController.php
Unescape Escape View File

@ -50,7 +50,7 @@ class ProfileAliasController extends Controller
$webfingerService = WebfingerService::lookup($acct);
$webfingerUrl = WebfingerService::rawGet($acct);
if (! $webfingerService || ! isset($webfingerService['url']) || ! $webfingerUrl || empty($webfingerUrl)) {
if (! $webfingerService || ! isset($webfingerService['url']) || ! $webfingerUrl) {
return back()->with('error', 'Invalid account, cannot add alias at this time.');
}
$alias = new ProfileAlias;

2
app/Jobs/ImageOptimizePipeline/ImageUpdate.php
Unescape Escape View File

@ -118,7 +118,7 @@ class ImageUpdate implements ShouldQueue
$disk = Storage::disk(config('filesystems.default'));
$localFs = config('filesystems.default') === 'local';
if (! $path || empty($path)) {
if (! $path) {
return 0;
}

2
app/Jobs/InboxPipeline/DeleteWorker.php
Unescape Escape View File

@ -71,7 +71,7 @@ class DeleteWorker implements ShouldQueue
return;
}
if(empty($headers) || empty($payload)) {
if(!$headers || !$payload) {
Log::info("DeleteWorker: Empty headers or payload, skipping job");
return;
}

6
app/Jobs/InboxPipeline/InboxValidator.php
Unescape Escape View File

@ -73,7 +73,7 @@ class InboxValidator implements ShouldQueue
return;
}
if(empty($headers) || empty($payload) || !isset($headers['signature']) || !isset($headers['date'])) {
if(!$headers || !$payload || !isset($headers['signature']) || !isset($headers['date'])) {
Log::info("InboxValidator: Invalid headers or payload structure, skipping job");
return;
}
@ -97,7 +97,7 @@ class InboxValidator implements ShouldQueue
return;
}
if(empty($profile) || empty($headers) || empty($payload)) {
if(!$profile || !$headers || !$payload) {
return;
}
@ -233,7 +233,7 @@ class InboxValidator implements ShouldQueue
}
$res = json_decode($res->body(), true, 8);
if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
if(!$res || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
return;
}
if($res['publicKey']['id'] !== $actor->key_id) {

4
app/Jobs/InboxPipeline/InboxWorker.php
Unescape Escape View File

@ -64,7 +64,7 @@ class InboxWorker implements ShouldQueue
return;
}
if(empty($headers) || empty($payload) || !isset($headers['signature']) || !isset($headers['date'])) {
if(!$headers || !$payload || !isset($headers['signature']) || !isset($headers['date'])) {
Log::info("InboxWorker: Invalid headers or payload structure, skipping job");
return;
}
@ -201,7 +201,7 @@ class InboxWorker implements ShouldQueue
}
$res = json_decode($res->body(), true, 8);
if(!$res || empty($res) || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
if(!$res || !isset($res['publicKey']) || !isset($res['publicKey']['id'])) {
return;
}
if($res['publicKey']['id'] !== $actor->key_id) {

2
app/Jobs/ProfilePipeline/HandleUpdateActivity.php
Unescape Escape View File

@ -44,7 +44,7 @@ class HandleUpdateActivity implements ShouldQueue
return;
}
if (empty($payload) || ! isset($payload['actor'])) {
if (! $payload || ! isset($payload['actor'])) {
Log::info("HandleUpdateActivity: Invalid payload or missing actor, skipping job");
return;
}

2
app/Rules/ExpoPushTokenRule.php
Unescape Escape View File

@ -14,7 +14,7 @@ class ExpoPushTokenRule implements ValidationRule
*/
public function validate(string $attribute, mixed $value, Closure $fail): void
{
if (! $value || empty($value)) {
if (! $value) {
$fail('The :attribute must not be empty.');
}

2
app/Services/AutospamService.php
Unescape Escape View File

@ -73,7 +73,7 @@ class AutospamService
return Cache::remember(self::MODEL_CACHE_KEY, 86400, function () {
$res = Storage::get(self::MODEL_FILE_PATH);
if (! $res || empty($res)) {
if (! $res) {
return null;
}

2
app/Services/CollectionService.php
Unescape Escape View File

@ -131,7 +131,7 @@ class CollectionService
public static function getThumb($id)
{
$item = self::getItems($id, 0, 1);
if(!$item || empty($item)) {
if(!$item) {
return url('/storage/no-preview.png');
}
$status = StatusService::get($item[0]);

10
app/Services/NotificationAppGatewayService.php
Unescape Escape View File

@ -23,7 +23,7 @@ class NotificationAppGatewayService
}
$apiKey = config('instance.notifications.nag.api_key');
if (! $apiKey || empty($apiKey) || strlen($apiKey) !== 45) {
if (! $apiKey || strlen($apiKey) !== 45) {
return false;
}
@ -64,7 +64,7 @@ class NotificationAppGatewayService
public static function isValidExpoPushToken($token)
{
if (! $token || empty($token)) {
if (! $token) {
return false;
}
@ -89,19 +89,19 @@ class NotificationAppGatewayService
return false;
}
if (! $userToken || empty($userToken) || ! self::isValidExpoPushToken($userToken)) {
if (! $userToken || ! self::isValidExpoPushToken($userToken)) {
return false;
}
$types = PushNotificationService::NOTIFY_TYPES;
if (! $type || empty($type) || ! in_array($type, $types)) {
if (! $type || ! in_array($type, $types)) {
return false;
}
$apiKey = config('instance.notifications.nag.api_key');
if (! $apiKey || empty($apiKey)) {
if (! $apiKey) {
return false;
}
$url = 'https://'.config('instance.notifications.nag.endpoint').'/api/v1/relay/deliver';

2
app/Services/WebfingerService.php
Unescape Escape View File

@ -20,7 +20,7 @@ class WebfingerService
if (! $n) {
return false;
}
if (empty($n) || ! str_starts_with($n, 'https://')) {
if (! str_starts_with($n, 'https://')) {
return false;
}
$host = parse_url($n, PHP_URL_HOST);

5
app/Util/ActivityPub/Helpers.php
Unescape Escape View File

@ -302,7 +302,7 @@ class Helpers
$uri = Uri::new($url);
$host = $uri->getHost();
if (! $host || empty($host)) {
if (! $host) {
return false;
}
@ -338,7 +338,7 @@ class Helpers
return Cache::remember($key, $ttl, function () use ($url) {
$res = ActivityPubFetchService::get($url);
if (! $res || empty($res)) {
if (! $res) {
return false;
}
$res = json_decode($res, true, 8);
@ -477,7 +477,6 @@ class Helpers
public static function isValidStatusData(?array $res): bool
{
return $res &&
! empty($res) &&
! isset($res['error']) &&
isset($res['@context']) &&
isset($res['published']);

Write Preview
Loading…
Cancel
Save