rector and black fixes

Author: murrant

LibreNMS/Alert/AlertNotifications.php

@@ -235,12 +235,12 @@ public function getNotificationData(Alert $alert): array|bool
     public function clearStaleAlerts(): void
     {
         Alert::where('state', '!=', AlertState::CLEAR)
-            ->where(function ($query) {
+            ->where(function ($query): void {
                 $query->whereDoesntHave('device')
                     ->orWhereDoesntHave('rule');
             })
             ->get()
-            ->each(function (Alert $alert) {
+            ->each(function (Alert $alert): void {
                 echo "Stale-alert: #{$alert->id}" . PHP_EOL;
                 $alert->delete();
             });
@@ -312,7 +312,7 @@ public function issueAlert(Alert $alert): bool
     public function runAcks(): void
     {
         $this->loadAlerts('alerts.state = ' . AlertState::ACKNOWLEDGED . ' && alerts.open = ' . AlertState::ACTIVE)
-            ->each(function (Alert $alert) {
+            ->each(function (Alert $alert): void {
                 $rextra = $alert->rule->extra;
                 if ($rextra['acknowledgement'] ?? true) {
                     $this->issueAlert($alert);
@@ -329,7 +329,7 @@ public function runAcks(): void
     public function runFollowUp(): void
     {
         $this->loadAlerts('alerts.state > ' . AlertState::CLEAR . ' && alerts.open = 0')
-            ->each(function (Alert $alert) {
+            ->each(function (Alert $alert): void {
                 $this->processFollowUp($alert);
             });
     }
@@ -518,7 +518,7 @@ public function loadAlerts(string $where): Collection
     public function runAlerts(): void
     {
         $this->loadAlerts('alerts.state != ' . AlertState::ACKNOWLEDGED . ' && alerts.open = 1')
-            ->each(function (Alert $alert) {
+            ->each(function (Alert $alert): void {
                 $this->processAlert($alert);
             });
     }

LibreNMS/queuemanager.py

@@ -403,9 +403,12 @@ def do_work(self, context, group):
                 logger.info("Running fast ping")
 
                 args = (
-                    ("device:ping", "fast", "--scheduler=dispatcher", "-vv", "-g", group)
-                    if self.config.debug
-                    else ("device:ping", "fast", "--scheduler=dispatcher", "-q", "-g", group)
+                    "device:ping",
+                    "fast",
+                    "--scheduler=dispatcher",
+                    "-vv" if self.config.debug else "-q",
+                    "-g",
+                    group,
                 )
                 exit_code, output = LibreNMS.call_script("lnms", args)
 

tests/Feature/AlertNotificationsTest.php

@@ -118,7 +118,7 @@ public function testRunAlertsSendsNotification(): void
         $alerts->runAlerts();
         $output = ob_get_clean();
 
-        if (strpos($output, 'Muted') !== false) {
+        if (str_contains($output, 'Muted')) {
             echo "\nDEBUG OUTPUT:\n" . $output . "\n";
             $loaded = $alerts->loadAlerts('alerts.id = ' . $alert->id);
             var_dump($loaded);