[pkg-nagios-changes] [Git][nagios-team/pkg-icingaweb2][master] 2 commits: Add patch to fix Uncaught ErrorException with PHP 7.3. (closes: #914457)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian Nagios Maintainer Group / pkg-icingaweb2


Commits:
2a5f1655 by Bas Couwenberg at 2018-11-23T17:34:34Z
Add patch to fix Uncaught ErrorException with PHP 7.3. (closes: #914457)

- - - - -
3550b5a1 by Bas Couwenberg at 2018-11-23T17:36:21Z
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/break-continue.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+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 at debian.org>  Fri, 23 Nov 2018 18:36:14 +0100
+
 icingaweb2 (2.6.2-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/break-continue.patch
=====================================
@@ -0,0 +1,37 @@
+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 at 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 {


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+break-continue.patch



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/d73676b3b291da49d1047dff6157638f1fb567f7...3550b5a14504a504e0e73978598004bd3170f514

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-icingaweb2/compare/d73676b3b291da49d1047dff6157638f1fb567f7...3550b5a14504a504e0e73978598004bd3170f514
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20181123/85e7e2f2/attachment-0001.html>