Files
Cactiplugin_thold/tests/Unit/ZOptionalCoreFunctionTest.php
TheWitnessandCopilot 9b217e0e3a INFO: set compat to 1.2.29 (#838)
* INFO: set compat to 1.2.32

* docs: update Copilot instructions Cacti baseline to 1.2.32 (matches INFO compat)

* INFO: back off compat to 1.2.29

* Add manifest.json + upgrade-time file pruning

* Prune phpunit.xml on upgrade and ignore markdown-lint configs

phpunit.xml ships in the repo for CI but is a dev-only test artifact, so it
is removed from manifest.json 'expected', pruned from installs on upgrade
(like tests/), and excluded from the manifest drift check.

The retired markdown-lint configs (.mdlrc, .md_style.rb) are deleted, and
.md* is now ignored like .git*: protected from pruning and excluded from
drift if it reappears.

* Move thold_functions.php and thold_webapi.php into includes/; flatten css

The main threshold library becomes includes/functions.php and the web API
helper becomes includes/webapi.php; every caller (setup.php, includes/*, the
CLI/poller/notify entry points and the test suite) loads them from includes/.
Each per-theme stylesheet css/<theme>/main.css becomes css/<theme>.css so users
can drop their own css/<theme>.css into the css base, and the page_head hook
looks there. Old paths are tombstoned so existing installs drop the stale
copies on upgrade.

* Regenerate cacti.pot for the includes/ file relocations

Moving the plugin's library files into includes/ changed the source-reference
lines in the translation template; regenerate it so the 'Verify translation
template' CI check passes.

* Harden the hook-include test and make RPN integer ops explicit

The HookFunctionsIncludeTest invokes real hooks with placeholder input purely
to execute their relocated include_once lines; it now swallows engine
notices/warnings/deprecations during those calls (and restores the error
handler and config afterward) so it cannot trip the suite's failOnDeprecation
or leak state into other tests. The RPN % and ^ operators now cast their
operands to int explicitly, matching their long-standing integer-truncation
behaviour while silencing the implicit float-to-int conversion deprecation.

* Harden prune against tampered-manifest path traversal

The upgrade-time prune now rejects any tombstone containing '.'/'..' segments
(which could escape the plugin directory or resolve to its root) and treats
ancestors of whitelist entries as protected, so a tombstone on a parent
directory can no longer delete a whitelisted file beneath it.

* docs: update and align the Project Structure block

Point the structure tree at the relocated files (libraries now under
includes/, data files under docs/, stylesheets under css/) and align the
trailing '# ...' comments to a single column so they no longer drift right.

* docs/tests: standardize test header and correct manifest-contract notes

- Use the full license header (from the plugin's own setup.php) in
  tests/Unit/PruneFilesTest.php instead of the abbreviated copyright banner.
- Document that the manifest drift check and the upgrade-time prune also
  handle phpunit.xml and .md* files, matching the implemented behavior.

* refactor: rename prune helpers to the plugin-slug function prefix

The repository naming contract reserves the plugin_<name>_ prefix for plugin
lifecycle / hook-registration functions; all other functions use the plain
<name>_ prefix. Rename the internal upgrade helpers accordingly:

  plugin_<name>_prune_files() -> <name>_prune_files()
  plugin_<name>_rmtree()      -> <name>_rmtree()

The call site, unit tests, and the copilot-instructions.md references are
updated to match. No behavioral change.

* chore: set the Cacti compatibility floor to 1.2.29

Align the compat metadata (and the contributor-guide references) with the
team decision to standardize the minimum supported Cacti version at 1.2.29;
the previously proposed 1.2.32 floor was not adopted.

---------

Co-authored-by: Copilot <copilot@users.noreply.github.com>
2026-10-01 01:40:00 -05:00

102 lines
3.2 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 |
+-------------------------------------------------------------------------+
| http://www.cacti.net/ |
+-------------------------------------------------------------------------+
*/
/**
* Behaviour when the running Cacti provides the functions the plugin treats as
* optional.
*
* The file is sorted after the fallback-path tests so defining these optional
* functions cannot change the code paths exercised by earlier tests.
*/
final class OptionalCoreFunctionTest extends TestCase {
/**
* @return void
*/
protected function setUp(): void {
parent::setUp();
require_once dirname(__DIR__) . '/Fixtures/optional-core-functions.php';
require_once dirname(__DIR__, 2) . '/includes/functions.php';
}
/**
* @return void
*/
public function testRlikeClauseDelegatesToTheCoreHelper(): void {
$this->assertSame(db_qstr_rlike('router'), thold_rlike_clause('router'));
}
/**
* Core's helper strips the alternation and quantifier characters that make
* a filter expensive to evaluate; the plugin must not bypass that.
*
* @return void
*/
public function testRlikeClauseInheritsTheCoreOperandRestrictions(): void {
$clause = thold_rlike_clause('(a|a){9,}');
$this->assertStringNotContainsString('|', $clause);
$this->assertStringNotContainsString('{', $clause);
}
/**
* @return array<string, array{0: string, 1: string}>
*/
public static function accessorProvider() {
return [
'thresholds' => ['get_allowed_thresholds', 'thold'],
'logs' => ['get_allowed_threshold_logs', 'thold_log'],
];
}
/**
* The cached row count is used only for the unfiltered listing; a per-graph
* query counts directly so the cache is not keyed per graph.
*
* @dataProvider accessorProvider
*
* @param string $function
* @param string $class
*
* @return void
*/
public function testRowCountUsesTheCoreCacheWhenNotFilteredByGraph($function, $class): void {
CactiStubs::willReturn('get_total_row_data', 12);
$total = 0;
$function('', 'td.name', '', $total, -1, 0);
$this->assertSame(12, $total);
$this->assertSame([], CactiStubs::callsTo('db_fetch_cell_prepared'));
}
/**
* @dataProvider accessorProvider
*
* @param string $function
* @param string $class
*
* @return void
*/
public function testRowCountBypassesTheCacheForASingleGraph($function, $class): void {
$total = 0;
$function('', 'td.name', '', $total, -1, 5);
$this->assertSame([], CactiStubs::callsTo('get_total_row_data'));
$this->assertNotEmpty(CactiStubs::callsTo('db_fetch_cell_prepared'));
}
}