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>

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;
     }

src/Centreon/Domain/Gorgone/ActionLog.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

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;
     }
 
     /**

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

src/Centreon/Domain/Gorgone/Command/EmptyCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

src/Centreon/Domain/Gorgone/Command/Internal/ThumbprintCommand.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

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;
         }
     }
 }

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;
 

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

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.

src/Centreon/Domain/Gorgone/Interfaces/CommandRepositoryInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

src/Centreon/Domain/Gorgone/Interfaces/ServiceInterface.php → 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

src/Centreon/Domain/Gorgone/Interfaces/ResponseInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

src/Centreon/Domain/Gorgone/Interfaces/ResponseRepositoryInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

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;
     }
 

src/Centreon/Domain/Option/Interfaces/OptionRepositoryInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

src/Centreon/Domain/Option/Interfaces/OptionServiceInterface.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

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;

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
+{
+}

src/Centreon/Domain/Option/OptionService.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *

src/Centreon/Infrastructure/Gorgone/CommandRepositoryAPI.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * Copyright 2005 - 2020 Centreon (https://www.centreon.com/)
  *