Skip to content

refactor: safe PHP 7.4 modernization #54

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

Open
somethingwithproof wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

refactor: safe PHP 7.4 modernization #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca9a62a
refactor: add strict typing
somethingwithproof Apr 9, 2026
70f3089
fix: validate parameters in audit_process_page_data
somethingwithproof Apr 9, 2026
d1594ce
refactor: enforce strict typing and clean up standalone infra
somethingwithproof Apr 9, 2026
788bb4c
fix: restore is_array/in_array calls and remove .omc artifacts
somethingwithproof Apr 10, 2026
2bbe1a3
style: apply plugin PHP formatting
somethingwithproof Aug 24, 2026
0be2493
fix: preserve the audit JSON return contract
somethingwithproof Aug 24, 2026
473c8cf
ci: test PHP 8.2-8.4 against Cacti and add ondrej PPA for apache mod
somethingwithproof Aug 31, 2026
3e2c63b
ci: drop EOL PHP 8.1 from the code quality matrix
somethingwithproof Aug 31, 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
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.1', '8.2', '8.3', '8.4']
php: ['8.2', '8.3', '8.4']

name: PHP ${{ matrix.php }} Code Quality

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/plugin-ci-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ jobs:
run: php -v

- name: Run apt-get update
run: sudo apt-get update
run: |
sudo add-apt-repository -y ppa:ondrej/php
sudo apt-get update

- name: Install System Dependencies
run: sudo apt-get install -y apache2 snmp snmpd rrdtool fping
Expand Down
2 changes: 2 additions & 0 deletions audit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types = 1);
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
Expand Down
6 changes: 6 additions & 0 deletions audit_functions.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);

require_once __DIR__ . '/audit_syslog.php';

function audit_user_is_admin(): bool {
Expand All @@ -12,6 +14,10 @@ function audit_user_is_admin(): bool {
function audit_process_page_data(string $page, mixed $drop_action, array $selected_items): string {
$objects = [];

if ($page === '') {
return audit_json_encode($objects);
}

if ($drop_action !== false) {
switch ($page) {
case 'host.php':
Expand Down
2 changes: 2 additions & 0 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types = 1);
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
Expand Down
2 changes: 2 additions & 0 deletions locales/LC_MESSAGES/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
Expand Down
2 changes: 2 additions & 0 deletions locales/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
Expand Down
2 changes: 2 additions & 0 deletions setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types = 1);
/*
+-------------------------------------------------------------------------+
| Copyright (C) 2004-2026 The Cacti Group |
Expand Down
Loading