From 6ad88b04e2694d27017f67a45febb3d81fe4f1be Mon Sep 17 00:00:00 2001
From: Colin Gagnaire <cgagnaire@centreon.com>
Date: Thu, 12 Mar 2020 19:14:40 +0100
Subject: [PATCH] fix(api): fix options retrieval issue (#8412)

* Fixed a gorgonian issue due to a bad option class

* Regeneration of the composer.lock

Co-authored-by: Laurent Calvet <laurent@callapa.com>
---
 .../Controller/GorgoneController.php          |  6 +-
 src/Centreon/Domain/Gorgone/ActionLog.php     |  1 +
 .../Domain/Gorgone/Command/BasicCommand.php   | 10 ++-
 .../Domain/Gorgone/Command/CommandFactory.php |  3 +-
 .../Domain/Gorgone/Command/EmptyCommand.php   |  1 +
 .../Command/Internal/ThumbprintCommand.php    |  1 +
 .../Domain/Gorgone/ConfigurationLoader.php    |  8 ++-
 .../Domain/Gorgone/GorgoneException.php       |  2 +
 .../Domain/Gorgone/GorgoneService.php         |  5 +-
 .../Gorgone/Interfaces/CommandInterface.php   |  5 +-
 .../Interfaces/CommandRepositoryInterface.php |  1 +
 ...erface.php => GorgoneServiceInterface.php} |  3 +-
 .../Gorgone/Interfaces/ResponseInterface.php  |  1 +
 .../ResponseRepositoryInterface.php           |  1 +
 src/Centreon/Domain/Gorgone/Response.php      | 31 ++++-----
 .../Interfaces/OptionRepositoryInterface.php  |  1 +
 .../Interfaces/OptionServiceInterface.php     |  1 +
 src/Centreon/Domain/Option/Option.php         | 11 ++--
 .../Domain/Option/OptionException.php         | 27 ++++++++
 src/Centreon/Domain/Option/OptionService.php  |  1 +
 .../Gorgone/CommandRepositoryAPI.php          |  1 +
 .../ConfigurationLoaderApiInterface.php       | 11 +++-
 .../Gorgone/ResponseRepositoryAPI.php         |  1 +
 .../Option/OptionRepositoryRDB.php            |  1 +
 .../Domain/Gorgone/CommandServiceTest.php     |  3 -
 .../configServers/popup/popup.php             | 63 ++++++++++---------
 26 files changed, 135 insertions(+), 65 deletions(-)
 rename src/Centreon/Domain/Gorgone/Interfaces/{ServiceInterface.php => GorgoneServiceInterface.php} (97%)
 create mode 100644 src/Centreon/Domain/Option/OptionException.php

diff --git a/src/Centreon/Application/Controller/GorgoneController.php b/src/Centreon/Application/Controller/GorgoneController.php
index 18de9516173..8ab1ac182d3 100644
--- a/src/Centreon/Application/Controller/GorgoneController.php
+++ b/src/Centreon/Application/Controller/GorgoneController.php
@@ -23,7 +23,7 @@
 
 use Centreon\Domain\Gorgone\Command\Internal\ThumbprintCommand;
 use Centreon\Domain\Gorgone\Interfaces\CommandInterface;
-use Centreon\Domain\Gorgone\Interfaces\ServiceInterface;
+use Centreon\Domain\Gorgone\Interfaces\GorgoneServiceInterface;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
 use FOS\RestBundle\Controller\Annotations as Rest;
 use FOS\RestBundle\View\View;
