Apply fixes from StyleCI

LibreNMS/Enum/ServiceStatus.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ServiceStatus.php
  *

LibreNMS/Exceptions/ServiceCheckNotExecutableException.php

@@ -4,5 +4,4 @@
 
 class ServiceCheckNotExecutableException extends ServiceException
 {
-
 }

LibreNMS/Exceptions/ServiceCheckNotFoundException.php

@@ -4,5 +4,4 @@
 
 class ServiceCheckNotFoundException extends ServiceException
 {
-
 }

LibreNMS/Exceptions/ServiceException.php

@@ -4,5 +4,4 @@
 
 class ServiceException extends \Exception
 {
-
 }

LibreNMS/Services/Checks/CheckIcmp.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CheckIcmp.php
  *
@@ -33,7 +34,6 @@
 
 class CheckIcmp extends Service
 {
-
     public function parameters(): array
     {
         return [
@@ -53,12 +53,12 @@
             new ServiceOption('outgoing-ttl', 'l', ['outgoing-ttl' => 'int|min:0']),
             new ServiceOption('timeout', 't'),
             new ServiceOption('bytes', 'b'),
-            new ServiceOption('verbose', 'v', mode: InputOption::VALUE_NONE|InputOption::VALUE_IS_ARRAY),
-            new ServiceOption('Host', 'H', ['Host' => 'required|ip_or_hostname'], mode: InputOption::VALUE_IS_ARRAY)
+            new ServiceOption('verbose', 'v', mode: InputOption::VALUE_NONE | InputOption::VALUE_IS_ARRAY),
+            new ServiceOption('Host', 'H', ['Host' => 'required|ip_or_hostname'], mode: InputOption::VALUE_IS_ARRAY),
         ];
     }
 
     public function dataSets(string $rrd_filename = '', ?string $ds = null): array
     {
         $dataSets = [
             new ServiceDataSet('rta', 's', [
@@ -91,7 +91,7 @@
             ]),
         ];
 
-        return array_filter($dataSets, fn($dataSet) => $ds === null || $ds === $dataSet->name);
+        return array_filter($dataSets, fn ($dataSet) => $ds === null || $ds === $dataSet->name);
     }
 
     public function graph(string $rrd_filename = ''): array
@@ -100,11 +100,11 @@
             'rta' => [
                 'unit' => 's',
                 'commands' => [
-                     'DEF:DS0=' . $rrd_filename . ':rta:AVERAGE',
-                     'LINE1.25:DS0#' . LibrenmsConfig::get('graph_colours.mixed.0') . ':' . str_pad(substr('Round Trip Average', 0, 15), 15),
-                     'GPRINT:DS0:LAST:%5.2lf%s',
-                     'GPRINT:DS0:AVERAGE:%5.2lf%s',
-                     'GPRINT:DS0:MAX:%5.2lf%s\\l',
+                    'DEF:DS0=' . $rrd_filename . ':rta:AVERAGE',
+                    'LINE1.25:DS0#' . LibrenmsConfig::get('graph_colours.mixed.0') . ':' . str_pad(substr('Round Trip Average', 0, 15), 15),
+                    'GPRINT:DS0:LAST:%5.2lf%s',
+                    'GPRINT:DS0:AVERAGE:%5.2lf%s',
+                    'GPRINT:DS0:MAX:%5.2lf%s\\l',
                 ],
             ],
             'rtmax' => [
@@ -115,7 +115,7 @@
                     'GPRINT:DS1:LAST:%5.2lf%s',
                     'GPRINT:DS1:AVERAGE:%5.2lf%s',
                     'GPRINT:DS1:MAX:%5.2lf%s\\l',
-                ]
+                ],
             ],
             'rtmin' => [
                 'unit' => 's',
@@ -133,7 +133,7 @@
                 'GPRINT:DS0:LAST:%5.2lf%s',
                 'GPRINT:DS0:AVERAGE:%5.2lf%s',
                 'GPRINT:DS0:MAX:%5.2lf%s\\l',
-            ]
+            ],
         ];
     }
 }

