Merge pull request #71 from php-api-clients/ensure-we-have-the-params-to-create-the-post-body

Ensure we have the params to create the post/put/patch body

Author: WyriHaximus

src/Generator/Client.php

@@ -165,6 +165,50 @@ public static function generate(string $namespace, array $clients, SchemaRegistr
                         yield new Node\Stmt\Case_(
                             new Node\Expr\ClassConstFetch(new Node\Name($operationCall['className']), 'OPERATION_MATCH'),
                             [
+                                new Node\Stmt\Expression(new Node\Expr\Assign(
+                                    new Node\Expr\Variable('requestBodyData'),
+                                    new Node\Expr\Array_(),
+                                )),
+                                new Node\Stmt\Foreach_(new Node\Expr\FuncCall(
+                                    new Node\Name('\array_keys'),
+                                    [
+                                        new Arg(new Node\Expr\Variable(new Node\Name('params'))),
+                                    ],
+                                ), new Node\Expr\Variable(new Node\Name('param')), [
+                                    'stmts' => [
+                                        new Node\Stmt\If_(
+                                            new Node\Expr\BinaryOp\NotEqual(
+                                                new Node\Expr\FuncCall(
+                                                    new Node\Name('\in_array'),
+                                                    [
+                                                        new Arg(new Node\Expr\Variable(new Node\Name('param'))),
+                                                        new Arg(new Node\Expr\Array_(
+                                                            iterator_to_array((function (array $params): iterable {
+                                                                foreach ($params as $param) {
+                                                                    yield new Node\Expr\ArrayItem(new Node\Scalar\String_($param));
+                                                                }
+                                                            })($operationCall['params'])),
+                                                        )),
+                                                    ],
+                                                ),
+                                                new Node\Expr\ConstFetch(new Node\Name('false'))
+                                            ),
+                                            [
+                                                'stmts' => [
+                                                    new Node\Stmt\Expression(
+                                                        new Node\Expr\FuncCall(
+                                                            new Node\Name('\array_push'),
+                                                            [
+                                                                new Arg(new Node\Expr\Variable(new Node\Name('requestBodyData'))),
+                                                                new Arg(new Node\Expr\Variable(new Node\Name('param'))),
+                                                            ],
+                                                        ),
+                                                    ),
+                                                ],
+                                            ]
+                                        ),
+                                    ],
+                                ]),
                                 new Node\Stmt\Expression(new Node\Expr\Assign(
                                     new Node\Expr\Variable('operation'),
                                     new Node\Expr\MethodCall(
@@ -181,7 +225,9 @@ public static function generate(string $namespace, array $clients, SchemaRegistr
                                         })($operationCall['params'])),
                                     )
                                 )),
-                                new Node\Stmt\Expression(new Node\Expr\Assign(new Node\Expr\Variable('request'), new Node\Expr\MethodCall(new Node\Expr\Variable('operation'), 'createRequest', []))),
+                                new Node\Stmt\Expression(new Node\Expr\Assign(new Node\Expr\Variable('request'), new Node\Expr\MethodCall(new Node\Expr\Variable('operation'), 'createRequest', [
+                                    new Arg(new Node\Expr\Variable(new Node\Name('requestBodyData')))
+                                ]))),
                                 new Node\Stmt\Return_(new Node\Expr\MethodCall(
                                     new Node\Expr\MethodCall(
                                         new Node\Expr\PropertyFetch(

src/Generator/Operation.php

@@ -187,7 +187,7 @@ public static function generate(string $path, string $method, string $namespace,
                             new Node\Arg(new Node\Expr\Variable('data')),
                             new Node\Arg(new Node\Expr\StaticCall(new Node\Name('\cebe\openapi\Reader'), new Node\Name('readFromJson'), [
                                 new Node\Expr\ClassConstFetch(
-                                    new Node\Name('\\' . $rootNamespace . 'Schema\\' . $schemaRegistry->get($requestBodyContent->schema, $className . '\\Request')),
+                                    new Node\Name('\\' . $rootNamespace . 'Schema\\' . $schemaRegistry->get($requestBodyContent->schema, $className . '\\Request\\' . (new Convert(str_replace('/', '\\', $requestBodyContentType)))->toPascal())),
                                     new Node\Name('SCHEMA_JSON'),
                                 ),
                                 new Node\Scalar\String_('\cebe\openapi\spec\Schema'),