Skip to content

refactor: safe PHP 7.4 modernization #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
somethingwithproof wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

refactor: safe PHP 7.4 modernization #252

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9cc6b1
refactor: add strict typing and clean up standalone infra
somethingwithproof Apr 9, 2026
e2723bb
refactor: safe PHP 7.4 modernization (arrays, null coalescing)
somethingwithproof Apr 9, 2026
d53d243
fix: restore is_array/in_array calls and remove .omc artifacts
somethingwithproof Apr 10, 2026
f635e40
fix: restore corrupted function calls from refactor tool
somethingwithproof Apr 10, 2026
90f3dc4
fix: correct typo unsigne64 to unsigned64 in flow_collector field map
somethingwithproof Apr 10, 2026
8fe59dc
style: remove trailing double semicolons
somethingwithproof Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Net/DNS2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down Expand Up @@ -323,7 +325,7 @@ public function setServers($nameservers)
//
// otherwise, see if it's a path to a resolv.conf file and if so, load it
//
if (is_array($nameservers)) {
if (is_[$nameservers]) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_[$nameservers] is invalid PHP syntax and will cause a parse error. Replace with is_array($nameservers) so the method can correctly branch between array input vs resolv.conf path.

Suggested change
if (is_[$nameservers]) {
if (is_array($nameservers)) {

Copilot uses AI. Check for mistakes.

//
// make sure all the name servers are IP addresses (either v4 or v6)
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/BitMap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
6 changes: 4 additions & 2 deletions Net/DNS2/Cache/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down Expand Up @@ -81,7 +83,7 @@ public function open($cache_file, $size, $serializer)
$decoded = unserialize($data);
}

if (is_array($decoded) == true) {
if (is_[$decoded] == true) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_[$decoded] is invalid PHP syntax and will cause a parse error. Replace with is_array($decoded) to validate decoded cache contents.

Suggested change
if (is_[$decoded] == true) {
if (is_array($decoded) == true) {

Copilot uses AI. Check for mistakes.

$this->cache_data = $decoded;
} else {
Expand Down Expand Up @@ -173,7 +175,7 @@ public function __destruct()
$decoded = unserialize($data);
}

if (is_array($decoded) == true) {
if (is_[$decoded] == true) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_[$decoded] is invalid PHP syntax and will cause a parse error. Replace with is_array($decoded) before merging the decoded cache data.

Suggested change
if (is_[$decoded] == true) {
if (is_array($decoded) == true) {

Copilot uses AI. Check for mistakes.

$this->cache_data = array_merge($c, $decoded);
}
Expand Down
6 changes: 4 additions & 2 deletions Net/DNS2/Cache/Shm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down Expand Up @@ -118,7 +120,7 @@ public function open($cache_file, $size, $serializer)
$decoded = unserialize($data);
}

if (is_array($decoded) == true) {
if (is_[$decoded] == true) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_[$decoded] is invalid PHP syntax and will cause a parse error. This should be is_array($decoded) to validate decoded cache contents.

Suggested change
if (is_[$decoded] == true) {
if (is_array($decoded) == true) {

Copilot uses AI. Check for mistakes.

$this->cache_data = $decoded;
} else {
Expand Down Expand Up @@ -216,7 +218,7 @@ public function __destruct()
$decoded = unserialize($data);
}

if (is_array($decoded) == true) {
if (is_[$decoded] == true) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is_[$decoded] is invalid PHP syntax and will cause a parse error. Replace with is_array($decoded) before merging the decoded cache data.

Suggested change
if (is_[$decoded] == true) {
if (is_array($decoded) == true) {

Copilot uses AI. Check for mistakes.

$this->cache_data = array_merge($c, $decoded);
}
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Exception.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Lookups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Names.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
4 changes: 3 additions & 1 deletion Net/DNS2/Notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down Expand Up @@ -104,7 +106,7 @@ public function add(Net_DNS2_RR $rr)
//
// add the RR to the "notify" section
//
if (!in_array($rr, $this->_packet->answer)) {
if (!in_[$rr, $this->_packet->answer]) {
Copy link

Copilot AI Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in_[$rr, $this->_packet->answer] is invalid PHP syntax and will cause a parse error. Replace with in_array($rr, $this->_packet->answer).

Suggested change
if (!in_[$rr, $this->_packet->answer]) {
if (!in_array($rr, $this->_packet->answer)) {

Copilot uses AI. Check for mistakes.
$this->_packet->answer[] = $rr;
}
return true;
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Packet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Packet/Request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Packet/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/PrivateKey.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/Question.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/A.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/AAAA.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/AFSDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/AMTRELAY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/ANY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/APL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/ATMA.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/AVC.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CAA.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CDNSKEY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CDS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CERT.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CNAME.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/CSYNC.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/DHCID.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/DLV.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/DNAME.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/DNSKEY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/DS.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/EID.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/EUI48.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/EUI64.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/HINFO.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/HIP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/IPSECKEY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/ISDN.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
2 changes: 2 additions & 0 deletions Net/DNS2/RR/KEY.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* DNS Library for handling lookups and updates.
*
Expand Down
Loading
Loading