tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-29 08:44:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Director: some PHP 8.1-related changes

Browse Source
This commit is contained in:
Thomas Gelf 2021-11-28 11:13:08 +01:00
parent ac575858dc
commit 82656de2c2
8 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/forms/SyncPropertyForm.php
View File

@ -93,7 +93,8 @@ class SyncPropertyForm extends DirectorObjectForm
$this->setElementValue('use_filter', $useFilter = 'n');
}
} else {
$useFilter = strlen($this->getObject()->filter_expression) ? 'y' : 'n';
$expression = $this->getObject()->filter_expression;
$useFilter = ($expression === null || strlen($expression) === 0) ? 'n' : 'y';
$this->setElementValue('use_filter', $useFilter);
}

2
library/Director/IcingaConfig/IcingaConfigHelper.php
View File

@ -284,7 +284,7 @@ class IcingaConfigHelper
return null;
}
if (ctype_digit($interval)) {
if (is_int($interval) || ctype_digit($interval)) {
return (int) $interval;
}

2
library/Director/Import/Sync.php
View File

@ -184,7 +184,7 @@ class Sync
$this->hasPropertyDisabled = true;
}
if (! strlen($prop->get('filter_expression'))) {
if ($prop->get('filter_expression') === null || strlen($prop->get('filter_expression')) === 0) {
continue;
}

6
library/Director/Objects/IcingaArguments.php
View File

@ -30,11 +30,13 @@ class IcingaArguments implements Iterator, Countable, IcingaConfigRenderer
$this->object = $object;
}
#[\ReturnTypeWillChange]
public function count()
{
return count($this->arguments);
}
#[\ReturnTypeWillChange]
public function rewind()
{
$this->position = 0;
@ -45,6 +47,7 @@ class IcingaArguments implements Iterator, Countable, IcingaConfigRenderer
return $this->modified;
}
#[\ReturnTypeWillChange]
public function current()
{
if (! $this->valid()) {
@ -54,16 +57,19 @@ class IcingaArguments implements Iterator, Countable, IcingaConfigRenderer
return $this->arguments[$this->idx[$this->position]];
}
#[\ReturnTypeWillChange]
public function key()
{
return $this->idx[$this->position];
}
#[\ReturnTypeWillChange]
public function next()
{
++$this->position;
}
#[\ReturnTypeWillChange]
public function valid()
{
return array_key_exists($this->position, $this->idx);

6
library/Director/Objects/IcingaObjectMultiRelations.php
View File

@ -57,11 +57,13 @@ class IcingaObjectMultiRelations implements Iterator, Countable, IcingaConfigRen
return $this->relations;
}
#[\ReturnTypeWillChange]
public function count()
{
return count($this->relations);
}
#[\ReturnTypeWillChange]
public function rewind()
{
$this->position = 0;
@ -72,6 +74,7 @@ class IcingaObjectMultiRelations implements Iterator, Countable, IcingaConfigRen
return $this->modified;
}
#[\ReturnTypeWillChange]
public function current()
{
if (! $this->valid()) {
@ -81,16 +84,19 @@ class IcingaObjectMultiRelations implements Iterator, Countable, IcingaConfigRen
return $this->relations[$this->idx[$this->position]];
}
#[\ReturnTypeWillChange]
public function key()
{
return $this->idx[$this->position];
}
#[\ReturnTypeWillChange]
public function next()
{
++$this->position;
}
#[\ReturnTypeWillChange]
public function valid()
{
return array_key_exists($this->position, $this->idx);

6
library/Director/Objects/IcingaTimePeriodRanges.php
View File

@ -30,11 +30,13 @@ class IcingaTimePeriodRanges implements Iterator, Countable, IcingaConfigRendere
$this->object = $object;
}
#[\ReturnTypeWillChange]
public function count()
{
return count($this->ranges);
}
#[\ReturnTypeWillChange]
public function rewind()
{
$this->position = 0;
@ -45,6 +47,7 @@ class IcingaTimePeriodRanges implements Iterator, Countable, IcingaConfigRendere
return $this->modified;
}
#[\ReturnTypeWillChange]
public function current()
{
if (! $this->valid()) {
@ -54,16 +57,19 @@ class IcingaTimePeriodRanges implements Iterator, Countable, IcingaConfigRendere
return $this->ranges[$this->idx[$this->position]];
}
#[\ReturnTypeWillChange]
public function key()
{
return $this->idx[$this->position];
}
#[\ReturnTypeWillChange]
public function next()
{
++$this->position;
}
#[\ReturnTypeWillChange]
public function valid()
{
return array_key_exists($this->position, $this->idx);

2
library/Director/Web/Table/DatafieldCategoryTable.php
View File

@ -31,7 +31,7 @@ class DatafieldCategoryTable extends ZfQueryBasedTable
['name' => $row->category_name]
)];
if (strlen($row->description)) {
if ($row->description !== null && strlen($row->description)) {
$main[] = Html::tag('br');
$main[] = Html::tag('small', $row->description);
}

2
library/Director/Web/Widget/ImportSourceDetails.php
View File

@ -25,7 +25,7 @@ class ImportSourceDetails extends HtmlDocument
{
$source = $this->source;
$description = $source->get('description');
if (strlen($description)) {
if ($description !== null && strlen($description)) {
$this->add(Html::tag('p', null, $description));
}