Fix StyleCI and syntax errors

LibreNMS/Billing.php

@@ -21,7 +21,7 @@ public static function formatBytesShort($value): string
 
     public static function getDates($dayofmonth, $months = 0): array
     {
-        $dayofmonth = Str::padLeft($dayofmonth,2,0);
+        $dayofmonth = Str::padLeft($dayofmonth, 2, 0);
         $year = date('Y');
         $month = date('m');
 

LibreNMS/OS/Shared/Cisco.php

@@ -471,7 +471,7 @@ public function pollNac()
             foreach ($portAuthSessionEntry as $index => $portAuthSessionEntryParameters) {
                 [$ifIndex, $auth_id] = explode('.', str_replace("'", '', $index));
                 $session_info = $cafSessionMethodsInfoEntry->get($ifIndex . '.' . $auth_id);
-                $mac_address = Mac::parse($portAuthSessionEntryParameters['cafSessionClientMacAddress'])->hex());
+                $mac_address = Mac::parse($portAuthSessionEntryParameters['cafSessionClientMacAddress'])->hex();
 
                 $nac->put($mac_address, new PortsNac([
                     'port_id' => $ifIndex_map->get($ifIndex, 0),

html/data.php

@@ -2,7 +2,6 @@
 
 use App\Models\Port;
 
-
 /**
  * LibreNMS
  *

includes/common.php

@@ -17,6 +17,7 @@
  */
 
 use App\Models\Device;
+use App\Models\Port;
 use LibreNMS\Config;
 use LibreNMS\Enum\Severity;
 use LibreNMS\Exceptions\InvalidIpException;
@@ -164,9 +165,11 @@ function get_port_by_index_cache($device_id, $ifIndex)
     return $port;
 }
 
-function get_port_by_ifIndex($device_id, $ifIndex)
+function get_port_by_ifIndex(int $device_id, int $ifIndex): Port
 {
-    return dbFetchRow('SELECT * FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?', [$device_id, $ifIndex]);
+    return Port::where('device_id', $device_id)
+        ->where('ifIndex', $ifIndex)
+        ->first();
 }
 
 function ifclass($ifOperStatus, $ifAdminStatus)

includes/discovery/fdb-table/jetstream.inc.php

@@ -36,7 +36,7 @@
             $port = $macData['dot1qTpFdbPort'];
             //try both variation with & without space
             $port_id = find_port_id('gigabitEthernet 1/0/' . $port, 'gigabitEthernet1/0/' . $port, $device['device_id']) ?? 0;
-            $mac_address = ::parse($mac)->hex();
+            $mac_address = Mac::parse($mac)->hex();
             if (strlen($mac_address) != 12) {
                 d_echo("MAC address padding failed for $mac\n");
                 continue;

includes/html/functions.inc.php

@@ -91,7 +91,7 @@ function bill_permitted($bill_id)
 function port_permitted($port_id, $device_id = null)
 {
     if (! is_numeric($device_id)) {
-        $device_id = Device::whereHas('ports',fn($p) => $p->port_id = $port_id)->device_id;
+        $device_id = Device::whereHas('ports', fn ($p) => $p->port_id = $port_id)->device_id;
     }
 
     if (device_permitted($device_id)) {

includes/html/table/eventlog.inc.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\Port;
+
 /*
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the

scripts/new-os.php

@@ -1,6 +1,7 @@
 #!/usr/bin/env php
 <?php
 
+use App\Models\Device;
 use LibreNMS\Config;
 use LibreNMS\Modules\Core;
 use LibreNMS\Util\Debug;
@@ -15,7 +16,7 @@
     $vendor = $options['v'];
     Debug::set(isset($options['d']));
 
-    $device_id = ctype_digit($options['h']) ? $options['h'] : Device::find($options['h'])->device_id;
+    $device_id = ctype_digit($options['h']) ? $options['h'] : Device::findByHostname($options['h'])->device_id;
     $device = device_by_id_cache($device_id);
     $definition_file = Config::get('install_dir') . "/includes/definitions/{$options['o']}.yaml";
     $discovery_file = Config::get('install_dir') . "/includes/definitions/discovery/{$options['o']}.yaml";

scripts/test-template.php

@@ -17,7 +17,7 @@
     $runAlerts = new RunAlerts();
 
     $template_id = $options['t'];
-    $device_id = ctype_digit($options['h']) ? $options['h'] : Device::find($options['h'])->device_id;
+    $device_id = ctype_digit($options['h']) ? $options['h'] : Device::findByHostname($options['h'])->device_id;
     $rule_id = (int) $options['r'];
 
     $where = 'alerts.device_id=' . $device_id . ' && alerts.rule_id=' . $rule_id;