@@ -36,11 +36,11 @@
 class GorgoneController extends AbstractFOSRestController
 {
     /**
-     * @var ServiceInterface
+     * @var GorgoneServiceInterface
      */
     private $gorgoneService;
 
-    public function __construct(ServiceInterface $gorgoneService)
+    public function __construct(GorgoneServiceInterface $gorgoneService)
     {
         $this->gorgoneService = $gorgoneService;
     }
diff --git a/src/Centreon/Domain/Gorgone/ActionLog.php b/src/Centreon/Domain/Gorgone/ActionLog.php
index 01dd8be5ee6..6997968487d 100644
--- a/src/Centreon/Domain/Gorgone/ActionLog.php
+++ b/src/Centreon/Domain/Gorgone/ActionLog.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/Command/BasicCommand.php b/src/Centreon/Domain/Gorgone/Command/BasicCommand.php
index 7c0c5bc8ca5..84feaaccb21 100644
--- a/src/Centreon/Domain/Gorgone/Command/BasicCommand.php
+++ b/src/Centreon/Domain/Gorgone/Command/BasicCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -35,14 +36,21 @@ trait BasicCommand
      */
     private $monitoringInstanceId;
 
+    /**
+     * @var string|null
+     */
+    private $bodyRequest;
+
     /**
      * We create a command for a specific poller.
      *
      * @param int $pollerId Poller id for which this command is intended
+     * @param string|null $bodyRequest
      */
-    public function __construct(int $pollerId)
+    public function __construct(int $pollerId, string $bodyRequest = null)
     {
         $this->monitoringInstanceId = $pollerId;
+        $this->bodyRequest = $bodyRequest;
     }
 
     /**
diff --git a/src/Centreon/Domain/Gorgone/Command/CommandFactory.php b/src/Centreon/Domain/Gorgone/Command/CommandFactory.php
index a9e154475e3..10519acc02c 100644
--- a/src/Centreon/Domain/Gorgone/Command/CommandFactory.php
+++ b/src/Centreon/Domain/Gorgone/Command/CommandFactory.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -28,7 +29,7 @@ class CommandFactory
     /**
      * @var array<CommandInterface> GorgoneCommandInterface[]
      */
-    static private $commands = [];
+    private static $commands = [];
 
     /**
      * @param CommandInterface $command Command to add
diff --git a/src/Centreon/Domain/Gorgone/Command/EmptyCommand.php b/src/Centreon/Domain/Gorgone/Command/EmptyCommand.php
index 7db83351ae9..8c0faacc45a 100644
--- a/src/Centreon/Domain/Gorgone/Command/EmptyCommand.php
+++ b/src/Centreon/Domain/Gorgone/Command/EmptyCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/Command/Internal/ThumbprintCommand.php b/src/Centreon/Domain/Gorgone/Command/Internal/ThumbprintCommand.php
index 65d92a73169..1678544dd17 100644
--- a/src/Centreon/Domain/Gorgone/Command/Internal/ThumbprintCommand.php
+++ b/src/Centreon/Domain/Gorgone/Command/Internal/ThumbprintCommand.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/ConfigurationLoader.php b/src/Centreon/Domain/Gorgone/ConfigurationLoader.php
index 6c44ae69d80..50fa85b39e7 100644
--- a/src/Centreon/Domain/Gorgone/ConfigurationLoader.php
+++ b/src/Centreon/Domain/Gorgone/ConfigurationLoader.php
@@ -1,5 +1,6 @@
 <?php
-/**
+
+/*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,7 +47,7 @@ class ConfigurationLoader implements ConfigurationLoaderApiInterface
     private $optionService;
 
     /**
-     * @var array<string, string> Parameters of the Gorgone server
+     * @var array<string, string|null> Parameters of the Gorgone server
      */
     private $gorgoneParameters;
 
@@ -144,6 +145,8 @@ public function getCommandTimeout(): int
 
     /**
      * Loads configuration of the Gorgone server
+     *
+     * @throws \Exception
      */
     private function loadConfiguration(): void
     {
@@ -163,6 +166,7 @@ private function loadConfiguration(): void
             $this->isOptionsLoaded = true;
         } catch (\Exception $ex) {
             $this->isOptionsLoaded = false;
+            throw $ex;
         }
     }
 }
diff --git a/src/Centreon/Domain/Gorgone/GorgoneException.php b/src/Centreon/Domain/Gorgone/GorgoneException.php
index 6799c9e01c5..50d969589e2 100644
--- a/src/Centreon/Domain/Gorgone/GorgoneException.php
+++ b/src/Centreon/Domain/Gorgone/GorgoneException.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -17,6 +18,7 @@
  * For more information : contact@centreon.com
  *
  */
+declare(strict_types=1);
 
 namespace Centreon\Domain\Gorgone;
 
