From 38f73ec622fe1d2f1ae6316d67ffa646167400d9 Mon Sep 17 00:00:00 2001
From: Ely Deckers <e.deckers@gmail.com>
Date: Sat, 19 Feb 2022 13:41:55 +0100
Subject: [PATCH] Fix wan interface retrieval

---
 pfsense_zbx.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pfsense_zbx.php b/pfsense_zbx.php
index 60d851e..a947878 100644
--- a/pfsense_zbx.php
+++ b/pfsense_zbx.php
@@ -293,6 +293,11 @@ class Util
         return array_merge(...$multi_dimensional_array);
     }
 
+    public static function array_zip(array $keys, array $values): array
+    {
+        return array_map(null, array_keys($keys), array_values($values));
+    }
+
     public static function b2int(bool $b): int
     {
         return (int)$b;
@@ -334,11 +339,11 @@ class PfzInterfaces
         $interfaces = array_map(function ($interface) {
             list ($if_name, $description) = $interface;
 
-            return [
-                ...PfEnv::get_interface_info($if_name),
-                "description" => $description,
-            ];
-        }, array_map(null, array_keys($if_descriptions), array_values($if_descriptions)));
+            return array_merge(
+                PfEnv::get_interface_info($if_name),
+                ["description" => $description],
+            );
+        }, Util::array_zip(array_keys($if_descriptions), array_values($if_descriptions)));
 
         return array_filter($interfaces, function ($iface_info_ext) {
             $has_gw = array_key_exists("gateway", $iface_info_ext);