fix(php): review notes

Author: byawitz

mock-server/app/http.php

@@ -316,7 +316,7 @@
     ->param('x', '', new Text(100), 'Sample string param')
     ->param('y', '', new Integer(true), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Sample array param')
-    ->param('payload', [], new File(), 'Sample file param', skipValidation: true)
+    ->param('file', [], new File(), 'Sample file param', skipValidation: true)
     ->inject('request')
     ->inject('response')
     ->action(function (string $x, int $y, array $z, mixed $file, Request $request, Response $response) {

templates/php/base/params.twig

@@ -20,9 +20,6 @@
         {%~ for parameter in method.parameters.header %}
         $apiHeaders['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }};
         {%~ endfor %}
-        {%~ if method.name | lower == "createexecution" %}
-        $apiHeaders['accept'] = 'multipart/form-data';
-        {%~ endif %}
         {%~ for key, header in method.headers %}
         $apiHeaders['{{ key }}'] = '{{ header }}';
         {%~ endfor %}

templates/php/src/Client.php.twig

@@ -138,6 +138,7 @@ class Client
                 break;
 
             case 'multipart/form-data':
+                $headers['accept'] = 'multipart/form-data';
                 $query = $this->flatten($params);
                 break;
 
@@ -259,21 +260,31 @@ class Client
                 array_shift($lines);
                 if(isset($lines[0]) && $lines[0] === 'Content-Type: application/json'){
                     array_shift($lines);
-                    $headers = json_decode(implode($lines), true);
-                    $headers = array_combine(
-                        array_map(fn($header)=>  $header['name'], $headers),
-                        array_map(fn($header)=>  $header['value'], $headers)
-                    );
-                    $data[$matches['name']] = $headers;
+                    $json = json_decode(implode($lines), true);
+
+                    if (count($json) > 0 && isset($json[0]['name']) && isset($json[0]['value'])) {
+                        $json = array_combine(
+                            array_map(fn($header) => $header['name'], $json),
+                            array_map(fn($header) => $header['value'], $json)
+                        );
+                    }
+
+                    $data[$matches['name']] = $json;
                     continue;
                 }
                 $data[$matches['name']] = implode("\r\n",$lines) ?? '';;
             }
         }
 
-        $data['responseStatusCode'] = (int) ($data['responseStatusCode'] ?? '');
-        $data['duration'] = ((float) ($data['duration'] ?? ''));
-        $data['responseBody'] = Payload::fromString($data['responseBody'] ?? '');
+        if(isset($data['responseStatusCode'])) {
+            $data['responseStatusCode'] = (int) ($data['responseStatusCode'] ?? '');
+        }
+        if(isset($data['duration'])) {
+            $data['duration'] = ((float) ($data['duration'] ?? ''));
+        }
+        if(isset($data['responseBody'])) {
+            $data['responseBody'] = Payload::fromString($data['responseBody'] ?? '');
+        }
 
         return $data;
     }

templates/php/src/Payload.php.twig

@@ -29,7 +29,7 @@ class Payload {
         return $this->filename;
     }
 
-    public static function fromFile(string $path, ?string $mimeType = null, ?string $filename = null): Payload
+    public static function fromFile(string $path, ?string $mimeType = null, ?string $filename = null): self
     {
         $instance = new Payload();
         $instance->path = $path;
@@ -39,7 +39,7 @@ class Payload {
         return $instance;
     }
 
-    public static function fromBinary(string $data, ?string $mimeType = null, ?string $filename = null): Payload
+    public static function fromBinary(string $data, ?string $mimeType = null, ?string $filename = null): self
     {
         $instance = new Payload();
         $instance->path = null;
@@ -49,14 +49,16 @@ class Payload {
         return $instance;
     }
 
-    public static function fromJson(array $data) {
+    public static function fromJson(array $data): self
+    {
         $instance = new Payload();
         $instance->path = null;
         $instance->data = json_encode($data);
         return $instance;
     }
 
-    public static function fromString(string $data) {
+    public static function fromString(string $data): self
+    {
         $instance = new Payload();
         $instance->path = null;
         $instance->data = $data;

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

@@ -53,7 +53,7 @@ class {{ service.name | caseUcfirst }} extends Service
         );
 
         {{~ include('php/base/params.twig') -}}
-        {%~ if 'multipart/form-data' in method.consumes and method.name | lower != "createexecution" %}
+        {%~ if 'multipart/form-data' in method.consumes and method.type != "upload" %}
         {{~ include('php/base/requests/file.twig') }}
         {%~ else %}
 
@@ -64,4 +64,4 @@ class {{ service.name | caseUcfirst }} extends Service
 
         {%~ endif %}
         {%~ endfor %}
-}
+}