Fix PHP

Author: abnegate

templates/php/base/params.twig

@@ -11,13 +11,11 @@
         if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) {
             $apiParams['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }};
         }
-
 {% endfor %}
 {% for parameter in method.parameters.body %}
         if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) {
             $apiParams['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }};
         }
-
 {% endfor %}
 {% for parameter in method.parameters.formData %}
         if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) {

templates/php/base/requests/api.twig

@@ -1,8 +1,14 @@
-        return $this->client->call(Client::METHOD_{{ method.method | caseUpper }}, $apiPath, [
-{% for parameter in method.parameters.header %}
-            '{{ parameter.name }}' => ${{ parameter.name | caseCamel | escapeKeyword }},
-{% endfor %}
-{% for key, header in method.headers %}
-            '{{ key }}' => '{{ header }}',
-{% endfor %}
-        ], $apiParams{% if method.type == 'webAuth' %}, "location"{% endif %});
+        return $this->client->call(
+            Client::METHOD_{{ method.method | caseUpper }},
+            $apiPath,
+            [
+                {%~ for parameter in method.parameters.header %}
+                '{{ parameter.name }}' => ${{ parameter.name | caseCamel | escapeKeyword }},
+                {%~ endfor %}
+                {%~ for key, header in method.headers %}
+                '{{ key }}' => '{{ header }}',
+                {%~ endfor %}
+            ],
+            $apiParams{% if method.type == 'webAuth' -%}, 'location'{% endif %}
+
+        );

templates/php/src/Client.php.twig

@@ -122,12 +122,9 @@ class Client
      */
     public function call($method, $path = '', $headers = array(), array $params = array(), ?string $responseType = null)
     {
-        $headers            = array_merge($this->headers, $headers);
-        $ch                 = curl_init($this->endpoint . $path . (($method == self::METHOD_GET && !empty($params)) ? '?' . http_build_query($params) : ''));
-        $responseHeaders    = [];
-        $responseStatus     = -1;
-        $responseType       = '';
-        $responseBody       = '';
+        $headers = array_merge($this->headers, $headers);
+        $ch = curl_init($this->endpoint . $path . (($method == self::METHOD_GET && !empty($params)) ? '?' . http_build_query($params) : ''));
+        $responseHeaders = [];
 
         switch ($headers['content-type']) {
             case 'application/json':
@@ -152,7 +149,7 @@ class Client
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_USERAGENT, php_uname('s') . '-' . php_uname('r') . ':{{ language.name | caseLower }}-' . phpversion());
         curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $responseType === 'location' ? false : true);
+        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $responseType !== 'location');
         curl_setopt($ch, CURLOPT_HEADERFUNCTION, function($curl, $header) use (&$responseHeaders) {
             $len = strlen($header);
             $header = explode(':', strtolower($header), 2);

templates/php/src/Services/Service.php.twig

@@ -49,15 +49,15 @@ class {{ service.name | caseUcfirst }} extends Service
     {
         $apiPath = str_replace([{% for parameter in method.parameters.path %}'{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'{% if not loop.last %}, {% endif %}{% endfor %}], [{% for parameter in method.parameters.path %}${{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last %}, {% endif %}{% endfor %}], '{{ method.path }}');
 
-{{ include('php/base/params.twig') }}
-{% if 'multipart/form-data' in method.consumes %}
-{{ include('php/base/requests/file.twig') }}
-{% else %}
-{{ include('php/base/requests/api.twig') }}
-{% endif %}
+        {{~ include('php/base/params.twig') -}}
+        {%~ if 'multipart/form-data' in method.consumes %}
+        {{~ include('php/base/requests/file.twig') }}
+        {%~ else %}
+        {{~ include('php/base/requests/api.twig') }}
+        {%~ endif %}
     }
-{% if not loop.last %}
+        {%~ if not loop.last %}
 
-{% endif %}
-{% endfor %}
+        {%~ endif %}
+        {%~ endfor %}
 }

tests/languages/php/test.php

@@ -110,7 +110,7 @@
 $general->empty();
 
 $url = $general->oauth2('clientId', 'https://localhost', ['test'], '123456');
-echo $url;
+echo $url . "\n";
 
 // Query helper tests
 echo Query::equal('released', [true]) . "\n";