Revert "[PHP] - Add FormDataProcessor to handle nested ModelInterface data (OpenAPITools#20990)"

This reverts commit 3462310.

Author: etremblay

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpClientCodegen.java

@@ -117,7 +117,6 @@ public void processOpts() {
 
         supportingFiles.add(new SupportingFile("ApiException.mustache", toSrcPath(invokerPackage, srcBasePath), "ApiException.php"));
         supportingFiles.add(new SupportingFile("Configuration.mustache", toSrcPath(invokerPackage, srcBasePath), "Configuration.php"));
-        supportingFiles.add(new SupportingFile("FormDataProcessor.mustache", toSrcPath(invokerPackage, srcBasePath), "FormDataProcessor.php"));
         supportingFiles.add(new SupportingFile("ObjectSerializer.mustache", toSrcPath(invokerPackage, srcBasePath), "ObjectSerializer.php"));
         supportingFiles.add(new SupportingFile("ModelInterface.mustache", toSrcPath(modelPackage, srcBasePath), "ModelInterface.php"));
         supportingFiles.add(new SupportingFile("HeaderSelector.mustache", toSrcPath(invokerPackage, srcBasePath), "HeaderSelector.php"));

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpNextgenClientCodegen.java

@@ -121,7 +121,6 @@ public void processOpts() {
 
         supportingFiles.add(new SupportingFile("ApiException.mustache", toSrcPath(invokerPackage, srcBasePath), "ApiException.php"));
         supportingFiles.add(new SupportingFile("Configuration.mustache", toSrcPath(invokerPackage, srcBasePath), "Configuration.php"));
-        supportingFiles.add(new SupportingFile("FormDataProcessor.mustache", toSrcPath(invokerPackage, srcBasePath), "FormDataProcessor.php"));
         supportingFiles.add(new SupportingFile("ObjectSerializer.mustache", toSrcPath(invokerPackage, srcBasePath), "ObjectSerializer.php"));
         supportingFiles.add(new SupportingFile("ModelInterface.mustache", toSrcPath(modelPackage, srcBasePath), "ModelInterface.php"));
         supportingFiles.add(new SupportingFile("HeaderSelector.mustache", toSrcPath(invokerPackage, srcBasePath), "HeaderSelector.php"));

modules/openapi-generator/src/main/resources/php-nextgen/FormDataProcessor.mustache

@@ -18,6 +18,7 @@
 
 namespace {{invokerPackage}};
 
+use ArrayAccess;
 use DateTimeInterface;
 use DateTime;
 use GuzzleHttp\Psr7\Utils;
@@ -315,6 +316,37 @@ class ObjectSerializer
         return self::toString($value);
     }
 
+    /**
+     * Take value and turn it into an array suitable for inclusion in
+     * the http body (form parameter). If it's a string, pass through unchanged
+     * If it's a datetime object, format it in ISO8601
+     *
+     * @param string|bool|array|DateTime|ArrayAccess|\SplFileObject $value the value of the form parameter
+     *
+     * @return array [key => value] of formdata
+     */
+    public static function toFormValue(
+        string $key,
+        string|bool|array|DateTime|ArrayAccess|\SplFileObject $value,
+    ): array {
+        if ($value instanceof \SplFileObject) {
+            return [$key => $value->getRealPath()];
+        } elseif (is_array($value) || $value instanceof ArrayAccess) {
+            $flattened = [];
+            $result = [];
+
+            self::flattenArray(json_decode(json_encode($value), true), $flattened);
+
+            foreach ($flattened as $k => $v) {
+                $result["{$key}{$k}"] = self::toString($v);
+            }
+
+            return $result;
+        } else {
+            return [$key => self::toString($value)];
+        }
+    }
+
     /**
      * Take value and turn it into a string suitable for inclusion in
      * the parameter. If it's a string, pass through unchanged
@@ -580,4 +612,58 @@ class ObjectSerializer
 
         return $qs ? (string) substr($qs, 0, -1) : '';
     }
+
+    /**
+     * Flattens an array of Model object and generates an array compatible
+     * with formdata - a single-level array where the keys use bracket
+     * notation to signify nested data.
+     *
+     * credit: https://github.com/FranBar1966/FlatPHP
+     */
+    private static function flattenArray(
+        ArrayAccess|array $source,
+        array &$destination,
+        string $start = '',
+    ) {
+        $opt = [
+            'prefix'          => '[',
+            'suffix'          => ']',
+            'suffix-end'      => true,
+            'prefix-list'     => '[',
+            'suffix-list'     => ']',
+            'suffix-list-end' => true,
+        ];
+
+        if (!is_array($source)) {
+            $source = (array) $source;
+        }
+
+        if (array_is_list($source)) {
+            $currentPrefix    = $opt['prefix-list'];
+            $currentSuffix    = $opt['suffix-list'];
+            $currentSuffixEnd = $opt['suffix-list-end'];
+        } else {
+            $currentPrefix    = $opt['prefix'];
+            $currentSuffix    = $opt['suffix'];
+            $currentSuffixEnd = $opt['suffix-end'];
+        }
+
+        $currentName = $start;
+
+        foreach ($source as $key => $val) {
+            $currentName .= $currentPrefix.$key;
+
+            if (is_array($val) && !empty($val)) {
+                $currentName .= "{$currentSuffix}";
+                self::flattenArray($val, $destination, $currentName);
+            } else {
+                if ($currentSuffixEnd) {
+                    $currentName .= $currentSuffix;
+                }
+                $destination[$currentName] = self::toString($val);
+            }
+
+            $currentName = $start;
+        }
+    }
 }

modules/openapi-generator/src/main/resources/php-nextgen/ObjectSerializer.mustache

@@ -31,7 +31,6 @@ use Psr\Http\Message\ResponseInterface;
 use {{invokerPackage}}\ApiException;
 use {{invokerPackage}}\Configuration;
 use {{invokerPackage}}\HeaderSelector;
-use {{invokerPackage}}\FormDataProcessor;
 use {{invokerPackage}}\ObjectSerializer;
 
 /**
@@ -725,19 +724,25 @@ use {{invokerPackage}}\ObjectSerializer;
         {{/pathParams}}
 
         {{#formParams}}
-        {{#-first}}
         // form params
-        $formDataProcessor = new FormDataProcessor();
-
-        $formData = $formDataProcessor->prepare([
-        {{/-first}}
-            '{{paramName}}' => ${{paramName}},
-        {{#-last}}
-        ]);
-
-        $formParams = $formDataProcessor->flatten($formData);
-        $multipart = $formDataProcessor->has_file;
-        {{/-last}}
+        if (${{paramName}} !== null) {
+            {{#isFile}}
+            $multipart = true;
+            $formParams['{{baseName}}'] = [];
+            $paramFiles = is_array(${{paramName}}) ? ${{paramName}} : [${{paramName}}];
+            foreach ($paramFiles as $paramFile) {
+                $formParams['{{baseName}}'][] = $paramFile instanceof \Psr\Http\Message\StreamInterface
+                    ? $paramFile
+                    : \GuzzleHttp\Psr7\Utils::tryFopen(
+                        ObjectSerializer::toFormValue('{{baseName}}', $paramFile)['{{baseName}}'],
+                        'rb'
+                    );
+            }
+            {{/isFile}}
+            {{^isFile}}
+            $formParams = array_merge($formParams, ObjectSerializer::toFormValue('{{baseName}}', ${{paramName}}));
+            {{/isFile}}
+        }
         {{/formParams}}
 
         $headers = $this->headerSelector->selectHeaders(