Rector up to PHP 7.3 (librenms#18436)

murrant · web-flow · commit e20ec4748290 · 2025-10-27T14:56:48.000Z
diff --git a/app/Models/Device.php b/app/Models/Device.php
@@ -145,9 +145,7 @@ public static function findByIp(?string $ip): ?Device
             if ($port) {
                 return $port->device;
             }
-        } catch (InvalidIpException $e) {
-            //
-        } catch (ModelNotFoundException $e) {
+        } catch (InvalidIpException|ModelNotFoundException $e) {
             //
         }
 
@@ -159,9 +157,7 @@ public static function findByIp(?string $ip): ?Device
             if ($port) {
                 return $port->device;
             }
-        } catch (InvalidIpException $e) {
-            //
-        } catch (ModelNotFoundException $e) {
+        } catch (InvalidIpException|ModelNotFoundException $e) {
             //
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_bytesin.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_bytesin.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_bytesout.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_bytesout.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_conns.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_conns.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_currconns.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_currconns.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_pktsin.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_pktsin.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/graphs/device/bigip_ltm_allpm_pktsout.inc.php b/includes/html/graphs/device/bigip_ltm_allpm_pktsout.inc.php
@@ -46,7 +46,7 @@
         if ($comp['type'] != 'f5-ltm-poolmember') {
             continue;
         }
-        if (! strstr($comp['UID'], $parent)) {
+        if (! strstr($comp['UID'], (string) $parent)) {
             continue;
         }
 
diff --git a/includes/html/pages/device/edit/ipmi.inc.php b/includes/html/pages/device/edit/ipmi.inc.php
@@ -16,7 +16,7 @@
             del_dev_attrib($device, 'ipmi_hostname');
         }
 
-        if ($ipmi_port != '') {
+        if ($ipmi_port != 0) {
             set_dev_attrib($device, 'ipmi_port', $ipmi_port);
         } else {
             set_dev_attrib($device, 'ipmi_port', '623'); // Default port
diff --git a/includes/html/pages/device/loadbalancer/ltm_pool_details.inc.php b/includes/html/pages/device/loadbalancer/ltm_pool_details.inc.php
@@ -83,7 +83,7 @@
                                     if ($comp['type'] != 'f5-ltm-poolmember') {
                                         continue;
                                     }
-                                    if (! strstr($comp['UID'], $parent)) {
+                                    if (! strstr($comp['UID'], (string) $parent)) {
                                         continue;
                                     }
 
diff --git a/includes/html/pages/device/loadbalancer/ltm_vs_pool.inc.php b/includes/html/pages/device/loadbalancer/ltm_vs_pool.inc.php
@@ -75,7 +75,7 @@
                                     if ($comp['type'] != 'f5-ltm-poolmember') {
                                         continue;
                                     }
-                                    if (! strstr($comp['UID'], $parent)) {
+                                    if (! strstr($comp['UID'], (string) $parent)) {
                                         continue;
                                     }
 
diff --git a/includes/html/table/app_ntp.inc.php b/includes/html/table/app_ntp.inc.php
@@ -34,7 +34,7 @@
             $searchfound = false;
             $searchdata = [$device['hostname'], $array['peer'], $array['stratum'], $array['error']];
             foreach ($searchdata as $value) {
-                if (strstr($value, $vars['searchPhrase'])) {
+                if (strstr($value, (string) $vars['searchPhrase'])) {
                     $searchfound = true;
                 }
             }
diff --git a/includes/rewrites.php b/includes/rewrites.php
@@ -76,7 +76,7 @@ function cleanPort($interface, $device = null)
 
     if (is_array(LibrenmsConfig::get('rewrite_if'))) {
         foreach (LibrenmsConfig::get('rewrite_if') as $src => $val) {
-            if (stristr($interface['label'], $src)) {
+            if (stristr($interface['label'], (string) $src)) {
                 $interface['label'] = $val;
             }
         }
diff --git a/rector.php b/rector.php
@@ -19,7 +19,7 @@
     ])
     // uncomment to reach your current PHP version
     // ->withPhpSets()
-    ->withPhpSets(php70: true)
+    ->withPhpSets(php73: true)
     ->withTypeCoverageLevel(0)
     ->withDeadCodeLevel(0)
     ->withCodeQualityLevel(0);
diff --git a/tests/Feature/SnmpTraps/OspfTxRetransmitTest.php b/tests/Feature/SnmpTraps/OspfTxRetransmitTest.php
@@ -35,20 +35,20 @@ final class OspfTxRetransmitTest extends SnmpTrapTestCase
      */
     public function testLsUpdatePacket(): void
     {
-        $this->assertTrapLogsMessage(<<<'TRAP'
-{{ hostname }}
-UDP: [{{ ip }}]:57602->[10.0.0.1]:162
-SNMPv2-MIB::sysUpTime.0 16:21:49.33
-SNMPv2-MIB::snmpTrapOID.0 OSPF-TRAP-MIB::ospfTxRetransmit
-OSPF-MIB::ospfRouterId 10.1.2.3
-OSPF-MIB::ospfIfIpAddress 10.8.9.10
-OSPF-MIB::ospfAddressLessIf 0
-OSPF-MIB::ospfNbrRtrId 10.3.4.5
-OSPF-TRAP-MIB::ospfPacketType lsUpdate
-OSPF-MIB::ospfLsdbType routerLink
-OSPF-MIB::ospfLsdbLsid 10.1.1.0
-OSPF-MIB::ospfLsdbRouterId 10.4.5.6
-TRAP,
+        $this->assertTrapLogsMessage(<<<'TRAP_WRAP'
+        {{ hostname }}
+        UDP: [{{ ip }}]:57602->[10.0.0.1]:162
+        SNMPv2-MIB::sysUpTime.0 16:21:49.33
+        SNMPv2-MIB::snmpTrapOID.0 OSPF-TRAP-MIB::ospfTxRetransmit
+        OSPF-MIB::ospfRouterId 10.1.2.3
+        OSPF-MIB::ospfIfIpAddress 10.8.9.10
+        OSPF-MIB::ospfAddressLessIf 0
+        OSPF-MIB::ospfNbrRtrId 10.3.4.5
+        OSPF-TRAP-MIB::ospfPacketType lsUpdate
+        OSPF-MIB::ospfLsdbType routerLink
+        OSPF-MIB::ospfLsdbLsid 10.1.1.0
+        OSPF-MIB::ospfLsdbRouterId 10.4.5.6
+        TRAP_WRAP,
             'SNMP Trap: OSPFTxRetransmit trap received from {{ hostname }}(Router ID: 10.1.2.3). A lsUpdate packet was sent to 10.3.4.5. LSType: routerLink, route ID: 10.1.1.0, originating from 10.4.5.6.',
             'Could not handle testlsUpdatePacket trap',
         );
@@ -61,20 +61,20 @@ public function testLsUpdatePacket(): void
      */
     public function testNotLsUpdatePacket(): void
     {
-        $this->assertTrapLogsMessage(<<<'TRAP'
-{{ hostname }}
-UDP: [{{ ip }}]:57602->[10.0.0.1]:162
-SNMPv2-MIB::sysUpTime.0 16:21:49.33
-SNMPv2-MIB::snmpTrapOID.0 OSPF-TRAP-MIB::ospfTxRetransmit
-OSPF-MIB::ospfRouterId 10.1.2.3
-OSPF-MIB::ospfIfIpAddress 10.8.9.10
-OSPF-MIB::ospfAddressLessIf 0
-OSPF-MIB::ospfNbrRtrId 10.3.4.5
-OSPF-TRAP-MIB::ospfPacketType hello
-OSPF-MIB::ospfLsdbType routerLink
-OSPF-MIB::ospfLsdbLsid 10.1.1.0
-OSPF-MIB::ospfLsdbRouterId 10.4.5.6
-TRAP,
+        $this->assertTrapLogsMessage(<<<'TRAP_WRAP'
+        {{ hostname }}
+        UDP: [{{ ip }}]:57602->[10.0.0.1]:162
+        SNMPv2-MIB::sysUpTime.0 16:21:49.33
+        SNMPv2-MIB::snmpTrapOID.0 OSPF-TRAP-MIB::ospfTxRetransmit
+        OSPF-MIB::ospfRouterId 10.1.2.3
+        OSPF-MIB::ospfIfIpAddress 10.8.9.10
+        OSPF-MIB::ospfAddressLessIf 0
+        OSPF-MIB::ospfNbrRtrId 10.3.4.5
+        OSPF-TRAP-MIB::ospfPacketType hello
+        OSPF-MIB::ospfLsdbType routerLink
+        OSPF-MIB::ospfLsdbLsid 10.1.1.0
+        OSPF-MIB::ospfLsdbRouterId 10.4.5.6
+        TRAP_WRAP,
             'SNMP TRAP: {{ hostname }}(Router ID: 10.1.2.3) sent a hello packet to 10.3.4.5.',
             'Could not handle testNotLsUpdatePacket trap',
         );
diff --git a/tests/Feature/SnmpTraps/SnTrapUserAuthTest.php b/tests/Feature/SnmpTraps/SnTrapUserAuthTest.php
@@ -38,13 +38,13 @@ final class SnTrapUserAuthTest extends SnmpTrapTestCase
      */
     public function testSnTrapUserLogin(): void
     {
-        $this->assertTrapLogsMessage(<<<'TRAP'
-{{ hostname }}
-UDP: [{{ ip }}]:57602->[192.168.5.5]:162
-SNMPv2-MIB::snmpTrapOID.0 FOUNDRY-SN-TRAP-MIB::snTrapUserLogin
-DISMAN-EVENT-MIB::sysUpTimeInstance 172:9:43:55.64
-FOUNDRY-SN-AGENT-MIB::snAgGblTrapMessage.0 "Security: ssh login by rancid from src IP {{ ip }} to PRIVILEGED EXEC mode using RSA as Server Host Key. "
-TRAP,
+        $this->assertTrapLogsMessage(<<<'TRAP_WRAP'
+        {{ hostname }}
+        UDP: [{{ ip }}]:57602->[192.168.5.5]:162
+        SNMPv2-MIB::snmpTrapOID.0 FOUNDRY-SN-TRAP-MIB::snTrapUserLogin
+        DISMAN-EVENT-MIB::sysUpTimeInstance 172:9:43:55.64
+        FOUNDRY-SN-AGENT-MIB::snAgGblTrapMessage.0 "Security: ssh login by rancid from src IP {{ ip }} to PRIVILEGED EXEC mode using RSA as Server Host Key. "
+        TRAP_WRAP,
             'Security: ssh login by rancid from src IP {{ ip }} to PRIVILEGED EXEC mode using RSA as Server Host Key. ',
             'Could not handle snTrapUserLogin',
         );
@@ -58,13 +58,13 @@ public function testSnTrapUserLogin(): void
      */
     public function testSnTrapUserLogout(): void
     {
-        $this->assertTrapLogsMessage(<<<'TRAP'
-{{ hostname }}
-UDP: [{{ ip }}]:57602->[192.168.5.5]:162
-SNMPv2-MIB::snmpTrapOID.0 FOUNDRY-SN-TRAP-MIB::snTrapUserLogin
-DISMAN-EVENT-MIB::sysUpTimeInstance 172:9:43:55.64
-FOUNDRY-SN-AGENT-MIB::snAgGblTrapMessage.0 "Security: ssh logout by rancid from src IP {{ ip }} from USER EXEC mode using RSA as Server Host Key. "
-TRAP,
+        $this->assertTrapLogsMessage(<<<'TRAP_WRAP'
+        {{ hostname }}
+        UDP: [{{ ip }}]:57602->[192.168.5.5]:162
+        SNMPv2-MIB::snmpTrapOID.0 FOUNDRY-SN-TRAP-MIB::snTrapUserLogin
+        DISMAN-EVENT-MIB::sysUpTimeInstance 172:9:43:55.64
+        FOUNDRY-SN-AGENT-MIB::snAgGblTrapMessage.0 "Security: ssh logout by rancid from src IP {{ ip }} from USER EXEC mode using RSA as Server Host Key. "
+        TRAP_WRAP,
             'Security: ssh logout by rancid from src IP {{ ip }} from USER EXEC mode using RSA as Server Host Key. ',
             'Could not handle snTrapUserLogout',
         );

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,7 @@ public static function findByIp(?string $ip): ?Device`
`145`	`145`	`if ($port) {`
`146`	`146`	`return $port->device;`
`147`	`147`	`}`
`148`		`- } catch (InvalidIpException $e) {`
`149`		`- //`
`150`		`- } catch (ModelNotFoundException $e) {`
	`148`	`+ } catch (InvalidIpException\|ModelNotFoundException $e) {`
`151`	`149`	`//`
`152`	`150`	`}`
`153`	`151`
`@@ -159,9 +157,7 @@ public static function findByIp(?string $ip): ?Device`
`159`	`157`	`if ($port) {`
`160`	`158`	`return $port->device;`
`161`	`159`	`}`
`162`		`- } catch (InvalidIpException $e) {`
`163`		`- //`
`164`		`- } catch (ModelNotFoundException $e) {`
	`160`	`+ } catch (InvalidIpException\|ModelNotFoundException $e) {`
`165`	`161`	`//`
`166`	`162`	`}`
`167`	`163`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@`
`46`	`46`	`if ($comp['type'] != 'f5-ltm-poolmember') {`
`47`	`47`	`continue;`
`48`	`48`	`}`
`49`		`- if (! strstr($comp['UID'], $parent)) {`
	`49`	`+ if (! strstr($comp['UID'], (string) $parent)) {`
`50`	`50`	`continue;`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`del_dev_attrib($device, 'ipmi_hostname');`
`17`	`17`	`}`
`18`	`18`
`19`		`- if ($ipmi_port != '') {`
	`19`	`+ if ($ipmi_port != 0) {`
`20`	`20`	`set_dev_attrib($device, 'ipmi_port', $ipmi_port);`
`21`	`21`	`} else {`
`22`	`22`	`set_dev_attrib($device, 'ipmi_port', '623'); // Default port`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@`
`83`	`83`	`if ($comp['type'] != 'f5-ltm-poolmember') {`
`84`	`84`	`continue;`
`85`	`85`	`}`
`86`		`- if (! strstr($comp['UID'], $parent)) {`
	`86`	`+ if (! strstr($comp['UID'], (string) $parent)) {`
`87`	`87`	`continue;`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`	`if ($comp['type'] != 'f5-ltm-poolmember') {`
`76`	`76`	`continue;`
`77`	`77`	`}`
`78`		`- if (! strstr($comp['UID'], $parent)) {`
	`78`	`+ if (! strstr($comp['UID'], (string) $parent)) {`
`79`	`79`	`continue;`
`80`	`80`	`}`
`81`	`81`