Skip to content

Apply fixes from StyleCI #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
murrant wants to merge 1 commit into from
Closed

Apply fixes from StyleCI #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions app/Http/Controllers/Table/AlertRuleController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* AlertRuleController.php
*
Expand Down Expand Up @@ -33,7 +34,7 @@

class AlertRuleController extends TableController
{
private ?array $defaultAlertRules = null;

Check failure on line 37 in app/Http/Controllers/Table/AlertRuleController.php

View workflow job for this annotation

GitHub Actions / PHP Static Analysis 

Property App\Http\Controllers\Table\AlertRuleController::$defaultAlertRules (array|null) is never assigned array so it can be removed from the property type.

protected function rules()
{
Expand All @@ -58,22 +59,22 @@
protected function baseQuery(Request $request)
{
return AlertRule::query()
->when($request->get('device'), fn($query, $device_id) => $query->where(function ($query) use ($device_id): void {
->when($request->get('device'), fn ($query, $device_id) => $query->where(function ($query) use ($device_id): void {
// Rules where invert_map is false/null (normal behavior)
$query->where(fn($query) => $query->where(function ($query): void {
$query->where(fn ($query) => $query->where(function ($query): void {
$query->where('invert_map', false)
->orWhereNull('invert_map');
})->where(fn($query) =>
})->where(fn ($query) =>
// Match if device is in any relationship OR no relationships exist
$query->whereHas('devices', fn ($q) => $q->where('devices.device_id', $device_id))
->orWhereHas('groups', fn ($q) => $q->whereHas('devices', fn ($q) => $q->where('devices.device_id', $device_id)))
->orWhereHas('locations', fn ($q) => $q->whereHas('devices', fn ($q) => $q->where('devices.device_id', $device_id)))
->orWhere(fn($query) => $query->whereDoesntHave('devices')
->orWhere(fn ($query) => $query->whereDoesntHave('devices')
->whereDoesntHave('groups')
->whereDoesntHave('locations'))))
// Rules where invert_map is true (inverted behavior)
->orWhere(fn($query) => $query->where('invert_map', true)
->where(fn($query) =>
->orWhere(fn ($query) => $query->where('invert_map', true)
->where(fn ($query) =>
// Must have at least one relationship
$query->has('devices')
->orHas('groups')
Expand Down Expand Up @@ -115,7 +116,7 @@
{
$devices = [];

foreach($alertRule->devices as $device) {
foreach ($alertRule->devices as $device) {
$devices[] = [
'type' => 'device',
'id' => $device->device_id,
Expand All @@ -124,7 +125,7 @@
];
}

foreach($alertRule->groups as $group) {
foreach ($alertRule->groups as $group) {
$devices[] = [
'type' => 'group',
'id' => $group->id,
Expand All @@ -133,7 +134,7 @@
];
}

foreach($alertRule->locations as $location) {
foreach ($alertRule->locations as $location) {
$devices[] = [
'type' => 'location',
'id' => $location->id,
Expand All @@ -149,15 +150,15 @@
{
$transports = [];

foreach($alertRule->transportSingles as $transport) {
foreach ($alertRule->transportSingles as $transport) {
$transports[] = [
'type' => 'single',
'id' => $transport->transport_id,
'name' => $transport->transport_name,
];
}

foreach($alertRule->transportGroups as $transport) {
foreach ($alertRule->transportGroups as $transport) {
$transports[] = [
'type' => 'group',
'id' => $transport->transport_group_id,
Expand Down
2 changes: 1 addition & 1 deletion routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
// jquery bootgrid data controllers
Route::prefix('table')->group(function (): void {
Route::post('alert-schedule', Table\AlertScheduleController::class);
Route::any('alert-rule', Table\AlertRuleController::class)->name('table.alert-rule');;
Route::any('alert-rule', Table\AlertRuleController::class)->name('table.alert-rule');
Route::post('customers', Table\CustomersController::class);
Route::post('diskio', Table\DiskioController::class)->name('table.diskio');
Route::post('device', Table\DeviceController::class)->name('table.device');
Expand Down
Loading