diff --git a/LibreNMS/Interfaces/Module.php b/LibreNMS/Interfaces/Module.php index 746ac4e873e646846b076273b382de3093605d7c..5985e4875e1c77a0e405c0e20aebb3665fe367ff 100644 --- a/LibreNMS/Interfaces/Module.php +++ b/LibreNMS/Interfaces/Module.php @@ -91,7 +91,7 @@ interface Module public function dump(Device $device, string $type): ?array; /** - * @return string[] an array of column names that can be used for sorting + * @return string[] an array of column names that can be used for sorting */ public function getSortColumns(string $table): array; } diff --git a/LibreNMS/Modules/LegacyModule.php b/LibreNMS/Modules/LegacyModule.php index 03c50e166de8a90300df0986be2df59ff73a5be9..cc56d6b6060b8963b3d26b751cfa1faaf983a6d7 100644 --- a/LibreNMS/Modules/LegacyModule.php +++ b/LibreNMS/Modules/LegacyModule.php @@ -196,7 +196,7 @@ class LegacyModule implements Module { $def = $this->moduleDumpDefinition(); - return array_map(fn($r) => trim($r), explode(',', $def[$table]['order_by'])); + return array_map(fn ($r) => trim($r), explode(',', $def[$table]['order_by'])); } private function moduleDumpDefinition(): array diff --git a/LibreNMS/Modules/Stp.php b/LibreNMS/Modules/Stp.php index f7778d8abfe676e0b69d791509a9053b80570296..c00fb1409798bc15292296fcf56875ff03374c12 100644 --- a/LibreNMS/Modules/Stp.php +++ b/LibreNMS/Modules/Stp.php @@ -120,7 +120,7 @@ class Stp implements Module public function getSortColumns(string $table): array { - return match($table) { + return match ($table) { 'stp' => ['bridgeAddress'], 'ports_stp' => ['port_index'], default => [], diff --git a/LibreNMS/Modules/Vlans.php b/LibreNMS/Modules/Vlans.php index 5fd8ee7c60c069ff89c3076e4e3ee58038bc745e..7d0c5d915607d4f15996201ba8401b99ebe66a1b 100644 --- a/LibreNMS/Modules/Vlans.php +++ b/LibreNMS/Modules/Vlans.php @@ -142,7 +142,7 @@ class Vlans implements Module public function getSortColumns(string $table): array { - return match($table) { + return match ($table) { 'vlans' => ['vlan_vlan'], 'ports_vlans' => ['vlan', 'baseport'], default => [], diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index e8e462aba333d74334086c9e360f854e0bc3eb49..21a782c19fdba23de40761146aae58e16c3a971f 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -274,8 +274,9 @@ class AppServiceProvider extends ServiceProvider */ Builder::macro('orderByColumns', function (array $columns, string $direction = 'asc') { foreach ($columns as $column) { - $this->orderBy($column, $direction); + $this->orderBy($column, $direction); } + return $this; }); } diff --git a/tests/Traits/ManipulatesModuleTestData.php b/tests/Traits/ManipulatesModuleTestData.php index 450532629f4fe1c792c638e238154657bfe532c7..ac4fc25917f09cac97e6bf6411031baa48cc3a63 100644 --- a/tests/Traits/ManipulatesModuleTestData.php +++ b/tests/Traits/ManipulatesModuleTestData.php @@ -1,4 +1,5 @@