Apply fixes from StyleCI

LibreNMS/Enum/PollingMethodType.php

@@ -45,7 +45,7 @@ public function hasSecret(): bool
     }
 
     /**
-     * @param array<string, array> $schema
+     * @param  array<string, array>  $schema
      * @return array
      */
     public static function buildSchemaFields(array $schema, string $dataVar = 'formData'): array
@@ -68,11 +68,10 @@ public static function buildSchemaFields(array $schema, string $dataVar = 'formD
 
             return [
                 ...$field,
-                'key'                   => $key,
-                'field_type'            => $field['type'] ?? 'text',
+                'key' => $key,
+                'field_type' => $field['type'] ?? 'text',
                 'visible_if_expression' => $visibleIfExpression,
             ];
         })->values()->all();
     }
 }
-

LibreNMS/Enum/SecretType.php

@@ -26,11 +26,9 @@
 
 namespace LibreNMS\Enum;
 
-use LibreNMS\Polling\Secrets\IcmpSecret;
 use LibreNMS\Polling\Secrets\IpmiSecret;
 use LibreNMS\Polling\Secrets\SecretData;
 use LibreNMS\Polling\Secrets\SnmpSecret;
-use LibreNMS\Polling\Secrets\UnixAgentSecret;
 
 enum SecretType: string
 {
@@ -57,5 +55,4 @@ public function secretClass(): string
             self::Ipmi => IpmiSecret::class,
         };
     }
-
 }

LibreNMS/Interfaces/PollingMethod.php

