From 4cd399e059b1d255063899194decbf45d70471e2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Wed, 7 Sep 2016 20:44:03 +0000
Subject: [PATCH] IcingaConfigHelper: use string-based sort for...

...dictionary fields to make PHP 5.x and PHP 7.x produce the same output.

refs #12591
---
 library/Director/IcingaConfig/IcingaConfigHelper.php      | 2 +-
 test/php/library/Director/IcingaConfig/rendered/dict1.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php
index 6d5610bb..71e4a5bc 100644
--- a/library/Director/IcingaConfig/IcingaConfigHelper.php
+++ b/library/Director/IcingaConfig/IcingaConfigHelper.php
@@ -149,7 +149,7 @@ class IcingaConfigHelper
         if (empty($vals)) {
             return '{}';
         }
-        ksort($vals);
+        ksort($vals, SORT_STRING);
 
         // Prefix for toConfigString?
         return "{\n" . implode("\n", $vals) . "\n}";
diff --git a/test/php/library/Director/IcingaConfig/rendered/dict1.out b/test/php/library/Director/IcingaConfig/rendered/dict1.out
index ff6f0228..9f4e6bf9 100644
--- a/test/php/library/Director/IcingaConfig/rendered/dict1.out
+++ b/test/php/library/Director/IcingaConfig/rendered/dict1.out
@@ -1,6 +1,6 @@
 {
+    "0" = numeric
     @include = reserved
     key1 = bla
     "spe cial" = value
-    "0" = numeric
 }