mirror of
https://github.com/Icinga/icingaweb2-module-graphite.git
synced 2026-05-28 04:34:57 -04:00
Fix PHP 8.2 support issues
This commit is contained in:
parent
8586210ac6
commit
c7abdfa0f3
6 changed files with 12 additions and 2 deletions
3
.github/workflows/php.yml
vendored
3
.github/workflows/php.yml
vendored
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php: ['7.2', '7.3', '7.4', '8.0', '8.1']
|
||||
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
|
||||
os: ['ubuntu-latest']
|
||||
|
||||
steps:
|
||||
|
|
@ -33,6 +33,7 @@ jobs:
|
|||
- name: Setup dependencies
|
||||
run: composer require -n --no-progress overtrue/phplint
|
||||
&& git clone --single-branch --branch master https://github.com/Icinga/icingaweb2.git vendor/icingaweb2
|
||||
&& git clone --single-branch --branch master https://github.com/Icinga/icingadb-web.git vendor/icingadb-web
|
||||
&& git clone --single-branch --branch snapshot/nightly https://github.com/Icinga/icinga-php-library.git vendor/icinga-php-library
|
||||
&& git clone --single-branch --branch snapshot/nightly https://github.com/Icinga/icinga-php-thirdparty.git vendor/icinga-php-thirdparty
|
||||
|
||||
|
|
|
|||
|
|
@ -138,6 +138,8 @@ EOT
|
|||
}
|
||||
}
|
||||
|
||||
assert(isset($service), '$service not initialized in the loop');
|
||||
|
||||
$monObj = $service
|
||||
? [
|
||||
"apply Service \"{$icinga2CfgObjPrefix}_{$checkCommand}\" {",
|
||||
|
|
|
|||
|
|
@ -126,6 +126,9 @@ class CustomForm extends Form
|
|||
]);
|
||||
}
|
||||
|
||||
assert(isset($elementDecorators), '$elementDecorators not initialized in the loop');
|
||||
assert(isset($element), '$element not initialized in the loop');
|
||||
|
||||
$decorators = [];
|
||||
foreach ($elementDecorators as $key => $decorator) {
|
||||
if ($key === 'Zend_Form_Decorator_ViewHelper') {
|
||||
|
|
|
|||
|
|
@ -203,6 +203,7 @@ class Template
|
|||
}
|
||||
}
|
||||
unset($_);
|
||||
assert(isset($nextCurveName), 'loop did not initialize variable $nextCurveName');
|
||||
|
||||
$allowedNextCurveMetricsPerCurrentCurveName = [];
|
||||
foreach ($currentCombination as $currentCurveName => $currentCurveMetric) {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ abstract class MonitoringAwareController extends Controller
|
|||
/** @var bool Whether to use icingadb as the backend */
|
||||
protected $useIcingadbAsBackend = false;
|
||||
|
||||
/** @var MonitoringBackend */
|
||||
protected $backend;
|
||||
|
||||
/**
|
||||
* Restrict the given monitored object query for the currently authenticated user
|
||||
*
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ abstract class Graphs extends AbstractWidget
|
|||
*
|
||||
* @param MonitoredObject $object
|
||||
*
|
||||
* @return static
|
||||
* @return ?static
|
||||
*/
|
||||
public static function forMonitoredObject(MonitoredObject $object)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue