refactor: safe PHP 7.4 modernization by somethingwithproof · Pull Request #327 · Cacti/plugin_mactrack

somethingwithproof · 2026-04-09T21:09:54Z

This PR adds strict typing, short array syntax, and null coalescing operators across the plugin. Standalone infrastructure files were removed per architectural mandate.

Copilot

Pull request overview

This PR aims to modernize the plugin for PHP 7.4 by enabling strict typing and updating legacy syntax patterns across the codebase.

Changes:

Added declare(strict_types=1); across many PHP entrypoints and library files.
Converted some legacy array(...) usages to short array syntax [...].
Updated various array-related helper calls—but several updates introduced invalid PHP syntax (parse errors) that must be corrected.

Reviewed changes

Copilot reviewed 140 out of 140 changed files in this pull request and generated 34 comments.

Show a summary per file

File	Description
setup.php	Adds strict types declaration.
poller_mactrack.php	Introduces a parse error via `is_[$ip_ranges]` (should be `is_array(...)`).
Net/DNS2/Updater.php	Introduces parse errors via `in_[$rr, ...]` (should be `in_array(...)`).
Net/DNS2/Socket/Streams.php	Adds strict types declaration.
Net/DNS2/Socket/Sockets.php	Adds strict types declaration.
Net/DNS2/Socket.php	Adds strict types declaration.
Net/DNS2/RR/X25.php	Adds strict types declaration.
Net/DNS2/RR/WKS.php	Adds strict types declaration.
Net/DNS2/RR/URI.php	Adds strict types declaration.
Net/DNS2/RR/TYPE65534.php	Adds strict types declaration.
Net/DNS2/RR/TXT.php	Adds strict types declaration.
Net/DNS2/RR/TSIG.php	Adds strict types declaration.
Net/DNS2/RR/TLSA.php	Adds strict types declaration.
Net/DNS2/RR/TKEY.php	Adds strict types declaration.
Net/DNS2/RR/TALINK.php	Adds strict types declaration.
Net/DNS2/RR/TA.php	Adds strict types declaration.
Net/DNS2/RR/SSHFP.php	Adds strict types declaration.
Net/DNS2/RR/SRV.php	Adds strict types declaration.
Net/DNS2/RR/SPF.php	Adds strict types declaration.
Net/DNS2/RR/SOA.php	Adds strict types declaration.
Net/DNS2/RR/SMIMEA.php	Adds strict types declaration.
Net/DNS2/RR/SIG.php	Adds strict types declaration.
Net/DNS2/RR/RT.php	Adds strict types declaration.
Net/DNS2/RR/RRSIG.php	Adds strict types declaration.
Net/DNS2/RR/RP.php	Adds strict types declaration.
Net/DNS2/RR/PX.php	Adds strict types declaration.
Net/DNS2/RR/PTR.php	Adds strict types declaration.
Net/DNS2/RR/OPT.php	Adds strict types declaration.
Net/DNS2/RR/OPENPGPKEY.php	Adds strict types declaration.
Net/DNS2/RR/NSEC3PARAM.php	Adds strict types declaration.
Net/DNS2/RR/NSEC3.php	Adds strict types declaration.
Net/DNS2/RR/NSEC.php	Adds strict types declaration.
Net/DNS2/RR/NSAP.php	Adds strict types declaration.
Net/DNS2/RR/NS.php	Adds strict types declaration.
Net/DNS2/RR/NIMLOC.php	Adds strict types declaration.
Net/DNS2/RR/NID.php	Adds strict types declaration.
Net/DNS2/RR/NAPTR.php	Adds strict types declaration.
Net/DNS2/RR/MX.php	Adds strict types declaration.
Net/DNS2/RR/LP.php	Adds strict types declaration.
Net/DNS2/RR/LOC.php	Adds strict types declaration.
Net/DNS2/RR/L64.php	Adds strict types declaration.
Net/DNS2/RR/L32.php	Adds strict types declaration.
Net/DNS2/RR/KX.php	Adds strict types declaration.
Net/DNS2/RR/KEY.php	Adds strict types declaration.
Net/DNS2/RR/ISDN.php	Adds strict types declaration.
Net/DNS2/RR/IPSECKEY.php	Adds strict types declaration.
Net/DNS2/RR/HIP.php	Adds strict types declaration.
Net/DNS2/RR/HINFO.php	Adds strict types declaration.
Net/DNS2/RR/EUI64.php	Adds strict types declaration.
Net/DNS2/RR/EUI48.php	Adds strict types declaration.
Net/DNS2/RR/EID.php	Adds strict types declaration.
Net/DNS2/RR/DS.php	Adds strict types declaration.
Net/DNS2/RR/DNSKEY.php	Adds strict types declaration.
Net/DNS2/RR/DNAME.php	Adds strict types declaration.
Net/DNS2/RR/DLV.php	Adds strict types declaration.
Net/DNS2/RR/DHCID.php	Adds strict types declaration.
Net/DNS2/RR/CSYNC.php	Adds strict types declaration.
Net/DNS2/RR/CNAME.php	Adds strict types declaration.
Net/DNS2/RR/CERT.php	Adds strict types declaration.
Net/DNS2/RR/CDS.php	Adds strict types declaration.
Net/DNS2/RR/CDNSKEY.php	Adds strict types declaration.
Net/DNS2/RR/CAA.php	Adds strict types declaration.
Net/DNS2/RR/AVC.php	Adds strict types declaration.
Net/DNS2/RR/ATMA.php	Adds strict types declaration.
Net/DNS2/RR/APL.php	Adds strict types declaration.
Net/DNS2/RR/ANY.php	Adds strict types declaration.
Net/DNS2/RR/AMTRELAY.php	Adds strict types declaration.
Net/DNS2/RR/AFSDB.php	Adds strict types declaration.
Net/DNS2/RR/AAAA.php	Adds strict types declaration.
Net/DNS2/RR/A.php	Adds strict types declaration.
Net/DNS2/RR.php	Adds strict types declaration.
Net/DNS2/Resolver.php	Adds strict types declaration.
Net/DNS2/Question.php	Adds strict types declaration.
Net/DNS2/PrivateKey.php	Adds strict types declaration.
Net/DNS2/Packet/Response.php	Adds strict types declaration.
Net/DNS2/Packet/Request.php	Adds strict types declaration.
Net/DNS2/Packet.php	Adds strict types declaration.
Net/DNS2/Notifier.php	Introduces a parse error via `in_[$rr, ...]` (should be `in_array(...)`).
Net/DNS2/Lookups.php	Adds strict types declaration.
Net/DNS2/Header.php	Adds strict types declaration.
Net/DNS2/Exception.php	Adds strict types declaration.
Net/DNS2/Cache/Shm.php	Introduces parse errors via `is_[$decoded]` (should be `is_array(...)`).
Net/DNS2/Cache/File.php	Introduces parse errors via `is_[$decoded]` (should be `is_array(...)`).
Net/DNS2/Cache.php	Adds strict types declaration.
Net/DNS2/BitMap.php	Adds strict types declaration.
Net/DNS2.php	Introduces a parse error via `is_[$nameservers]` (should be `is_array(...)`).
mactrack_view_sites.php	Adds strict types declaration.
mactrack_view_macs.php	Adds strict types declaration.
mactrack_view_ips.php	Introduces a parse error via `is_[$ip_ranges]` (should be `is_array(...)`).
mactrack_view_interfaces.php	Introduces parse errors via `mactrack_display_[]` and `function mactrack_display_[]`.
mactrack_view_graphs.php	Adds strict types declaration.
mactrack_view_dot1x.php	Adds strict types declaration.
mactrack_view_devices.php	Adds strict types declaration.
mactrack_view_arp.php	Adds strict types declaration.
mactrack_vendormacs.php	Adds strict types declaration.
mactrack_utilities.php	Adds strict types declaration.
mactrack_snmp.php	Adds strict types declaration.
mactrack_sites.php	Adds strict types declaration.
mactrack_scanner.php	Introduces parse errors via `call_user_func_[...]` (should be `call_user_func_array(...)` or similar).
mactrack_resolver.php	Adds strict types declaration.
mactrack_macwatch.php	Adds strict types declaration.
mactrack_macauth.php	Adds strict types declaration.
mactrack_import_ouidb.php	Adds strict types declaration.
mactrack_devices.php	Introduces parse errors via `is_[]` / `in_[]` patterns.
mactrack_device_types.php	Introduces parse errors via `is_[]` / `in_[]` patterns.
mactrack_convert.php	Converts `array(...)` to `[...]` for prepared statement args.
mactrack_ajax.php	Adds strict types declaration.
mactrack_ajax_admin.php	Adds strict types declaration.
mactrack_actions.php	Introduces parse errors via `is_[]` and invalid function signature `mactrack_device_action_[$action]`.
locales/po/index.php	Adds strict types declaration.
locales/LC_MESSAGES/index.php	Adds strict types declaration.
locales/index.php	Adds strict types declaration.
lib/mactrack_vendors.php	Adds strict types declaration.
lib/mactrack_trendnet.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_tplink.php	Adds strict types declaration.
lib/mactrack_norbay.php	Adds strict types declaration.
lib/mactrack_norbay_ng.php	Adds strict types declaration.
lib/mactrack_linux.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_juniper.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_hp.php	Adds strict types declaration.
lib/mactrack_hp_ngi.php	Adds strict types declaration.
lib/mactrack_hp_ng.php	Adds strict types declaration.
lib/mactrack_h3c_3com.php	Introduces parse errors via `port_list_to_[]` / `in_[]`; also alters comment dump examples.
lib/mactrack_functions.php	Introduces multiple parse errors (`port_list_to_[]`, `is_[]`, `in_[]`) impacting shared helpers.
lib/mactrack_foundry.php	Adds strict types declaration.
lib/mactrack_extreme.php	Adds strict types declaration.
lib/mactrack_enterasys.php	Adds strict types declaration.
lib/mactrack_enterasys_N7.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_dlink.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_dell.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_cisco.php	Introduces parse errors via `in_[]` patterns.
lib/mactrack_cabletron.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/mactrack_aruba_oscx.php	Introduces parse errors via `port_list_to_[]` / `in_[]`; also alters comment dump examples.
lib/mactrack_3com.php	Introduces parse errors via `port_list_to_[]` / `in_[]` patterns.
lib/index.php	Adds strict types declaration.
index.php	Adds strict types declaration.
includes/database.php	Adds strict types declaration.
images/index.php	Adds strict types declaration.
.omc/sessions/ce3e60e4-0e62-483a-8587-78da29248e14.json	Adds transient session metadata file (likely should not be committed).
.omc/sessions/b398cee1-3730-4624-a0f1-d0e0120b23cb.json	Adds transient session metadata file (likely should not be committed).

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Revert corrupted function calls introduced by refactoring tool: - is_[$x] -> is_array($x) - in_[$x, ...] -> in_array($x, ...) - xml2[$x] -> xml2array($x) Also remove accidentally committed .omc session files and add .omc/ to .gitignore. Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

