Adding upstream version 1.11.1.upstream/1.11.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 11 insertions, 6 deletions

diff --git a/library/Director/CustomVariable/CustomVariable.php b/library/Director/CustomVariable/CustomVariable.php
index 98eda84..4b5dd3e 100644
--- a/library/Director/CustomVariable/CustomVariable.php
+++ b/library/Director/CustomVariable/CustomVariable.php
@@ -236,7 +236,7 @@ abstract class CustomVariable implements IcingaConfigRenderer
             // TODO: check for specific class/stdClass/interface?
             return new CustomVariableDictionary($key, $value);
         } else {
-            throw new LogicException(sprintf('WTF (%s): %s', $key, var_export($value, 1)));
+            throw new LogicException(sprintf('WTF (%s): %s', $key, var_export($value, true)));
         }
     }
 
diff --git a/library/Director/CustomVariable/CustomVariableBoolean.php b/library/Director/CustomVariable/CustomVariableBoolean.php
index 9953fae..750f1d6 100644
--- a/library/Director/CustomVariable/CustomVariableBoolean.php
+++ b/library/Director/CustomVariable/CustomVariableBoolean.php
@@ -31,7 +31,7 @@ class CustomVariableBoolean extends CustomVariable
         if (! is_bool($value)) {
             throw new ProgrammingError(
                 'Expected a boolean, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 
diff --git a/library/Director/CustomVariable/CustomVariableNull.php b/library/Director/CustomVariable/CustomVariableNull.php
index f87ccfa..83e07f0 100644
--- a/library/Director/CustomVariable/CustomVariableNull.php
+++ b/library/Director/CustomVariable/CustomVariableNull.php
@@ -31,7 +31,7 @@ class CustomVariableNull extends CustomVariable
         if (! is_null($value)) {
             throw new ProgrammingError(
                 'Null can only be null, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 
diff --git a/library/Director/CustomVariable/CustomVariableNumber.php b/library/Director/CustomVariable/CustomVariableNumber.php
index 62838a9..7b0c3e9 100644
--- a/library/Director/CustomVariable/CustomVariableNumber.php
+++ b/library/Director/CustomVariable/CustomVariableNumber.php
@@ -47,7 +47,7 @@ class CustomVariableNumber extends CustomVariable
         if (! is_int($value) && ! is_float($value)) {
             throw new ProgrammingError(
                 'Expected a number, got %s',
-                var_export($value, 1)
+                var_export($value, true)
             );
         }
 
diff --git a/library/Director/CustomVariable/CustomVariables.php b/library/Director/CustomVariable/CustomVariables.php
index cdcc4bd..01227c5 100644
--- a/library/Director/CustomVariable/CustomVariables.php
+++ b/library/Director/CustomVariable/CustomVariables.php
@@ -414,10 +414,15 @@ class CustomVariables implements Iterator, Countable, IcingaConfigRenderer
 
     protected function renderKeyName($key)
     {
+        return 'vars' . self::renderKeySuffix($key);
+    }
+
+    public static function renderKeySuffix($key)
+    {
         if (preg_match('/^[a-z][a-z0-9_]*$/i', $key)) {
-            return 'vars.' . c::escapeIfReserved($key);
+            return '.' . c::escapeIfReserved($key);
         } else {
-            return 'vars[' . c::renderString($key) . ']';
+            return '[' . c::renderString($key) . ']';
         }
     }