php

Author: millotp

generators/src/main/java/com/algolia/codegen/cts/tests/ClientTestData.java

@@ -15,7 +15,6 @@ class Step {
   public String type;
   public String method;
   public Map<String, Object> parameters;
-  public Map<String, Object> requestOptions;
   public Expected expected;
 }
 

generators/src/main/java/com/algolia/codegen/cts/tests/TestsClient.java

@@ -103,12 +103,6 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
 
             stepOut.put("method", step.method);
 
-            if (step.requestOptions != null) {
-              Map<String, Object> requestOptions = new HashMap<>();
-              paramsType.enhanceParameters(step.requestOptions, requestOptions);
-              stepOut.put("requestOptions", requestOptions);
-            }
-
             if (step.method != null && CUSTOM_METHODS.contains(step.method)) {
               stepOut.put("isCustom", true);
             }

generators/src/main/java/com/algolia/codegen/cts/tests/TestsRequest.java

@@ -193,12 +193,14 @@ public void run(Map<String, CodegenModel> models, Map<String, CodegenOperation>
               Map<String, Object> queryParameters = new HashMap<>();
               paramsType.enhanceParameters(req.requestOptions.queryParameters, queryParameters);
               requestOptions.put("queryParameters", queryParameters);
+              requestOptions.put("hasQueryParameters", !queryParameters.isEmpty());
             }
             if (req.requestOptions.headers != null) {
               Map<String, Object> headers = new HashMap<>();
               // convert the headers to an acceptable type
               paramsType.enhanceParameters(new HashMap<String, Object>(req.requestOptions.headers), headers);
               requestOptions.put("headers", headers);
+              requestOptions.put("hasHeaders", !headers.isEmpty());
             }
             test.put("requestOptions", requestOptions);
           }

templates/php/snippets/method.mustache

@@ -23,23 +23,8 @@ class Snippet{{client}}
         // Initialize the client
         $client = {{client}}::create('<YOUR_APP_ID>', '<YOUR_API_KEY>'{{#hasRegionalHost}}, 'YOUR_APP_ID_REGION'{{/hasRegionalHost}});
 
-        {{#hasRequestOptions}}
-          $requestOptions = [
-            'queryParameters' => [
-              {{#requestOptions.queryParameters.parametersWithDataType}}
-                '{{{key}}}' => {{> tests/requests/requestOptionsParams}},
-              {{/requestOptions.queryParameters.parametersWithDataType}}
-            ],
-            'headers' => [
-              {{#requestOptions.headers.parametersWithDataType}}
-                '{{{key}}}' => '{{{value}}}',
-              {{/requestOptions.headers.parametersWithDataType}}
-            ]
-          ];
-        {{/hasRequestOptions}}
-
         // Call the API
-        $response = $client->{{^hasParams}}{{{method}}}();{{/hasParams}}{{#hasParams}}{{{method}}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}$requestOptions{{/hasRequestOptions}});{{/hasParams}}
+        $response = {{> tests/method}};
 
         // play with the response
         var_dump($response);

templates/php/tests/e2e/e2e.mustache

@@ -53,9 +53,7 @@ class {{clientPrefix}}Test extends TestCase
     public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}()
     {
         $client = $this->getClient();
-        $resp = $client->{{^hasParams}}{{{method}}}();{{/hasParams}}{{#hasParams}}{{{method}}}(
-        {{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}$requestOptions{{/hasRequestOptions}}
-        );{{/hasParams}}
+        $resp = {{> tests/method}};
 
         {{#response}}
         {{#body}}

templates/php/tests/method.mustache

@@ -1 +1,13 @@
-$client->{{{method}}}{{^parametersWithDataType}}();{{/parametersWithDataType}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}});
+$client->{{^hasParams}}{{{method}}}(){{/hasParams}}{{#hasParams}}{{{method}}}({{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}[
+  {{#requestOptions.hasQueryParameters}}
+    'queryParameters' => [
+      {{#requestOptions.queryParameters.parametersWithDataType}}
+        '{{{key}}}' => {{> tests/requests/requestOptionsParams}},
+      {{/requestOptions.queryParameters.parametersWithDataType}}
+    ],{{/requestOptions.hasQueryParameters}}{{#requestOptions.hasHeaders}}
+    'headers' => [
+      {{#requestOptions.headers.parametersWithDataType}}
+        '{{{key}}}' => '{{{value}}}',
+      {{/requestOptions.headers.parametersWithDataType}}
+    ]{{/requestOptions.hasHeaders}}
+  ]{{/hasRequestOptions}}){{/hasParams}}

templates/php/tests/requests/requests.mustache

@@ -83,23 +83,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
     public function test{{#lambda.titlecase}}{{method}}{{/lambda.titlecase}}{{testIndex}}()
     {
         $client = $this->getClient();
-        {{#hasRequestOptions}}
-          $requestOptions = [
-            'queryParameters' => [
-              {{#requestOptions.queryParameters.parametersWithDataType}}
-                '{{{key}}}' => {{> tests/requests/requestOptionsParams}},
-              {{/requestOptions.queryParameters.parametersWithDataType}}
-            ],
-            'headers' => [
-              {{#requestOptions.headers.parametersWithDataType}}
-                '{{{key}}}' => '{{{value}}}',
-              {{/requestOptions.headers.parametersWithDataType}}
-            ]
-          ];
-        {{/hasRequestOptions}}
-        $client->{{^hasParams}}{{{method}}}();{{/hasParams}}{{#hasParams}}{{{method}}}(
-        {{#parametersWithDataType}}{{> tests/generateParams}}{{/parametersWithDataType}}{{#hasRequestOptions}}$requestOptions{{/hasRequestOptions}}
-        );{{/hasParams}}
+        {{> tests/method}};
 
         $this->assertRequests([
             [