diff --git a/src/Centreon/Domain/Gorgone/GorgoneService.php b/src/Centreon/Domain/Gorgone/GorgoneService.php
index 1357566e7b4..3e8faf92129 100644
--- a/src/Centreon/Domain/Gorgone/GorgoneService.php
+++ b/src/Centreon/Domain/Gorgone/GorgoneService.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -26,9 +27,9 @@
 use Centreon\Domain\Gorgone\Interfaces\CommandRepositoryInterface;
 use Centreon\Domain\Gorgone\Interfaces\ResponseInterface;
 use Centreon\Domain\Gorgone\Interfaces\ResponseRepositoryInterface;
-use Centreon\Domain\Gorgone\Interfaces\ServiceInterface;
+use Centreon\Domain\Gorgone\Interfaces\GorgoneServiceInterface;
 
-class GorgoneService implements ServiceInterface
+class GorgoneService implements GorgoneServiceInterface
 {
     /**
      * @var ResponseRepositoryInterface
diff --git a/src/Centreon/Domain/Gorgone/Interfaces/CommandInterface.php b/src/Centreon/Domain/Gorgone/Interfaces/CommandInterface.php
index 6352a942fd0..03aac00bbb9 100644
--- a/src/Centreon/Domain/Gorgone/Interfaces/CommandInterface.php
+++ b/src/Centreon/Domain/Gorgone/Interfaces/CommandInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -53,9 +54,9 @@ public function getUriRequest(): string;
     /**
      * Returns the body of the request that will be sent to the Gorgone server.
      *
-     * @return string Body of the request
+     * @return string|null Body of the request
      */
-    public function getBodyRequest(): string;
+    public function getBodyRequest(): ?string;
 
     /**
      * Returns the monitoring instance id for which this command is intended.
diff --git a/src/Centreon/Domain/Gorgone/Interfaces/CommandRepositoryInterface.php b/src/Centreon/Domain/Gorgone/Interfaces/CommandRepositoryInterface.php
index cdd371a5833..5a53f3a95bb 100644
--- a/src/Centreon/Domain/Gorgone/Interfaces/CommandRepositoryInterface.php
+++ b/src/Centreon/Domain/Gorgone/Interfaces/CommandRepositoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/Interfaces/ServiceInterface.php b/src/Centreon/Domain/Gorgone/Interfaces/GorgoneServiceInterface.php
similarity index 97%
rename from src/Centreon/Domain/Gorgone/Interfaces/ServiceInterface.php
rename to src/Centreon/Domain/Gorgone/Interfaces/GorgoneServiceInterface.php
index 8606f28dc66..f2df24c1e40 100644
--- a/src/Centreon/Domain/Gorgone/Interfaces/ServiceInterface.php
+++ b/src/Centreon/Domain/Gorgone/Interfaces/GorgoneServiceInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -21,7 +22,7 @@
 
 namespace Centreon\Domain\Gorgone\Interfaces;
 
-interface ServiceInterface
+interface GorgoneServiceInterface
 {
     /**
      * Send a command to the Gorgone server and retrieve an instance of the
diff --git a/src/Centreon/Domain/Gorgone/Interfaces/ResponseInterface.php b/src/Centreon/Domain/Gorgone/Interfaces/ResponseInterface.php
index c3fd5edab20..8d20f536b8a 100644
--- a/src/Centreon/Domain/Gorgone/Interfaces/ResponseInterface.php
+++ b/src/Centreon/Domain/Gorgone/Interfaces/ResponseInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/Interfaces/ResponseRepositoryInterface.php b/src/Centreon/Domain/Gorgone/Interfaces/ResponseRepositoryInterface.php
index ddc66992ade..046713c1ea9 100644
--- a/src/Centreon/Domain/Gorgone/Interfaces/ResponseRepositoryInterface.php
+++ b/src/Centreon/Domain/Gorgone/Interfaces/ResponseRepositoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Gorgone/Response.php b/src/Centreon/Domain/Gorgone/Response.php
index a1bcb650928..dafeea7edda 100644
--- a/src/Centreon/Domain/Gorgone/Response.php
+++ b/src/Centreon/Domain/Gorgone/Response.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -62,7 +63,7 @@ class Response implements ResponseInterface
     /**
      * @var ResponseRepositoryInterface
      */
-    static private $staticResponseRepository;
+    private static $staticResponseRepository;
 
     /**
      * @var ResponseRepositoryInterface
@@ -118,10 +119,23 @@ public function getMessage(): ?string
 
     /**
      * @return ActionLog[]
+     * @throws \Exception
      * @see Response::$actionLogs
      */
     public function getActionLogs(): array
     {
+        $this->actionLogs = [];
+        $rawResponse = $this->responseRepository->getResponse($this->command);
+        $jsonResponse = json_decode($rawResponse, true);
+        $this->error = $jsonResponse['error'] ?? null;
+        $this->token = (string) $jsonResponse['token'];
+
+        if ($this->error === null) {
+            foreach ($jsonResponse['data'] as $key => $responseData) {
+                $this->actionLogs[$key] = ActionLog::create($responseData);
+            }
+        }
+        $this->message = ((string) $jsonResponse['message'] ?? null);
         return $this->actionLogs;
     }
 
@@ -131,20 +145,7 @@ public function getActionLogs(): array
      */
     public function getLastActionLog(): ?ActionLog
     {
-        if (empty($this->actionLogs)) {
-            $rawResponse = $this->responseRepository->getResponse($this->command);
-            $jsonResponse = json_decode($rawResponse, true);
-            $this->error = $jsonResponse['error'] ?? null;
-            $this->token = (string) $jsonResponse['token'];
-
-            if ($this->error === null) {
-                $this->actionLogs = [];
-                foreach ($jsonResponse['data'] as $key => $responseData) {
-                    $this->actionLogs[$key] = ActionLog::create($responseData);
-                }
-            }
-            $this->message = ((string) $jsonResponse['message'] ?? null);
-        }
+        $this->getActionLogs();
         return $this->actionLogs[count($this->actionLogs) - 1] ?? null;
     }
 
diff --git a/src/Centreon/Domain/Option/Interfaces/OptionRepositoryInterface.php b/src/Centreon/Domain/Option/Interfaces/OptionRepositoryInterface.php
index 5d47def552a..624ed467fe1 100644
--- a/src/Centreon/Domain/Option/Interfaces/OptionRepositoryInterface.php
+++ b/src/Centreon/Domain/Option/Interfaces/OptionRepositoryInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Option/Interfaces/OptionServiceInterface.php b/src/Centreon/Domain/Option/Interfaces/OptionServiceInterface.php
index 3a54b0defcf..e1f03796c69 100644
--- a/src/Centreon/Domain/Option/Interfaces/OptionServiceInterface.php
+++ b/src/Centreon/Domain/Option/Interfaces/OptionServiceInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Domain/Option/Option.php b/src/Centreon/Domain/Option/Option.php
index 66b87820a1f..59d77001346 100644
--- a/src/Centreon/Domain/Option/Option.php
+++ b/src/Centreon/Domain/Option/Option.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
@@ -29,7 +30,7 @@ class Option
     private $name;
 
     /**
-     * @var string Option value
+     * @var string|null Option value
      */
     private $value;
 
@@ -54,20 +55,20 @@ public function setName(string $name): Option
     }
 
     /**
-     * @return string
+     * @return string|null
      * @see Option::$value
      */
