From ba440e5a212bce9c82f23949705ed9e45ff5eaf0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Wed, 17 Nov 2021 15:05:58 +0100
Subject: [PATCH] Merge pull request #4607 from
 Icinga/fix/error-on-skipping-dlap-in-setup-wizard

Fix TypeError when skipping ldap in setup wizard

(cherry picked from commit 27811dba7b68efe02f340e9f70e3079457b6d914)
---
 modules/setup/application/forms/LdapDiscoveryPage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/setup/application/forms/LdapDiscoveryPage.php b/modules/setup/application/forms/LdapDiscoveryPage.php
index a07b8a4fa..7b5de1707 100644
--- a/modules/setup/application/forms/LdapDiscoveryPage.php
+++ b/modules/setup/application/forms/LdapDiscoveryPage.php
@@ -97,12 +97,12 @@ class LdapDiscoveryPage extends Form
      *
      * @param bool $suppressArrayNotation
      *
-     * @return array|null
+     * @return array
      */
     public function getValues($suppressArrayNotation = false)
     {
         if (! isset($this->discovery) || ! $this->discovery->isSuccess()) {
-            return null;
+            return [];
         }
         $disc = $this->discovery;
         return array(