PR changes

Author: Laurynas Griciunas

src/Paysera/Bundle/CodeGeneratorBundle/Service/BodyResolver.php

@@ -42,31 +42,31 @@ public function getRequestBody(Method $method)
      */
     public function getResponseBody(Method $method)
     {
-        $successfulResponseWithBody = $this->getSuccessfulResponseWithBody($method);
-        if ($successfulResponseWithBody === null) {
+        $successfulResponse = $this->getSuccessfulResponse($method);
+        if ($successfulResponse === null) {
             return null;
         }
 
         try {
-            return $successfulResponseWithBody->getBodyByType(self::BODY_JSON);
+            return $successfulResponse->getBodyByType(self::BODY_JSON);
         } catch (Exception $exception) {}
 
         try {
-            $body = $successfulResponseWithBody->getBodyByType(self::BODY_JAVASCRIPT);
+            $body = $successfulResponse->getBodyByType(self::BODY_JAVASCRIPT);
             $body->setType(new StringType('string'));
 
             return $body;
         } catch (Exception $exception) {}
 
         try {
-            return $successfulResponseWithBody->getBodyByType(self::BODY_OCTET_STREAM);
+            return $successfulResponse->getBodyByType(self::BODY_OCTET_STREAM);
         } catch (Exception $exception) {}
 
         try {
-            return $successfulResponseWithBody->getBodyByType(self::BODY_TEXT_CSV);
+            return $successfulResponse->getBodyByType(self::BODY_TEXT_CSV);
         } catch (Exception $exception) {}
 
-        throw new Exception('No body found');
+        return null;
     }
 
     public function isRawResponse(Method $method)
@@ -104,7 +104,7 @@ public function isIterableResponse(Method $method, ApiDefinition $api)
         return false;
     }
 
-    private function getSuccessfulResponseWithBody(Method $method): ?Response
+    private function getSuccessfulResponse(Method $method): ?Response
     {
         if ($method->getResponse(StatusCodeInterface::STATUS_OK) !== null) {
             return ($method->getResponse(StatusCodeInterface::STATUS_OK));

tests/PhpGeneratorBundle/RestClient/Fixtures/expected/transfer-surveillance-assistant/README.md

@@ -12,7 +12,7 @@ This library provides `ClientFactory` class, which you should use to get the API
 use Paysera\Test\TransferSurveillanceAssistantClient\ClientFactory;
 
 $clientFactory = new ClientFactory([
-    'base_url' => 'http://transfer-surveillance-assistant.paysera.lan/rest/v1/', // optional, in case you need a custom one.
+    'base_url' => 'http://example.com/transfer-surveillance-assistant/rest/v1/', // optional, in case you need a custom one.
     'mac' => [                                          // use this, if API requires Mac authentication.
         'mac_id' => 'my-mac-id',
         'mac_secret' => 'my-mac-secret',
@@ -39,17 +39,6 @@ Now, that you have instance of `TransferSurveillanceAssistantClient`, you can us
 ### Methods
 
 
-Get the generated analysis report, if it exists
-
-
-```php
-
-$result = $transferSurveillanceAssistantClient->getAnalysisTaskReport($id);
-```
----
-
-
-
 Submit a new analysis task for processing
 
 
@@ -65,3 +54,12 @@ $result = $transferSurveillanceAssistantClient->createAnalysisTask($analysisTask
 ```
 ---
 
+I am not a real endpoint
+
+
+```php
+
+$transferSurveillanceAssistantClient->updateAnalysisTask();
+```
+---
+

tests/PhpGeneratorBundle/RestClient/Fixtures/expected/transfer-surveillance-assistant/src/ClientFactory.php

@@ -7,7 +7,7 @@
 
 class ClientFactory extends ClientFactoryAbstract
 {
-    const DEFAULT_BASE_URL = 'http://transfer-surveillance-assistant.paysera.lan/rest/v1/';
+    const DEFAULT_BASE_URL = 'http://example.com/transfer-surveillance-assistant/rest/v1/';
 
     protected $apiClient;
 

tests/PhpGeneratorBundle/RestClient/Fixtures/expected/transfer-surveillance-assistant/src/Entity/AnalysisReport.php

@@ -22,40 +22,39 @@ public function withOptions(array $options)
     }
 
     /**
-     * Get the generated analysis report, if it exists
-     * GET /analysis-tasks/{id}/report
+     * Submit a new analysis task for processing
+     * POST /analysis-tasks
      *
-     * @param string $id
-     * @return Entities\AnalysisReport
+     * @param Entities\AnalysisTaskInput $analysisTaskInput
+     * @return Entities\AnalysisTaskOutput
      */
-    public function getAnalysisTaskReport($id)
+    public function createAnalysisTask(Entities\AnalysisTaskInput $analysisTaskInput)
     {
         $request = $this->apiClient->createRequest(
-            RequestMethodInterface::METHOD_GET,
-            sprintf('analysis-tasks/%s/report', rawurlencode($id)),
-            null
+            RequestMethodInterface::METHOD_POST,
+            'analysis-tasks',
+            $analysisTaskInput
         );
         $data = $this->apiClient->makeRequest($request);
 
-        return new Entities\AnalysisReport($data);
+        return new Entities\AnalysisTaskOutput($data);
     }
 
     /**
-     * Submit a new analysis task for processing
-     * POST /analysis-tasks
+     * I am not a real endpoint
+     * PUT /analysis-tasks
      *
-     * @param Entities\AnalysisTaskInput $analysisTaskInput
-     * @return Entities\AnalysisTaskOutput
+     * @return null
      */
-    public function createAnalysisTask(Entities\AnalysisTaskInput $analysisTaskInput)
+    public function updateAnalysisTask()
     {
         $request = $this->apiClient->createRequest(
-            RequestMethodInterface::METHOD_POST,
+            RequestMethodInterface::METHOD_PUT,
             'analysis-tasks',
-            $analysisTaskInput
+            null
         );
         $data = $this->apiClient->makeRequest($request);
 
-        return new Entities\AnalysisTaskOutput($data);
+        return null;
     }
 }

tests/PhpGeneratorBundle/RestClient/Fixtures/expected/transfer-surveillance-assistant/src/TransferSurveillanceAssistantClient.php

@@ -1,7 +1,7 @@
 #%RAML 1.0
 title: Transfer Surveillance Assistant
 version: "1.0"
-baseUri: http://transfer-surveillance-assistant.paysera.lan/rest/v1
+baseUri: http://example.com/transfer-surveillance-assistant/rest/v1/
 protocols: [HTTP]
 
 uses:
@@ -10,7 +10,6 @@ uses:
 types:
   AnalysisTaskInput: !include types/analysis-task-input.raml
   AnalysisTaskOutput: !include types/analysis-task-output.raml
-  AnalysisReport: !include types/analysis-report.raml
 
 /analysis-tasks:
   post:
@@ -24,13 +23,9 @@ types:
         body:
           application/json:
             type: AnalysisTaskOutput
-  /{id}:
-    /report:
-      get:
-        description: Get the generated analysis report, if it exists
-        responses:
-          200:
-            body:
-              application/json:
-                type: AnalysisReport
-
+  put:
+    description: I am not a real endpoint
+    responses:
+      202:
+        description: This is not the response you're looking for
+        body: null