-    public function getValue(): string
+    public function getValue(): ?string
     {
         return $this->value;
     }
 
     /**
-     * @param string $value
+     * @param string|null $value
      * @return Option
      * @see Option::$value
      */
-    public function setValue(string $value): Option
+    public function setValue(?string $value): Option
     {
         $this->value = $value;
         return $this;
diff --git a/src/Centreon/Domain/Option/OptionException.php b/src/Centreon/Domain/Option/OptionException.php
new file mode 100644
index 00000000000..d8cb6fca20b
--- /dev/null
+++ b/src/Centreon/Domain/Option/OptionException.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * For more information : contact@centreon.com
+ *
+ */
+declare(strict_types=1);
+
+namespace Centreon\Domain\Option;
+
+class OptionException extends \Exception
+{
+}
diff --git a/src/Centreon/Domain/Option/OptionService.php b/src/Centreon/Domain/Option/OptionService.php
index 86a50855852..2e6791e1746 100644
--- a/src/Centreon/Domain/Option/OptionService.php
+++ b/src/Centreon/Domain/Option/OptionService.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Infrastructure/Gorgone/CommandRepositoryAPI.php b/src/Centreon/Infrastructure/Gorgone/CommandRepositoryAPI.php
index 8334eba3b05..27f766a16aa 100644
--- a/src/Centreon/Infrastructure/Gorgone/CommandRepositoryAPI.php
+++ b/src/Centreon/Infrastructure/Gorgone/CommandRepositoryAPI.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Infrastructure/Gorgone/Interfaces/ConfigurationLoaderApiInterface.php b/src/Centreon/Infrastructure/Gorgone/Interfaces/ConfigurationLoaderApiInterface.php
index dfacee9cdb3..93fe6f58ef1 100644
--- a/src/Centreon/Infrastructure/Gorgone/Interfaces/ConfigurationLoaderApiInterface.php
+++ b/src/Centreon/Infrastructure/Gorgone/Interfaces/ConfigurationLoaderApiInterface.php
@@ -1,5 +1,6 @@
 <?php
-/**
+
+/*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,6 +18,7 @@
  * For more information : contact@centreon.com
  *
  */
+declare(strict_types=1);
 
 namespace Centreon\Infrastructure\Gorgone\Interfaces;
 
@@ -26,6 +28,7 @@ interface ConfigurationLoaderApiInterface
      * Indicates whether the connection to the Gorgone server used a self-signed certificate
      *
      * @return bool
+     * @throws \Exception
      */
     public function isSecureConnectionSelfSigned(): bool;
 
@@ -33,6 +36,7 @@ public function isSecureConnectionSelfSigned(): bool;
      * Returns the IP address of the Gorgone server
      *
      * @return string|null IP address
+     * @throws \Exception
      */
     public function getApiIpAddress(): ?string;
 
@@ -40,6 +44,7 @@ public function getApiIpAddress(): ?string;
      * Returns the connection port of the Gorgone server
      *
      * @return int|null Connection port
+     * @throws \Exception
      */
     public function getApiPort(): ?int;
 
@@ -47,6 +52,7 @@ public function getApiPort(): ?int;
      * Returns the API password of the Gorgone server
      *
      * @return string|null API password of the Gorgone server
+     * @throws \Exception
      */
     public function getApiPassword(): ?string;
 
@@ -54,6 +60,7 @@ public function getApiPassword(): ?string;
      * Returns the delay before the connection timeout
      *
      * @return int Timeout (in seconds)
+     * @throws \Exception
      */
     public function getCommandTimeout(): int;
 
@@ -61,6 +68,7 @@ public function getCommandTimeout(): int;
      * Indicates whether the connection to the Gorgone server is secure
      *
      * @return bool
+     * @throws \Exception
      */
     public function isApiConnectionSecure(): bool;
 
@@ -68,6 +76,7 @@ public function isApiConnectionSecure(): bool;
      * Returns the API username of the Gorgone server
      *
      * @return string|null API username of the Gorgone server
+     * @throws \Exception
      */
     public function getApiUsername(): ?string;
 }
