fix(operation): get valid json when body is empty

OpenClassrooms · Feb 27, 2024 · a849bac · a849bac
1 parent ce8fedc
commit a849bac
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/src/Command/ExecutePlanCommand.php b/src/Command/ExecutePlanCommand.php
@@ -4,8 +4,6 @@
 
 namespace APITester\Command;
 
-use APITester\Authenticator\Exception\AuthenticationException;
-use APITester\Authenticator\Exception\AuthenticationLoadingException;
 use APITester\Config;
 use APITester\Config\Exception\ConfigurationException;
 use APITester\Definition\Loader\Exception\DefinitionLoaderNotFoundException;
@@ -40,9 +38,7 @@ protected function initialize(InputInterface $input, OutputInterface $output): v
      * @throws DefinitionLoadingException
      * @throws InvalidPreparatorConfigException
      * @throws RequesterNotFoundException
-     * @throws AuthenticationLoadingException
      * @throws ConfigurationException
-     * @throws AuthenticationException
      * @throws SuiteNotFoundException
      */
     protected function execute(InputInterface $input, OutputInterface $output): int

diff --git a/src/Definition/Body.php b/src/Definition/Body.php
@@ -4,7 +4,6 @@
 
 namespace APITester\Definition;
 
-use APITester\Util\Json;
 use cebe\openapi\exceptions\TypeErrorException;
 use cebe\openapi\spec\Schema;
 use Vural\OpenAPIFaker\Options;
@@ -73,7 +72,7 @@ public function getStringExample(?string $name = null): string
     {
         $example = $this->parent->getExample($name);
 
-        return $example->getStringBody() ?? Json::encode($this->getRandomContent());
+        return $example->getStringBody();
     }
 
     /**

diff --git a/src/Definition/Example/OperationExample.php b/src/Definition/Example/OperationExample.php
@@ -502,10 +502,10 @@ public function setPath(?string $path): self
         return $this;
     }
 
-    public function getStringBody(): ?string
+    public function getStringBody(): string
     {
         if ($this->getBody() === null) {
-            return null;
+            return '{}';
         }
 
         return $this->getBody()

diff --git a/src/Test/Plan.php b/src/Test/Plan.php
@@ -45,6 +45,7 @@ final class Plan
         'ignore-baseline',
         'only-baseline',
         'part',
+        'operation-id',
     ];
 
     private readonly Authenticator $authenticator;
@@ -100,8 +101,6 @@ public function __construct(
      * @throws DefinitionLoadingException
      * @throws RequesterNotFoundException
      * @throws InvalidPreparatorConfigException
-     * @throws AuthenticationLoadingException
-     * @throws AuthenticationException
      * @throws SuiteNotFoundException
      */
     public function execute(
@@ -187,8 +186,6 @@ private function resetBaseLine(Config\Suite $suiteConfig): void
     /**
      * @param array<string, mixed> $options
      *
-     * @throws AuthenticationException
-     * @throws AuthenticationLoadingException
      * @throws DefinitionLoaderNotFoundException
      * @throws DefinitionLoadingException
      * @throws InvalidPreparatorConfigException
@@ -343,15 +340,15 @@ private function loadRequester(string $name, string $baseUri, ?HttpKernelInterfa
         throw new RequesterNotFoundException($name);
     }
 
-    /**
-     * @throws AuthenticationLoadingException
-     * @throws AuthenticationException
-     */
     private function authenticate(Config\Suite $config, Api $api, Requester $requester): Tokens
     {
         $tokens = new Tokens();
         foreach ($config->getAuthentications() as $authConf) {
-            $tokens->add($this->authenticator->authenticate($authConf, $api, $requester));
+            try {
+                $tokens->add($this->authenticator->authenticate($authConf, $api, $requester));
+            } catch (AuthenticationException|AuthenticationLoadingException $e) {
+                $this->logger->error($e->getMessage());
+            }
         }
 
         return $tokens;