Revert bulk array()->[] rewrite damage affecting: - is_array, in_array, xml2array - call_user_func_array, filter_var_array - Function declarations with _array suffix Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

somethingwithproof · 2026-04-11T00:09:56Z

Converted to draft to serialize the stack in this repo. Blocked by #324; will un-draft after that merges to avoid cross-PR merge conflicts.

somethingwithproof added 2 commits April 9, 2026 13:59

refactor: add strict typing and clean up standalone infra

fb20e9a

refactor: safe PHP 7.4 modernization (arrays, null coalescing)

a20a86a

Copilot AI review requested due to automatic review settings April 9, 2026 21:09

Copilot started reviewing on behalf of somethingwithproof April 9, 2026 21:10 View session

Copilot AI reviewed Apr 9, 2026

View reviewed changes

somethingwithproof added 4 commits April 9, 2026 21:27

fix: restore corrupted function calls from refactor tool

931a638

Revert bulk array()->[] rewrite damage affecting: - is_array, in_array, xml2array - call_user_func_array, filter_var_array - Function declarations with _array suffix Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

fix: restore corrupted is_array($_SESSION['import_debug_info']) calls

9142ebf

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

fix: restore mactrack_display_array function call

b1399cb

Signed-off-by: Thomas Vincent <thomasvincent@gmail.com>

somethingwithproof marked this pull request as draft April 11, 2026 00:09

somethingwithproof marked this pull request as ready for review April 24, 2026 19:24

somethingwithproof added 4 commits April 24, 2026 13:45

ci: add PHP syntax matrix workflow for PR gating

0fae657

ci: remove ripgrep dependency from syntax workflow

83fbd04

style: normalize strict_types declaration spacing for cs fixer

597c144

docs: restore accurate var_dump examples in vendor comments

09d19ce

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: safe PHP 7.4 modernization#327

refactor: safe PHP 7.4 modernization#327
somethingwithproof wants to merge 10 commits intoCacti:developfrom
somethingwithproof:refactor/modernization

somethingwithproof commented Apr 9, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

somethingwithproof commented Apr 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

somethingwithproof commented Apr 9, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

somethingwithproof commented Apr 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants