mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-29 08:06:58 +09:00
Sean Mancini
96033267cb
* refactor(tests): reorganize unit tests into domain category folders - Consolidate per-advisory GHSA regression tests into Security/ subfolders by vuln class - Group all 186 test files into domain folders: DataCollection/, Ui/, Core/, Database/, Installer/, Scripts/, Security/, Plugin/ - Strip GitHub issue/GHSA numbers from filenames; keep IDs in test descriptions - Fix all __DIR__ relative paths to match new folder nesting depth - Update CI workflow path triggers and phpunit XML configs for new file locations - Update .github/copilot-instructions.md with unit test organization guidelines - Add tests/vendor/ to .gitignore * add gaurds * fix up guard for unit tests * fix redeclaration of cacti_log in tests * fix updates to unit tests * fix test patjhs * fix: update test __DIR__ paths for reorganized test structure * fix: conditionally define read_user_setting to prevent redeclaration in tests * fix: conditionally define functions to prevent redeclaration in tests - Wrap clean_up_lines, raise_message, cacti_debug_backtrace, and get_debug_prefix with function_exists() checks to prevent conflicts when test stubs are loaded before lib/functions.php in the same PHP process * fix: add unit test bootstrap to prevent function redeclaration errors - Create tests/bootstrap-unit.php to load core libraries before tests - Ensures lib/functions.php loads before test stubs define stub functions - Test stubs use function_exists() checks, so they detect pre-loaded functions - Update phpunit.xml to use bootstrap-unit.php for Unit testsuite - Fixes 'Cannot redeclare read_user_setting()' errors when tests run in same process * fix: load test stubs before global.php in unit test bootstrap - Reorder bootstrap to load CactiStubs.php and UnitStubs.php first - Ensures stub functions like __() are available when global.php loads - global.php calls get_cacti_version_text() which needs __() for translations - Fixes 'Call to undefined function __()' error during bootstrap * fix: remove function conflicts from test stubs - Remove stub definitions for functions already in lib/functions.php: cacti_sizeof, cacti_log, cacti_strtolower, read_config_option, read_user_setting, cacti_count - Keep translation function stubs (__(), __esc()) needed by global.php - Update bootstrap to load lib/functions.php after stubs - This prevents function redeclaration errors while maintaining test isolation * fix: prevent constant and variable redeclaration in bootstrap - Remove explicit PHP_TESTING and CACTI_TEST_BOOTSTRAP defines from bootstrap (CactiStubs.php now handles this with guards) - Add guards to CactiStubs.php to prevent redefinition of PHP_TESTING - Only set CACTI_TEST_BOOTSTRAP env vars if not already set - Fixes PHP warnings about 'Constant X already defined' * fix: remove redundant lib/functions.php load from bootstrap include/global.php already loads lib/functions.php at lines 287-288. The bootstrap was trying to load it again after global.php, but global.php needs format_cacti_version() to be available on lines 293-294 to define CACTI_VERSION and CACTI_VERSION_FULL constants. Solution: Let global.php handle loading lib/functions.php itself, and don't load it separately in the bootstrap. * fix: remove more conflicting function stubs from test helpers - Remove stubs for functions also defined in lib/functions.php: raise_message, clean_up_lines, cacti_debug_backtrace, get_debug_prefix - Remove POLLER_ID constant stub (defined unconditionally by global.php) - Keep only translation functions and test-specific helpers - This prevents function/constant redeclaration errors * fix: minimize test stubs to only translation functions Remove ALL helper functions and constants from UnitStubs.php that are: - Defined in lib/functions.php (raise_message, clean_up_lines, etc.) - Defined in lib/html_utility.php (srv, set_request_var) - Defined in global_constants.php (POLLER_VERBOSITY_*, MESSAGE_LEVEL_*) - Defined in global.php (POLLER_ID) Keep ONLY translation functions (__(), __esc()) that are: - Called by global.php during initialization - Not defined elsewhere - Required for proper bootstrap sequence This eliminates all constant and function redeclaration errors. * fix: remove __esc stub - already defined in global_languages.php Keep only __() translation function stub, which is needed by global.php and not defined elsewhere in Cacti core. * fix: handle no-arg case in __() translation stub The __() function may be called with just a string and no format arguments. Previously, vsprintf() would fail with 'arguments array must contain 2 items'. Now, if no args are provided, return the text as-is.
81 lines
3.4 KiB
PHP
81 lines
3.4 KiB
PHP
<?php
|
|
/*
|
|
+-------------------------------------------------------------------------+
|
|
| Copyright (C) 2004-2026 The Cacti Group |
|
|
| |
|
|
| 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 Free Software Foundation; either version 2 |
|
|
| of the License, or (at your option) any later version. |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
| |
|
|
| E_STRICT can no longer be raised as of PHP 8.0 and reading the constant |
|
|
| is deprecated as of PHP 8.4, so the error handlers must not name it. |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
$basePath = dirname(__DIR__, 3);
|
|
|
|
test('include/global_arrays.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/include/global_arrays.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/functions.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/functions.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/aggregate.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/aggregate.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/rrdcheck.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/rrdcheck.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/boost.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/boost.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/dsstats.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/dsstats.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('lib/dsdebug.php names no E_STRICT constant', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/dsdebug.php'))->not->toContain('E_STRICT');
|
|
});
|
|
|
|
test('userland cannot raise E_STRICT, so the removed key is unreachable', function () {
|
|
/* 2048 is the E_STRICT level, spelled numerically because naming the
|
|
constant is itself deprecated on PHP 8.4 */
|
|
$strict = 2048;
|
|
$raised = false;
|
|
|
|
try {
|
|
trigger_error('probe', $strict);
|
|
} catch (\ValueError $e) {
|
|
$raised = true;
|
|
}
|
|
|
|
expect($raised)->toBeTrue();
|
|
});
|
|
|
|
test('the error maps name their levels directly instead of patching them in', function () use ($basePath) {
|
|
$files = ['lib/aggregate.php', 'lib/rrdcheck.php', 'lib/boost.php', 'lib/dsstats.php', 'lib/dsdebug.php'];
|
|
|
|
expect(constant('E_RECOVERABLE_ERROR'))->toBe(4096)
|
|
->and(constant('E_DEPRECATED'))->toBe(8192);
|
|
|
|
foreach ($files as $file) {
|
|
$source = file_get_contents($basePath . '/' . $file);
|
|
|
|
expect($source)->not->toContain('$errortype[E_RECOVERABLE_ERROR]')
|
|
->and($source)->not->toContain('$errortype[E_DEPRECATED]');
|
|
}
|
|
});
|
|
|
|
test('aggregate no longer polyfills a constant that always exists', function () use ($basePath) {
|
|
expect(file_get_contents($basePath . '/lib/aggregate.php'))->not->toContain("define('E_RECOVERABLE_ERROR'");
|
|
});
|