diff --git a/src/Centreon/Infrastructure/Gorgone/ResponseRepositoryAPI.php b/src/Centreon/Infrastructure/Gorgone/ResponseRepositoryAPI.php
index 0f24b7aee9e..a9fc0d804dc 100644
--- a/src/Centreon/Infrastructure/Gorgone/ResponseRepositoryAPI.php
+++ b/src/Centreon/Infrastructure/Gorgone/ResponseRepositoryAPI.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/src/Centreon/Infrastructure/Option/OptionRepositoryRDB.php b/src/Centreon/Infrastructure/Option/OptionRepositoryRDB.php
index 3a563491a02..6f4754347a7 100644
--- a/src/Centreon/Infrastructure/Option/OptionRepositoryRDB.php
+++ b/src/Centreon/Infrastructure/Option/OptionRepositoryRDB.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *
diff --git a/tests/php/Centreon/Domain/Gorgone/CommandServiceTest.php b/tests/php/Centreon/Domain/Gorgone/CommandServiceTest.php
index eec5459b817..5e8c68ed33d 100644
--- a/tests/php/Centreon/Domain/Gorgone/CommandServiceTest.php
+++ b/tests/php/Centreon/Domain/Gorgone/CommandServiceTest.php
@@ -27,9 +27,6 @@
 use Centreon\Domain\Gorgone\Interfaces\ResponseRepositoryInterface;
 use Centreon\Domain\Gorgone\Response;
 use Centreon\Domain\Gorgone\Interfaces\ResponseInterface;
