Skip to content
Commits on Source (2)
icingaweb2 (2.6.2-2) unstable; urgency=medium
* Team upload.
* Add patch to fix Uncaught ErrorException with PHP 7.3.
(closes: #914457)
-- Bas Couwenberg <sebastic@debian.org> Fri, 23 Nov 2018 18:36:14 +0100
icingaweb2 (2.6.2-1) unstable; urgency=medium
* Team upload.
......
Description: Use continue <N> in case statements to fix ErrorException with PHP 7.3.
Fatal error: Uncaught ErrorException: "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?
Author: Bas Couwenberg <sebastic@debian.org>
Bug-Debian: https://bugs.debian.org/914457
Forwarded: https://github.com/Icinga/icingaweb2/pull/3634
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -686,7 +686,7 @@ class Module
case 'depends':
if (strpos($val, ' ') === false) {
$metadata->depends[$val] = true;
- continue;
+ continue 2;
}
$parts = preg_split('/,\s+/', $val);
--- a/library/Icinga/File/Ini/IniParser.php
+++ b/library/Icinga/File/Ini/IniParser.php
@@ -64,7 +64,7 @@ class IniParser
switch ($state) {
case self::LINE_START:
if (ctype_space($s)) {
- continue;
+ continue 2;
}
switch ($s) {
case '[':
@@ -130,7 +130,7 @@ class IniParser
case self::DIRECTIVE_VALUE_START:
if (ctype_space($s)) {
- continue;
+ continue 2;
} elseif ($s === '"') {
$state = self::DIRECTIVE_VALUE_QUOTED;
} else {
break-continue.patch