Rector 2.3 fixes

Author: murrant

LibreNMS/Alert/Transport/Pagerduty.php

@@ -49,7 +49,7 @@ public function deliverAlert(array $alert_data): bool
         } else {
             // Legacy behaviour: strip tags and split into non-empty lines
             $safe_message = strip_tags($msg_raw) ?: 'Test';
-            $message = array_filter(explode("\n", $safe_message), fn ($value): bool => strlen($value) > 0);
+            $message = array_filter(explode("\n", $safe_message), fn ($value): bool => strlen((string) $value) > 0);
             $custom_details = ['message' => $message];
         }
         $data = [

LibreNMS/OS/ArubaInstant.php

@@ -282,7 +282,7 @@ protected function decodeChannel($channel): int
      */
     public function pollWirelessFrequency(array $sensors)
     {
-        return $this->pollWirelessChannelAsFrequency($sensors, [$this, 'decodeChannel']);
+        return $this->pollWirelessChannelAsFrequency($sensors, $this->decodeChannel(...));
     }
 
     /**

LibreNMS/OS/Arubaos.php

@@ -215,6 +215,6 @@ public function discoverWirelessUtilization()
      */
     public function pollWirelessFrequency(array $sensors)
     {
-        return $this->pollWirelessChannelAsFrequency($sensors, [$this, 'decodeChannel']);
+        return $this->pollWirelessChannelAsFrequency($sensors, $this->decodeChannel(...));
     }
 }

LibreNMS/OS/Iosxe.php

@@ -106,7 +106,7 @@ public function discoverIsIs(): Collection
                         'isisISAdjNeighSysID' => $this->formatIsIsId($adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjNeighSysID'] ?? ''),
                         'isisISAdjNeighPriority' => $adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjNeighPriority'] ?? '',
                         'isisISAdjLastUpTime' => $this->parseAdjacencyTime($adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjLastUpTime'] ?? 0),
-                        'isisISAdjAreaAddress' => implode(',', array_map([$this, 'formatIsIsId'], $adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjAreaAddress'] ?? [])),
+                        'isisISAdjAreaAddress' => implode(',', array_map($this->formatIsIsId(...), $adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjAreaAddress'] ?? [])),
                         'isisISAdjIPAddrType' => implode(',', $adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjIPAddrType'] ?? []),
                         'isisISAdjIPAddrAddress' => implode(',', array_map(fn ($ip) => (string) IP::fromHexString($ip, true), $adjacency_data['CISCO-IETF-ISIS-MIB::ciiISAdjIPAddrAddress'] ?? [])),
                     ]));

LibreNMS/Validations/Database/CheckSchemaStructure.php

@@ -203,8 +203,8 @@ private function checkSchema(): void
 
     private function addTableSql(string $table, array $table_schema): string
     {
-        $columns = array_map([$this, 'columnToSql'], $table_schema['Columns']);
-        $indexes = array_map([$this, 'indexToSql'], $table_schema['Indexes'] ?? []);
+        $columns = array_map($this->columnToSql(...), $table_schema['Columns']);
+        $indexes = array_map($this->indexToSql(...), $table_schema['Indexes'] ?? []);
 
         $def = implode(', ', array_merge(array_values($columns), array_values($indexes)));
 

app/Console/Commands/ReportDevices.php

@@ -252,13 +252,13 @@ public function completeOptionValue(DynamicInputOption $option, string $current)
                 ->merge(Schema::getColumnListing('devices'))
                 ->merge(array_keys($this->getSyntheticFields()))
                 ->merge(Device::definedRelations())
-                ->when($current, fn ($c) => $c->filter(fn ($i) => str_starts_with($i, $current)));
+                ->when($current, fn ($c) => $c->filter(fn ($i) => str_starts_with((string) $i, $current)));
         }
 
         if ($option->getName() == 'relationships') {
             return collect()
                 ->merge($this->getRelationships())
-                ->when($current, fn ($c) => $c->filter(fn ($i) => str_starts_with($i, $current)));
+                ->when($current, fn ($c) => $c->filter(fn ($i) => str_starts_with((string) $i, $current)));
         }
 
         return null;

app/Http/Controllers/Device/Tabs/QosController.php

@@ -57,7 +57,7 @@ public function data(Device $device, Request $request): array
         $show = null;
         $vars = $request->vars;
         if ($vars) {
-            $showvars = array_filter(explode('/', $vars), fn ($v) => str_starts_with($v, 'show='));
+            $showvars = array_filter(explode('/', $vars), fn ($v) => str_starts_with((string) $v, 'show='));
             if ($showvars) {
                 $showvar = explode('=', $showvars[0]);
                 $show = array_pop($showvar);

app/Http/Controllers/Table/GraylogController.php

@@ -86,7 +86,7 @@ public function __invoke(Request $request, GraylogApi $api)
             $messages = $data['messages'] ?? [];
 
             return $this->formatResponse(
-                array_map([$this, 'formatMessage'], $messages),
+                array_map($this->formatMessage(...), $messages),
                 $page,
                 count($messages),
                 $data['total_results'] ?? 0,

includes/discovery/sensors/ipmi.inc.php

@@ -35,7 +35,7 @@
             Log::debug('Trying IPMI type: ' . $ipmi_type);
             $results = explode(PHP_EOL, (string) external_exec(array_merge($cmd, ['-I', $ipmi_type, 'sensor'])));
 
-            $results = array_values(array_filter($results, fn ($line) => ! Str::contains($line, 'discrete') && trim($line) !== ''));
+            $results = array_values(array_filter($results, fn ($line) => ! Str::contains($line, 'discrete') && trim((string) $line) !== ''));
 
             if (! empty($results)) {
                 set_dev_attrib($device, 'ipmi_type', $ipmi_type);

includes/html/pages/iftype.inc.php

@@ -15,7 +15,7 @@
     return strtolower((string) $descr);
 });
 array_walk($types_array, function (&$type) use ($ctypes): void {
-    $name = $ctypes->get(strtolower($type), $type);
+    $name = $ctypes->get(strtolower((string) $type), $type);
     $type = ucwords(is_array($name) ? $name[0] : $name);
 });