-use Centreon\Domain\Option\Interfaces\OptionRepositoryInterface;
-use Centreon\Infrastructure\Gorgone\CommandRepositoryAPI;
-use Centreon\Infrastructure\Gorgone\ResponseRepositoryAPI;
 use PHPUnit\Framework\TestCase;
 
 class CommandServiceTest extends TestCase
diff --git a/www/include/configuration/configServers/popup/popup.php b/www/include/configuration/configServers/popup/popup.php
index b90a2ed93e5..d5aa804a9dd 100644
--- a/www/include/configuration/configServers/popup/popup.php
+++ b/www/include/configuration/configServers/popup/popup.php
@@ -90,38 +90,43 @@
 $gorgoneError = false;
 $timeout = 0;
 
-foreach ($parents as $serverId) {
-    $lastActionLog = null;
-    $thumbprintCommand = new \Centreon\Domain\Gorgone\Command\Internal\ThumbprintCommand($serverId);
-    $gorgoneResponse = $gorgoneService->send($thumbprintCommand);
-    // check if we have log for 30 s every 2s
-    do {
-        $lastActionLog = $gorgoneResponse->getLastActionLog();
-        sleep(2);
-        $timeout += 2;
-    } while (
-        ($lastActionLog == null || $lastActionLog->getCode() === \Centreon\Domain\Gorgone\Response::STATUS_BEGIN) &&
-        $timeout <= 30
-    );
+try {
+    foreach ($parents as $serverId) {
+        $lastActionLog = null;
+        $thumbprintCommand = new \Centreon\Domain\Gorgone\Command\Internal\ThumbprintCommand($serverId);
+        $gorgoneResponse = $gorgoneService->send($thumbprintCommand);
+        // check if we have log for 30 s every 2s
+        do {
+            $lastActionLog = $gorgoneResponse->getLastActionLog();
+            sleep(2);
+            $timeout += 2;
+        } while (
+            ($lastActionLog == null || $lastActionLog->getCode() === \Centreon\Domain\Gorgone\Response::STATUS_BEGIN) &&
+            $timeout <= 30
+        );
 
-    if ($timeout > 30) {
-        // add 10 s for the next server
-        $timeout -= 10;
-        $gorgoneError = true;
-        $dataError .= '
-    - error : TimeOut error for poller ' . $serverId . ' We can\'t get log';
-        continue;
-    }
+        if ($timeout > 30) {
+            // add 10 s for the next server
+            $timeout -= 10;
+            $gorgoneError = true;
+            $dataError .= '
+    - error : TimeOut error for poller '.$serverId.' We can\'t get log';
+            continue;
+        }
 
-    $thummprintReponse = json_decode($lastActionLog->getData(), true);
-    if ($lastActionLog->getCode() === \Centreon\Domain\Gorgone\Response::STATUS_OK) {
-        $thumbprints .= '
-      - key: ' . $thummprintReponse['data']['thumbprint'];
-    } else {
-        $gorgoneError = true;
-        $dataError .= '
-      - error : Poller ' . $serverId . ' : ' . $thummprintReponse['message'];
+        $thummprintReponse = json_decode($lastActionLog->getData(), true);
+        if ($lastActionLog->getCode() === \Centreon\Domain\Gorgone\Response::STATUS_OK) {
+            $thumbprints .= '
+      - key: '.$thummprintReponse['data']['thumbprint'];
+        } else {
+            $gorgoneError = true;
+            $dataError .= '
+      - error : Poller '.$serverId.' : '.$thummprintReponse['message'];
+        }
     }
+} catch (\Exception $ex) {
+    $gorgoneError = true;
+    $dataError = $ex->getMessage();
 }
 
 if (!empty($dataError)) {