@@ -6,18 +6,21 @@ interface PollingMethod
 {
     /**
      * UI/form schema for device-specific settings.
+     *
      * @return array<string, array{type: string, options?: array<string,string>, visible_if: array}>
      */
     public static function getSettingsSchema(): array;
 
     /**
      * Defaults for polling method per-device settings
+     *
      * @return array<string, mixed>
      */
     public static function getDefaults(): array;
 
     /**
      * Validation rules for polling method per-device settings
+     *
      * @return array<string, array|string>
      */
     public static function getRules(): array;

LibreNMS/Polling/ConnectivityHelper.php

@@ -33,7 +33,8 @@
 {
     public function __construct(
         private Device $device,
-    ) {}
+    ) {
+    }
 
     public function isAvailable(): bool
     {
@@ -42,7 +43,7 @@
         }
 
         foreach ($this->device->pollingMethods as $method) {
             if ($method->enabled && $method->affects_availability && ! $method->last_check_successful) {
                 return true;
             }
         }
@@ -53,7 +54,7 @@
     public function hasAvailability(): bool
     {
         foreach ($this->device->pollingMethods as $method) {
             if ($method->enabled && $method->affects_availability) {
                 return true;
             }
         }

LibreNMS/Polling/Method/IcmpPollingMethod.php

@@ -11,7 +11,8 @@
     public function __construct(
         public bool $enabled,
         public bool $affectsAvailability,
-    ) {}
+    ) {
+    }
 
     public static function fromModel(DevicePollingMethod $method): self
     {

LibreNMS/Polling/Method/IpmiPollingMethod.php

@@ -19,7 +19,8 @@ public function __construct(
         public int $cipherSuite,
         public int $timeout,
         public string $type,
-    ) {}
+    ) {
+    }
 
     public static function fromModel(DevicePollingMethod $method): self
     {

LibreNMS/Polling/Method/SnmpPollingMethod.php

@@ -31,7 +31,8 @@ public function __construct(
         public int $retries,
         public int $maxRepeaters,
         public int $maxOid,
-    ) {}
+    ) {
+    }
 
     public static function fromModel(DevicePollingMethod $method): self
     {

LibreNMS/Polling/Method/UnixAgentPollingMethod.php

@@ -13,7 +13,8 @@ public function __construct(
         public bool $enabled,
         public bool $affectsAvailability,
         public int $port,
-    ) {}
+    ) {
+    }
 
     public static function fromModel(DevicePollingMethod $method): self
     {

LibreNMS/Polling/ModuleStatus.php

@@ -26,7 +26,6 @@
 
 namespace LibreNMS\Polling;
 
-
 class ModuleStatus implements \Stringable
 {
     public function __construct(
@@ -76,7 +75,6 @@ public function reason(): string
         return 'globally';
     }
 
-
     public function hasSubModules(): bool
     {
         return ! empty($this->submodules);

LibreNMS/Polling/Secrets/SecretData.php

@@ -35,12 +35,12 @@ abstract class SecretData implements Arrayable, Jsonable, JsonSerializable
     /**
      * Create a new DTO instance from an array.
      */
-    public static abstract function fromArray(array $data): static;
+    abstract public static function fromArray(array $data): static;
 
     /**
      * Get validation rules for this credential type.
      */
-    public static abstract function rules(): array;
+    abstract public static function rules(): array;
 
     /**
      * Get UI schema for this credential type.

LibreNMS/Polling/Secrets/SnmpSecret.php

@@ -58,6 +58,7 @@ public static function fromArray(array $data): static
 
     /**
      * @deprecated
+     *
      * @param  array  $device
      * @return static
      */

app/Actions/Device/SetDeviceAvailability.php

@@ -18,7 +18,8 @@ public function __construct(
      * @param  bool  $commit  Save changes to the database
      * @return bool true if the status changed
      */
-    public function execute(Device $device, bool $commit = true): bool {
+    public function execute(Device $device, bool $commit = true): bool
+    {
         if ($device->exists || $device->relationLoaded('pollingMethods')) {
             $failedAvailabilityMethods = $device->pollingMethods
                 ->filter(fn ($method) => $method->enabled && $method->affects_availability && ! $method->last_check_successful);

app/Actions/Device/ValidateDeviceAndCreate.php

@@ -127,8 +127,8 @@ private function detectCredentials(): void
         $host_unreachable_exception = new HostUnreachableSnmpException($this->device->hostname);
 
         // Retrieve existing SNMP secret from relations if set
-        $existingSnmpSecret = $this->device->relationLoaded('pollingMethods') 
-            ? $this->device->pollingMethods->firstWhere('method_type', PollingMethodType::Snmp)?->secret 
+        $existingSnmpSecret = $this->device->relationLoaded('pollingMethods')
+            ? $this->device->pollingMethods->firstWhere('method_type', PollingMethodType::Snmp)?->secret
             : null;
 
         // which snmp version should we try (and in what order)

app/Casts/EncryptedArray.php

@@ -32,7 +32,7 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
      *
      * @param  array<string, mixed>  $attributes
      */
-    public function set(Model $model, string $key, mixed $value, array $attributes): string|null
+    public function set(Model $model, string $key, mixed $value, array $attributes): ?string
     {
         if (! is_array($value) || empty($value)) {
             return null;

app/Http/Controllers/Device/AddDeviceController.php

@@ -25,8 +25,9 @@ class AddDeviceController
     use AuthorizesRequests;
 
     public function __construct(
-        private readonly SecretService        $secretService,
-    ) {}
+        private readonly SecretService $secretService,
+    ) {
+    }
 
     public function index(Request $request): View
     {
@@ -39,11 +40,11 @@ public function index(Request $request): View
             $settingsSchema = $methodClass::getSettingsSchema();
 
             return [
-                'type'            => $type->value,
-                'label'           => __('poller.methods.' . $type->value),
-                'schema_fields'   => $schemaFields,
+                'type' => $type->value,
+                'label' => __('poller.methods.' . $type->value),
+                'schema_fields' => $schemaFields,
                 'schema_defaults' => collect($schema)->mapWithKeys(
-                    fn(array $field, string $key): array => [
+                    fn (array $field, string $key): array => [
                         $key => $field['default'] ?? (isset($field['options']) ? array_key_first($field['options']) : ''),
                     ]
                 )->all(),
@@ -52,15 +53,15 @@ public function index(Request $request): View
         });
 
         $availableSecrets = Secret::query()->orderBy('description')->get()->groupBy(
-            fn(Secret $s): string => $s->secret_type->value
+            fn (Secret $s): string => $s->secret_type->value
         );
 
         return view('device.add', [
-            'availableMethods'             => $availableMethods,
-            'availableSecrets'             => $availableSecrets,
-            'poller_groups'                => PollerGroup::orderBy('group_name')->pluck('group_name', 'id'),
-            'default_poller_group'         => LibrenmsConfig::get('default_poller_group', 0),
-            'port_association_modes'       => PortAssociationMode::getModes(),
+            'availableMethods' => $availableMethods,
+            'availableSecrets' => $availableSecrets,
+            'poller_groups' => PollerGroup::orderBy('group_name')->pluck('group_name', 'id'),
+            'default_poller_group' => LibrenmsConfig::get('default_poller_group', 0),
+            'port_association_modes' => PortAssociationMode::getModes(),
             'default_port_association_mode' => LibrenmsConfig::get('default_port_association_mode', 'ifIndex'),
         ]);
     }
@@ -72,8 +73,8 @@ public function store(StoreDeviceRequest $request, ToastInterface $toast): Redir
         $validated = $request->validated();
 
         $device = new Device([
-            'hostname'             => $validated['hostname'],
-            'poller_group'         => $validated['poller_group'] ?? LibrenmsConfig::get('default_poller_group', 0),
+            'hostname' => $validated['hostname'],
+            'poller_group' => $validated['poller_group'] ?? LibrenmsConfig::get('default_poller_group', 0),
             'port_association_mode' => PortAssociationMode::getId($validated['port_assoc_mode'] ?? 'ifIndex') ?? 1,
         ]);
 
@@ -97,16 +98,16 @@ public function store(StoreDeviceRequest $request, ToastInterface $toast): Redir
             // SNMP port/transport live in settings on the form; promote them onto
             // the device row where the legacy schema expects them.
             if ($type === PollingMethodType::Snmp) {
-                $device->port      = (int) ($settings['port'] ?? LibrenmsConfig::get('snmp.port', 161));
+                $device->port = (int) ($settings['port'] ?? LibrenmsConfig::get('snmp.port', 161));
                 $device->transport = $settings['transport'] ?? LibrenmsConfig::get('snmp.transports.0', 'udp');
                 unset($settings['port'], $settings['transport']);
             }
 
             $pollingMethod = new DevicePollingMethod([
-                'method_type'          => $type,
-                'enabled'              => true,
+                'method_type' => $type,
+                'enabled' => true,
                 'affects_availability' => (bool) ($data['affects_availability'] ?? false),
-                'settings'             => $settings,
+                'settings' => $settings,
             ]);
 
             if ($type->hasSecret()) {
@@ -123,22 +124,22 @@ public function store(StoreDeviceRequest $request, ToastInterface $toast): Redir
 
         if (! $snmpActive) {
             $device->snmp_disable = 1;
-            $device->os           = $validated['os'] ?: 'ping';
-            $device->sysName      = $validated['sysName'] ?: '';
-            $device->hardware     = $validated['hardware'] ?: '';
+            $device->os = $validated['os'] ?: 'ping';
+            $device->sysName = $validated['sysName'] ?: '';
+            $device->hardware = $validated['hardware'] ?: '';
         } else {
             $device->snmp_disable = 0;
         }
 
         // Per-method validate flags: validate if *any* active method requests it.
         // The SNMP method's validate flag doubles as the old force_add inverse.
         $forceAdd = collect($rawMethods)
-            ->filter(fn(array $data): bool => (bool) ($data['active'] ?? false))
-            ->every(fn(array $data): bool => empty($data['validate']));
+            ->filter(fn (array $data): bool => (bool) ($data['active'] ?? false))
+            ->every(fn (array $data): bool => empty($data['validate']));
 
         try {
             $validator = new ValidateDeviceAndCreate($device, $forceAdd);
-            $success   = $validator->execute();
+            $success = $validator->execute();
 
             if (! $success) {
                 return back()->withInput()->withErrors(['hostname' => __('Failed to save device.')]);
@@ -174,8 +175,8 @@ private function resolveSecret(PollingMethodType $type, array $data): ?Secret
             return new Secret([
                 'secret_type' => SecretType::tryFrom($type->value),
                 'description' => $data['description'] ?? '',
-                'default'     => (bool) ($data['default'] ?? false),
-                'data'        => $data['secret_data'] ?? [],
+                'default' => (bool) ($data['default'] ?? false),
+                'data' => $data['secret_data'] ?? [],
             ]);
         }
 

app/Http/Controllers/Device/EditPollingController.php

@@ -24,7 +24,8 @@ class EditPollingController
 
     public function __construct(
         private readonly SecretService $secretService,
-    ) {}
+    ) {
+    }
 
     /**
      * @throws AuthorizationException
@@ -63,11 +64,11 @@ private function buildMethodData(Device $device, PollingMethodType $type): array
             ->orderBy('description')
             ->get();
         $secretDescriptions = $secretsForType->mapWithKeys(fn (Secret $availableSecret): array => [
-            (string)$availableSecret->id => $availableSecret->description,
+            (string) $availableSecret->id => $availableSecret->description,
         ])->all();
         $secretFormDataById = $secretsForType->mapWithKeys(fn (Secret $availableSecret): array => [
-            (string)$availableSecret->id => collect($schemaFields)->mapWithKeys(fn (array $field): array => [
-                $field['key'] => $canUnmaskSecrets ? (string)data_get($availableSecret->data, $field['key'], '') : '',
+            (string) $availableSecret->id => collect($schemaFields)->mapWithKeys(fn (array $field): array => [
+                $field['key'] => $canUnmaskSecrets ? (string) data_get($availableSecret->data, $field['key'], '') : '',
             ])->all(),
         ])->all();
 
@@ -80,10 +81,10 @@ private function buildMethodData(Device $device, PollingMethodType $type): array
             ])->all(),
             'settings_fields' => PollingMethodType::buildSchemaFields($settingsSchema, 'settingsData'),
             'settings' => $row?->settings ?? [],
-            'affects_availability' => $row?->affects_availability ?? (bool)($methodClass::getDefaults()['affects_availability'] ?? false),
+            'affects_availability' => $row?->affects_availability ?? (bool) ($methodClass::getDefaults()['affects_availability'] ?? false),
             'secret' => $secret,
             'secret_form_data' => collect($schema)->mapWithKeys(fn (array $field, string $key): array => [
-                $key => $canUnmaskSecrets ? (string)data_get($secret?->data, $key, '') : '',
+                $key => $canUnmaskSecrets ? (string) data_get($secret?->data, $key, '') : '',
             ])->all(),
             'secret_descriptions' => $secretDescriptions,
             'secret_form_data_by_id' => $secretFormDataById,
@@ -125,7 +126,7 @@ public function store(StorePollingMethodRequest $request, Device $device, ToastI
             'device_id' => $device->device_id,
             'method_type' => $type,
             'enabled' => true,
-            'affects_availability' => (bool)($methodClass::getDefaults()['affects_availability'] ?? false),
+            'affects_availability' => (bool) ($methodClass::getDefaults()['affects_availability'] ?? false),
             'secret_id' => $secret?->id,
             'settings' => $this->buildSettings($methodClass, $request->validatedSettings()),
         ]);
@@ -184,7 +185,7 @@ public function update(UpdatePollingMethodRequest $request, Device $device, stri
 
         if ($type->hasSecret() && array_key_exists('secret_id', $validated)) {
             $this->authorize('update', Secret::class);
-            $pollingMethod->secret_id = $this->resolveExistingSecret((int)$validated['secret_id'], $type)->id;
+            $pollingMethod->secret_id = $this->resolveExistingSecret((int) $validated['secret_id'], $type)->id;
         } elseif ($type->hasSecret() && $request->has('secret_data')) {
             $this->authorize('update', Secret::class);
             $mode = $validated['secret_update_mode'] ?? 'update';
@@ -200,8 +201,8 @@ public function update(UpdatePollingMethodRequest $request, Device $device, stri
 
         $methodClass = $type->methodClass();
 
-        $pollingMethod->enabled = (bool)($validated['enabled'] ?? true);
-        $pollingMethod->affects_availability = (bool)($validated['affects_availability'] ?? false);
+        $pollingMethod->enabled = (bool) ($validated['enabled'] ?? true);
+        $pollingMethod->affects_availability = (bool) ($validated['affects_availability'] ?? false);
         $pollingMethod->settings = $this->mergeSettings($pollingMethod->settings ?? [], $validated['settings'] ?? [], $methodClass);
 
         $pollingMethod->save();

app/Http/Controllers/SecretController.php

@@ -114,7 +114,7 @@ public function update(Request $request, Secret $secret, ToastInterface $toast):
 
         $validated = $request->validate([
             'description' => 'required|string|max:255',
-            'default'     => 'boolean',
+            'default' => 'boolean',
         ]);
 
         $secretType = $secret->secret_type;
@@ -128,8 +128,8 @@ public function update(Request $request, Secret $secret, ToastInterface $toast):
 
         $secret->update([
             'description' => $validated['description'],
-            'default'     => $request->boolean('default'),
-            'data'        => $data,
+            'default' => $request->boolean('default'),
+            'data' => $data,
         ]);
 
         $toast->success(__('Secret updated'));

app/Models/Device.php

@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Data\DeviceCredentialRepository;
 use App\Facades\LibrenmsConfig;
 use App\Models\Traits\Filterable;
 use App\View\SimpleTemplate;