Rector up to PHP 7.4 (librenms#18437)

* Rector up to PHP 7.4
Arrow functions are here

* Update phpstan baseline for fixed issue

* Style fix

* Remove unused ??

Author: murrant

LibreNMS/Alert/RunAlerts.php

@@ -394,10 +394,9 @@ public function runFollowUp()
      */
     private function extractIdFieldsForFault($element)
     {
-        return array_filter(array_keys($element), function ($key) {
+        return array_filter(array_keys($element), fn ($key) =>
             // Exclude location_id as it is not relevant for the comparison
-            return ($key === 'id' || strpos($key, '_id')) !== false && $key !== 'location_id';
-        });
+            ($key === 'id' || strpos($key, '_id')) !== false && $key !== 'location_id');
     }
 
     /**

LibreNMS/Alert/Transport/Browserpush.php

@@ -37,9 +37,7 @@ class Browserpush extends Transport
 
     public function deliverAlert(array $alert_data): bool
     {
-        $users = User::when($this->config['user'] ?? 0, function ($query, $user_id) {
-            return $query->where('user_id', $user_id);
-        })->get();
+        $users = User::when($this->config['user'] ?? 0, fn ($query, $user_id) => $query->where('user_id', $user_id))->get();
 
         Notification::send($users, new AlertNotification(
             $alert_data['alert_id'],

LibreNMS/Alert/Transport/Pagerduty.php

@@ -42,9 +42,7 @@ public function deliverAlert(array $alert_data): bool
         };
 
         $safe_message = strip_tags($alert_data['msg']) ?: 'Test';
-        $message = array_filter(explode("\n", $safe_message), function ($value): bool {
-            return strlen($value) > 0;
-        });
+        $message = array_filter(explode("\n", $safe_message), fn ($value): bool => strlen($value) > 0);
         $data = [
             'routing_key' => $this->config['service_key'],
             'event_action' => $event_action,

LibreNMS/Alerting/QueryBuilderFilter.php

@@ -123,9 +123,7 @@ private function generateTableFilter()
                     ];
                 } elseif ($type == 'enum') {// format enums as radios
                     $values = explode(',', substr($column_type, 4));
-                    $values = array_map(function ($val) {
-                        return trim($val, "()' ");
-                    }, $values);
+                    $values = array_map(fn ($val) => trim($val, "()' "), $values);
 
                     $this->filter[$field] = [
                         'id' => $field,

LibreNMS/Alerting/QueryBuilderParser.php

@@ -327,9 +327,7 @@ public function getGlue($parent, $child)
         $shared_keys = array_filter(array_intersect(
             $this->schema->getColumns($parent),
             $this->schema->getColumns($child)
-        ), function ($table) {
-            return Str::endsWith($table, '_id');
-        });
+        ), fn ($table) => Str::endsWith($table, '_id'));
 
         if (count($shared_keys) === 1) {
             $shared_key = reset($shared_keys);

LibreNMS/Cache/PermissionsCache.php

@@ -282,10 +282,8 @@ public function getDeviceGroupPermissionsQuery()
         return DB::table('devices_group_perms')
         ->select('devices_group_perms.user_id', 'device_group_device.device_id')
         ->join('device_group_device', 'device_group_device.device_group_id', '=', 'devices_group_perms.device_group_id')
-        ->when(! LibrenmsConfig::get('permission.device_group.allow_dynamic'), function ($query) {
-            return $query
-                ->join('device_groups', 'device_groups.id', '=', 'devices_group_perms.device_group_id')
-                ->where('device_groups.type', 'static');
-        });
+        ->when(! LibrenmsConfig::get('permission.device_group.allow_dynamic'), fn ($query) => $query
+            ->join('device_groups', 'device_groups.id', '=', 'devices_group_perms.device_group_id')
+            ->where('device_groups.type', 'static'));
     }
 }

LibreNMS/Component.php

@@ -51,9 +51,7 @@ class Component
 
     public function getComponentCount($device_id = null)
     {
-        $counts = \App\Models\Component::query()->when($device_id, function ($query, $device_id) {
-            return $query->where('device_id', $device_id);
-        })->selectRaw('type, count(*) as count')->groupBy('type')->pluck('count', 'type');
+        $counts = \App\Models\Component::query()->when($device_id, fn ($query, $device_id) => $query->where('device_id', $device_id))->selectRaw('type, count(*) as count')->groupBy('type')->pluck('count', 'type');
 
         return $counts->isEmpty() ? false : $counts->all();
     }
@@ -115,12 +113,8 @@ public function getComponents($device_id = null, $options = [])
         }
 
         // get and format results as expected by receivers
-        return $query->get()->groupBy('device_id')->map(function ($group) {
-            return $group->keyBy('id')->map(function ($component) {
-                return $component->prefs->pluck('value', 'attribute')
-                    ->merge($component->only(array_keys($this->reserved)));
-            });
-        })->toArray();
+        return $query->get()->groupBy('device_id')->map(fn ($group) => $group->keyBy('id')->map(fn ($component) => $component->prefs->pluck('value', 'attribute')
+            ->merge($component->only(array_keys($this->reserved)))))->toArray();
     }
 
     public function getComponentStatus($device = null)
@@ -233,9 +227,7 @@ public function setComponentPrefs($device_id, $updated)
                 if ($component->isDirty()) {
                     // Log the update to the Eventlog.
                     $message = "Component $component->id has been modified: ";
-                    $message .= collect($component->getDirty())->map(function ($value, $key) {
-                        return "$key => $value";
-                    })->implode(',');
+                    $message .= collect($component->getDirty())->map(fn ($value, $key) => "$key => $value")->implode(',');
 
                     // If the Status has changed we need to add a log entry
                     if ($component->isDirty('status')) {
@@ -248,9 +240,7 @@ public function setComponentPrefs($device_id, $updated)
                 }
 
                 // update preferences
-                $prefs = collect($updated[$component->id])->filter(function ($value, $attr) {
-                    return ! array_key_exists($attr, $this->reserved);
-                });
+                $prefs = collect($updated[$component->id])->filter(fn ($value, $attr) => ! array_key_exists($attr, $this->reserved));
 
                 $invalid = $component->prefs->keyBy('id');
 

LibreNMS/DB/Schema.php

@@ -74,9 +74,7 @@ public static function getUnexpectedMigrations()
     private static function getMigrationFiles()
     {
         $migrations = collect(glob(base_path('database/migrations/') . '*.php'))
-            ->map(function ($migration_file) {
-                return basename($migration_file, '.php');
-            });
+            ->map(fn ($migration_file) => basename($migration_file, '.php'));
 
         return $migrations;
     }
@@ -235,9 +233,7 @@ private function findPathRecursive(array $tables, $target, $history = [])
                     }
                 }
             } else {
-                $relations = array_keys(array_filter($relationships, function ($related) use ($table) {
-                    return in_array($table, $related);
-                }));
+                $relations = array_keys(array_filter($relationships, fn ($related) => in_array($table, $related)));
 
                 d_echo("Dead end at $table, searching for relationships " . json_encode($relations) . PHP_EOL);
                 $recurse = $this->findPathRecursive($relations, $target, array_merge($history, $tables));
@@ -353,9 +349,7 @@ public static function dump($connection = null)
             }
 
             $keys = DB::connection($connection)->select(DB::raw("SHOW INDEX FROM `$table`")->getValue(DB::connection($connection)->getQueryGrammar()));
-            usort($keys, function ($a, $b) {
-                return $a->Key_name <=> $b->Key_name;
-            });
+            usort($keys, fn ($a, $b) => $a->Key_name <=> $b->Key_name);
             foreach ($keys as $key) {
                 $key_name = $key->Key_name;
                 if (isset($output[$table]['Indexes'][$key_name])) {

LibreNMS/Data/Source/NetSnmpQuery.php

@@ -506,9 +506,7 @@ private function mibDirectories(): string
         }
 
         // remove trailing /, remove empty dirs, and remove duplicates
-        $dirs = array_unique(array_filter(array_map(function ($dir) {
-            return rtrim($dir, '/');
-        }, $dirs)));
+        $dirs = array_unique(array_filter(array_map(fn ($dir) => rtrim($dir, '/'), $dirs)));
 
         return implode(':', $dirs);
     }

LibreNMS/Data/Source/SnmpResponse.php

@@ -192,7 +192,7 @@ public function values(): array
     public function pluck(?string $oid = null): array
     {
         $output = [];
-        $oid = $oid ?? '[a-zA-Z0-9:.-]+';
+        $oid ??= '[a-zA-Z0-9:.-]+';
         $regex = "/^{$oid}[[.]([\d.[\]]+?)]?$/";
 
         foreach ($this->values() as $key => $value) {