mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-10-23 11:36:57 +09:00
* 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>
225 lines
5.7 KiB
PHP
225 lines
5.7 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/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* Stack and set operators, checked against rrdtool's RPN semantics.
|
|
*
|
|
* Stacks are written bottom element first, so the last entry is the top.
|
|
*/
|
|
final class TholdExpressionStackOpsTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
}
|
|
|
|
/**
|
|
* @param array<int, mixed> $stack
|
|
* @param string $operator
|
|
*
|
|
* @return array<int, mixed>
|
|
*/
|
|
private function stackOp(array $stack, $operator) {
|
|
thold_expression_stackops_rpn($operator, $stack);
|
|
|
|
return $stack;
|
|
}
|
|
|
|
/**
|
|
* @param array<int, mixed> $stack
|
|
* @param string $operator
|
|
*
|
|
* @return array<int, mixed>
|
|
*/
|
|
private function setOp(array $stack, $operator) {
|
|
thold_expression_setops_rpn($operator, $stack);
|
|
|
|
return $stack;
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testDupCopiesTheTopOfTheStack(): void {
|
|
$this->assertSame([1, 7, 7], $this->stackOp([1, 7], 'DUP'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testPopDiscardsTheTopOfTheStack(): void {
|
|
$this->assertSame([1], $this->stackOp([1, 7], 'POP'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testExcExchangesTheTopTwoElements(): void {
|
|
$this->assertSame([2, 1], $this->stackOp([1, 2], 'EXC'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testExcLeavesDeeperElementsAlone(): void {
|
|
$this->assertSame([9, 8, 2, 1], $this->stackOp([9, 8, 1, 2], 'EXC'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testExcOnAShortStackFlagsAnError(): void {
|
|
$this->stackOp([1], 'EXC');
|
|
|
|
$this->assertTrue($GLOBALS['rpn_error']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testDupOnAnEmptyStackFlagsAnError(): void {
|
|
$this->assertSame([], $this->stackOp([], 'DUP'));
|
|
$this->assertTrue($GLOBALS['rpn_error']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testUnrecognisedSetOperatorLeavesTheStackUntouched(): void {
|
|
$this->assertSame([1, 2], $this->setOp([1, 2], 'NOSUCHOP'));
|
|
$this->assertFalse($GLOBALS['rpn_error']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testRevReversesTheRequestedNumberOfElements(): void {
|
|
$this->assertSame([3, 2, 1], $this->setOp([1, 2, 3, 3], 'REV'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testRevLeavesDeeperElementsAlone(): void {
|
|
$this->assertSame([9, 3, 2, 1], $this->setOp([9, 1, 2, 3, 3], 'REV'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testRevOfZeroElementsLeavesTheStackUnchanged(): void {
|
|
$this->assertSame([1, 2], $this->setOp([1, 2, 0], 'REV'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testFractionalSetCountIsRejected(): void {
|
|
$this->assertSame([1, 2, 3], $this->setOp([1, 2, 3, 2.5], 'REV'));
|
|
$this->assertTrue($GLOBALS['rpn_error']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testSortOrdersTheRequestedElementsAscending(): void {
|
|
$this->assertSame([1, 2, 3], $this->setOp([3, 1, 2, 3], 'SORT'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testSortLeavesDeeperElementsAlone(): void {
|
|
$this->assertSame([9, 1, 2, 3], $this->setOp([9, 3, 1, 2, 3], 'SORT'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testSortAndRevAreInversesOverTheSameSpan(): void {
|
|
$sorted = $this->setOp([3, 1, 2, 3], 'SORT');
|
|
$sorted[] = 3;
|
|
|
|
$this->assertSame([3, 2, 1], $this->setOp($sorted, 'REV'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testAvgDividesTheSumByTheCount(): void {
|
|
$this->assertEqualsWithDelta([3], $this->setOp([2, 4, 2], 'AVG'), 1.0e-9);
|
|
}
|
|
|
|
/**
|
|
* rrdtool's AVG ignores unknown samples and averages the rest, rather than
|
|
* failing the whole expression.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testAvgSkipsUnknownSamplesInsteadOfThrowing(): void {
|
|
$this->assertEqualsWithDelta([3], $this->setOp([2, 4, 'U', 3], 'AVG'), 1.0e-9);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testAvgSkipsNanSamples(): void {
|
|
$this->assertEqualsWithDelta([3], $this->setOp([2, 4, 'NAN', 3], 'AVG'), 1.0e-9);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testAvgOfOnlyUnknownSamplesIsUnknown(): void {
|
|
$this->assertSame(['U'], $this->setOp(['U', 'NAN', 2], 'AVG'));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testAvgPropagatesInfinity(): void {
|
|
$this->assertSame(['INF'], $this->setOp([2, 'INF', 2], 'AVG'));
|
|
$this->assertSame(['NEGINF'], $this->setOp([2, 'NEGINF', 2], 'AVG'));
|
|
}
|
|
|
|
/**
|
|
* Popping more elements than the stack holds leaves the operator with no
|
|
* usable operands, so it must not push a result.
|
|
*
|
|
* @return array<string, array{0: string}>
|
|
*/
|
|
public static function setOperatorProvider() {
|
|
return [
|
|
'SORT' => ['SORT'],
|
|
'REV' => ['REV'],
|
|
'AVG' => ['AVG'],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider setOperatorProvider
|
|
*
|
|
* @param string $operator
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testUnderflowFlagsAnErrorAndPushesNothing($operator): void {
|
|
$this->assertSame([], $this->setOp([1, 5], $operator));
|
|
$this->assertTrue($GLOBALS['rpn_error']);
|
|
}
|
|
}
|