Skip to content

Commit 368914a

Browse files
committed
Fix PHPStan nullCoalesce.expr errors
- Remove redundant double ?? [] patterns in ProviderConfig, RegisterProviders, RegisterFacades, VendorPublishCommand - Fix operator precedence issues: (int) $x ?? 0 → (int) ($x ?? 0) in SqsQueue, $a . $b ?? '' → $a . ($b ?? '') in Event - Remove dead ?? fallbacks after string casts/functions that never return null - Add ignore for defensive fallback in exception handler
1 parent 713d354 commit 368914a

File tree

12 files changed

+17
-17
lines changed

12 files changed

+17
-17
lines changed

src/config/src/ProviderConfig.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public static function load(): array
3636

3737
$providers = array_map(
3838
fn (array $package) => array_merge(
39-
Arr::wrap(($package['hyperf']['config'] ?? []) ?? []),
40-
Arr::wrap(($package['hypervel']['config'] ?? []) ?? []),
41-
Arr::wrap(($package['hypervel']['providers'] ?? []) ?? []),
39+
Arr::wrap($package['hyperf']['config'] ?? []),
40+
Arr::wrap($package['hypervel']['config'] ?? []),
41+
Arr::wrap($package['hypervel']['providers'] ?? []),
4242
),
4343
Composer::getMergedExtra()
4444
);

src/console/src/Scheduling/Event.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ public function mutexName(): string
711711
}
712712

713713
return 'framework' . DIRECTORY_SEPARATOR . 'schedule-'
714-
. sha1($this->expression . $this->command ?? '');
714+
. sha1($this->expression . ($this->command ?? ''));
715715
}
716716

717717
/**

src/devtool/src/Generator/ObserverCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function replaceClass(string $stub, string $name): string
3131
if (! $model = trim($this->input->getOption('model') ?? '')) {
3232
$modelParts = explode('\\', $name);
3333
$model = end($modelParts);
34-
$model = Str::ucfirst(Str::before($model, 'Observer')) ?? 'Dummy';
34+
$model = Str::ucfirst(Str::before($model, 'Observer'));
3535
}
3636

3737
$modelNamespace = $this->getConfig()['model_namespace'] ?? 'App\Models';

src/devtool/src/Generator/PolicyCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected function replaceClass(string $stub, string $name): string
3434
if (! $model = trim($this->input->getOption('model') ?? '')) {
3535
$modelParts = explode('\\', $name);
3636
$model = end($modelParts);
37-
$model = Str::ucfirst(Str::before($model, 'Policy')) ?? 'Dummy';
37+
$model = Str::ucfirst(Str::before($model, 'Policy'));
3838
}
3939

4040
$modelNamespace = $this->getConfig()['model_namespace'] ?? 'App\Models';

src/foundation/src/Bootstrap/RegisterFacades.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function bootstrap(ApplicationContract $app): void
2222

2323
$composerAliases = [];
2424
try {
25-
$composerAliases = Arr::wrap(Composer::getJsonContent()['extra']['hypervel']['aliases']) ?? [];
25+
$composerAliases = Arr::wrap(Composer::getJsonContent()['extra']['hypervel']['aliases'] ?? []);
2626
} catch (Throwable $e) {
2727
// do nothing
2828
}

src/foundation/src/Bootstrap/RegisterProviders.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function bootstrap(ApplicationContract $app): void
2323

2424
if (! in_array('*', $packagesToIgnore)) {
2525
$providers = array_map(
26-
fn (array $package) => Arr::wrap(($package['hypervel']['providers'] ?? []) ?? []),
26+
fn (array $package) => Arr::wrap($package['hypervel']['providers'] ?? []),
2727
Composer::getMergedExtra()
2828
);
2929
$providers = array_filter(

src/foundation/src/Console/Commands/VendorPublishCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ protected function getPackagePublishes(): array
115115
$extra = Composer::getMergedExtra();
116116
$packages = array_map(
117117
fn (array $package) => array_merge(
118-
Arr::wrap(($package['hyperf'] ?? []) ?? []),
119-
Arr::wrap(($package['hypervel'] ?? []) ?? []),
118+
Arr::wrap($package['hyperf'] ?? []),
119+
Arr::wrap($package['hypervel'] ?? []),
120120
),
121121
$extra
122122
);

src/foundation/src/Exceptions/Handler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ protected function prepareException(Throwable $e): Throwable
770770
$e instanceof ModelNotFoundException => new NotFoundHttpException($e->getMessage(), 0, $e),
771771
$e instanceof AuthorizationException && $e->hasStatus() => new HttpException(
772772
$e->status(),
773-
$e->response()?->message() ?: (BaseResponse::getReasonPhraseByCode($e->status()) ?? 'Whoops, looks like something went wrong.'),
773+
$e->response()?->message() ?: (BaseResponse::getReasonPhraseByCode($e->status()) ?? 'Whoops, looks like something went wrong.'), // @phpstan-ignore nullCoalesce.expr (defensive fallback)
774774
$e->getCode(),
775775
$e
776776
),

src/http/src/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public function wantsJson(): bool
456456
{
457457
$acceptable = explode(',', $this->header('Accept') ?? '');
458458

459-
return Str::contains(strtolower($acceptable[0]) ?? '', ['/json', '+json']);
459+
return Str::contains(strtolower($acceptable[0]), ['/json', '+json']);
460460
}
461461

462462
/**

src/queue/src/SqsQueue.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function pendingSize(?string $queue = null): int
7070
'AttributeNames' => ['ApproximateNumberOfMessages'],
7171
]);
7272

73-
return (int) $response['Attributes']['ApproximateNumberOfMessages'] ?? 0;
73+
return (int) ($response['Attributes']['ApproximateNumberOfMessages'] ?? 0);
7474
}
7575

7676
/**
@@ -83,7 +83,7 @@ public function delayedSize(?string $queue = null): int
8383
'AttributeNames' => ['ApproximateNumberOfMessagesDelayed'],
8484
]);
8585

86-
return (int) $response['Attributes']['ApproximateNumberOfMessagesDelayed'] ?? 0;
86+
return (int) ($response['Attributes']['ApproximateNumberOfMessagesDelayed'] ?? 0);
8787
}
8888

8989
/**
@@ -96,7 +96,7 @@ public function reservedSize(?string $queue = null): int
9696
'AttributeNames' => ['ApproximateNumberOfMessagesNotVisible'],
9797
]);
9898

99-
return (int) $response['Attributes']['ApproximateNumberOfMessagesNotVisible'] ?? 0;
99+
return (int) ($response['Attributes']['ApproximateNumberOfMessagesNotVisible'] ?? 0);
100100
}
101101

102102
/**

0 commit comments

Comments
 (0)