LibreNMS/Services/Checks/CheckLoad.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CheckLoad.php
  *
@@ -38,29 +39,29 @@
             new ServiceOption('warning', 'w', default: '5,5,5'),
             new ServiceOption('critical', 'c', default: '10,10,10'),
             new ServiceOption('percpu', 'p', ['percpu' => 'int']),
-            new ServiceOption('procs-to-show', )
+            new ServiceOption('procs-to-show'),
         ];
     }
 
     public function dataSets(string $rrd_filename = '', ?string $ds = null): array
     {
         return [
             new ServiceDataSet('load', 'processes', [
-                    'DEF:DS0=' . $rrd_filename . ':load1:AVERAGE',
-                    'LINE1.25:DS0#' . LibrenmsConfig::get('graph_colours.mixed.0') . ':' . str_pad(substr('Load 1', 0, 15), 15),
-                    'GPRINT:DS0:LAST:%5.2lf%s',
-                    'GPRINT:DS0:AVERAGE:%5.2lf%s',
-                    'GPRINT:DS0:MAX:%5.2lf%s\\l',
-                    'DEF:DS1=' . $rrd_filename . ':load5:AVERAGE',
-                    'LINE1.25:DS1#' . LibrenmsConfig::get('graph_colours.mixed.1') . ':' . str_pad(substr('Load 5', 0, 15), 15),
-                    'GPRINT:DS1:LAST:%5.2lf%s',
-                    'GPRINT:DS1:AVERAGE:%5.2lf%s',
-                    'GPRINT:DS1:MAX:%5.2lf%s\\l',
-                    'DEF:DS2=' . $rrd_filename . ':load15:AVERAGE',
-                    'LINE1.25:DS2#' . LibrenmsConfig::get('graph_colours.mixed.2') . ':' . str_pad(substr('Load 15', 0, 15), 15),
-                    'GPRINT:DS2:LAST:%5.2lf%s',
-                    'GPRINT:DS2:AVERAGE:%5.2lf%s',
-                    'GPRINT:DS2:MAX:%5.2lf%s\\l',
+                'DEF:DS0=' . $rrd_filename . ':load1:AVERAGE',
+                'LINE1.25:DS0#' . LibrenmsConfig::get('graph_colours.mixed.0') . ':' . str_pad(substr('Load 1', 0, 15), 15),
+                'GPRINT:DS0:LAST:%5.2lf%s',
+                'GPRINT:DS0:AVERAGE:%5.2lf%s',
+                'GPRINT:DS0:MAX:%5.2lf%s\\l',
+                'DEF:DS1=' . $rrd_filename . ':load5:AVERAGE',
+                'LINE1.25:DS1#' . LibrenmsConfig::get('graph_colours.mixed.1') . ':' . str_pad(substr('Load 5', 0, 15), 15),
+                'GPRINT:DS1:LAST:%5.2lf%s',
+                'GPRINT:DS1:AVERAGE:%5.2lf%s',
+                'GPRINT:DS1:MAX:%5.2lf%s\\l',
+                'DEF:DS2=' . $rrd_filename . ':load15:AVERAGE',
+                'LINE1.25:DS2#' . LibrenmsConfig::get('graph_colours.mixed.2') . ':' . str_pad(substr('Load 15', 0, 15), 15),
+                'GPRINT:DS2:LAST:%5.2lf%s',
+                'GPRINT:DS2:AVERAGE:%5.2lf%s',
+                'GPRINT:DS2:MAX:%5.2lf%s\\l',
             ]),
         ];
     }

LibreNMS/Services/LegacyService.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * LegacyService.php
  *
@@ -68,7 +69,7 @@ public function dataSets(string $rrd_filename = '', array $ds = []): array
             $graphs = $vars['check_graph'] ?? [];
             foreach ($sets as $name => $unit) {
                 $commands = $graphs[$name] ?? $this->defaultGraphCommands($rrd_filename, $name);
-                $dataSets[] = new ServiceDataSet($name, $unit,is_array($commands) ? $commands : [$commands]);
+                $dataSets[] = new ServiceDataSet($name, $unit, is_array($commands) ? $commands : [$commands]);
             }
 
             return $dataSets;

