Skip to content

Apply fixes from StyleCI #456

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
murrant wants to merge 2 commits into
base: fix-snmpquery-cleanup-types
Choose a base branch
from
Open

Apply fixes from StyleCI #456

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b90c07c
Fix rector mistake
murrant Dec 23, 2025
fae0f24
Apply fixes from StyleCI
StyleCIBot Dec 23, 2025
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
58 changes: 27 additions & 31 deletions LibreNMS/Data/Source/NetSnmpQuery.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,37 +45,33 @@ class NetSnmpQuery implements SnmpQueryInterface
{
private const DEFAULT_FLAGS = '-OQXUte';

/**
* @var array
*/
private $cleanup = [
'command' => [
[
'/-c\' \'[\S]+\'/',
'/-u\' \'[\S]+\'/',
'/-U\' \'[\S]+\'/',
'/-A\' \'[\S]+\'/',
'/-X\' \'[\S]+\'/',
'/-P\' \'[\S]+\'/',
'/-H\' \'[\S]+\'/',
'/(udp|udp6|tcp|tcp6):([^:]+):([\d]+)/',
], [
'-c\' \'COMMUNITY\'',
'-u\' \'USER\'',
'-U\' \'USER\'',
'-A\' \'PASSWORD\'',
'-X\' \'PASSWORD\'',
'-P\' \'PASSWORD\'',
'-H\' \'HOSTNAME\'',
'\1:HOSTNAME:\3',
],
],
'output' => [
'/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/',
'*',
],
/** @var string[] */
private array $commandCleanupPatterns = [
'/-c\' \'[\S]+\'/',
'/-u\' \'[\S]+\'/',
'/-U\' \'[\S]+\'/',
'/-A\' \'[\S]+\'/',
'/-X\' \'[\S]+\'/',
'/-P\' \'[\S]+\'/',
'/-H\' \'[\S]+\'/',
'/(udp|udp6|tcp|tcp6):([^:]+):([\d]+)/',
];

/** @var string[] */
private array $commandReplacementPatterns = [
'-c\' \'COMMUNITY\'',
'-u\' \'USER\'',
'-U\' \'USER\'',
'-A\' \'PASSWORD\'',
'-X\' \'PASSWORD\'',
'-P\' \'PASSWORD\'',
'-H\' \'HOSTNAME\'',
'\1:HOSTNAME:\3',
];

private string $output_regex = '/(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)/';
private string $output_replacement = '*';

/**
* @var string[]
*/
Expand Down Expand Up @@ -526,7 +522,7 @@ private function checkExitCode(int $code, string $error): void
private function logCommand(string $command): void
{
if (Debug::isEnabled() && ! Debug::isVerbose()) {
$debug_command = preg_replace($this->cleanup['command'][0], (string) $this->cleanup['command'][1], $command);
$debug_command = preg_replace($this->commandCleanupPatterns, $this->commandReplacementPatterns, $command);
Log::debug('SNMP[%c' . $debug_command . '%n]', ['color' => true]);
} elseif (Debug::isVerbose()) {
Log::debug('SNMP[%c' . $command . '%n]', ['color' => true]);
Expand All @@ -536,7 +532,7 @@ private function logCommand(string $command): void
private function logOutput(string $output, string $error): void
{
if (Debug::isEnabled() && ! Debug::isVerbose()) {
Log::debug(preg_replace($this->cleanup['output'][0], (string) $this->cleanup['output'][1], $output));
Log::debug(preg_replace($this->output_regex, $this->output_replacement, $output));
} elseif (Debug::isVerbose()) {
Log::debug($output);
}
Expand Down