tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various: PHP8.1-related warnings

This commit is contained in:
Thomas Gelf 2022-01-10 11:44:33 +01:00
parent 2113484b20
commit 274c153837
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ConfigController.php
View File

@ -395,7 +395,7 @@ class ConfigController extends ActionController
)),
]));
if (! strlen($rightSum) || ! strlen($leftSum)) {
if ($rightSum === null || $leftSum === null || ! strlen($rightSum) || ! strlen($leftSum)) {
return;
}
ConfigFileDiffTable::load($leftSum, $rightSum, $this->db())->renderTo($this);

6
library/Director/IcingaConfig/AssignRenderer.php
View File

@ -2,6 +2,7 @@
namespace Icinga\Module\Director\IcingaConfig;
use gipfl\Json\JsonString;
use Icinga\Data\Filter\Filter;
use Icinga\Data\Filter\FilterAnd;
use Icinga\Data\Filter\FilterChain;
@ -17,6 +18,7 @@ use Icinga\Data\Filter\FilterMatch;
use Icinga\Data\Filter\FilterMatchNot;
use Icinga\Data\Filter\FilterNotEqual;
use Icinga\Exception\QueryException;
use Icinga\Module\Director\Data\Json;
use InvalidArgumentException;
class AssignRenderer
@ -126,14 +128,14 @@ class AssignRenderer
}
$column = $filter->getColumn();
$rawExpression = json_decode($filter->getExpression());
$rawExpression = Json::decode($filter->getExpression());
$expression = $this->renderExpressionValue($rawExpression);
if (is_array($rawExpression) && $filter instanceof FilterMatch) {
return $this->renderInArray($column, $expression);
}
if (ctype_digit($rawExpression)) {
if (is_string($rawExpression) && ctype_digit($rawExpression)) {
// TODO: doing this for compat reasons, should work for all filters
if ($filter instanceof FilterEqualOrGreaterThan
|| $filter instanceof FilterGreaterThan