LibreNMS/Services/Service.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Service.php
  *
@@ -38,15 +39,17 @@
 
     public function __construct(
         public readonly string $type = '',
-    ) {}
+    ) {
+    }
 
     /**
-     * @param Device $device
-     * @param \App\Models\Service $service
+     * @param  Device  $device
+     * @param  \App\Models\Service  $service
      * @return string[]
+     *
      * @throws ServiceException
      */
     public function buildCommand(\App\Models\Service $service): array
     {
         $bin = $this->getExecutable();
 
@@ -60,8 +63,8 @@
 
         $command = [$bin];
         foreach ($this->parameters() as $parameter) {
             if (isset($values[$parameter->name])) {
                 $command = array_merge($command, $parameter->format($values[$parameter->name]));
             }
         }
 

LibreNMS/Services/ServiceArgument.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Parameter.php
  *

LibreNMS/Services/ServiceDataSet.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ServiceDataSet.php
  *
@@ -31,5 +32,6 @@ public function __construct(
         public string $name,
         public string $unit,
         public array $graphCommands,
-    ) {}
+    ) {
+    }
 }

LibreNMS/Services/ServiceFactory.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ServiceFactory.php
  *

LibreNMS/Services/ServiceOption.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Option.php
  *
@@ -34,7 +35,7 @@
         public mixed $default = null,
         public int $mode = 0,
     ) {
         if ($this->short === null && $this->long === null) {
             throw new \RuntimeException('Must have one of long or short option name');
         }
     }
@@ -45,13 +46,13 @@
      */
     public function format(float|bool|int|string|null $value): array
     {
-        if ($value)
-
-        if ($this->short) {
-            return [$this->short, (string) $value];
+        if ($value) {
+            if ($this->short) {
+                return [$this->short, (string) $value];
+            }
         }
 
         if ($this->long) {
             return ["$this->long=$value"];
         }
 

app/Models/Service.php

@@ -38,13 +38,12 @@ protected function serviceParam(): Attribute
 
                 if (is_array($params)) {
                     return $params;
-                };
+                }
 
                 $params = [];
                 $values = explode(' ', $value);
                 foreach ($values as $index => $value) {
                     if (str_starts_with($value, '-')) {
-
                     }
                 }
 

database/migrations/2025_12_14_144851_add_timestamps_to_services_table.php

@@ -16,7 +16,7 @@ public function up(): void
     {
         if (! Schema::hasColumn($this->table, 'updated_at')) {
             Schema::table($this->table, function (Blueprint $table) {
-                    $table->timestamps();
+                $table->timestamps();
             });
         }
 

includes/services.inc.php

@@ -24,7 +24,7 @@ function add_service($device, $type, $desc, $ip = '', $param = '', $ignore = 0,
         'service_ds' => '{}',
         'service_disabled' => $disabled,
         'service_template_id' => $template_id,
-        'service_name' => $name
+        'service_name' => $name,
     ]);
 }
 

lang/en/services.php

@@ -4,17 +4,17 @@
     'load' => [
         'options' => [
             'warning' => [
-                'help' => 'Exit with WARNING status if load average exceeds WLOADn'
+                'help' => 'Exit with WARNING status if load average exceeds WLOADn',
             ],
             'critical' => [
-                'help' => 'Exit with CRITICAL status if load average exceeds CLOADn'
+                'help' => 'Exit with CRITICAL status if load average exceeds CLOADn',
             ],
             'percpu' => [
-                'help' => 'Divide the load averages by the number of CPUs (when possible)'
+                'help' => 'Divide the load averages by the number of CPUs (when possible)',
             ],
             'procs-to-show' => [
-                'help' => "Number of processes to show when printing the top consuming processes.\nNUMBER_OF_PROCS=0 disables this feature. Default value is 0"
-            ]
+                'help' => "Number of processes to show when printing the top consuming processes.\nNUMBER_OF_PROCS=0 disables this feature. Default value is 0",
+            ],
         ],
     ],
 ];