Make as many unit tests as possible pass

php-api-clients · Oct 21, 2023 · a5afe62 · a5afe62
1 parent a39ed4d
commit a5afe62
Show file tree

Hide file tree

Showing 119 changed files with 4,956 additions and 1,497 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,7 @@
         "jawira/case-converter": "^3.5",
         "kwn/number-to-words": "^2.6",
         "league/openapi-psr7-validator": "^0.21",
+        "league/uri": "^6.8 || ^7.3",
         "nikic/php-parser": "^4.15",
         "nunomaduro/termwind": "^1.15",
         "ondram/ci-detector": "^4.1",
@@ -55,10 +56,10 @@
     ],
     "config": {
         "allow-plugins": {
-            "wyrihaximus/composer-update-bin-autoload-path": true,
-            "infection/extension-installer": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "ergebnis/composer-normalize": true
+            "ergebnis/composer-normalize": true,
+            "infection/extension-installer": true,
+            "wyrihaximus/composer-update-bin-autoload-path": true
         },
         "platform": {
             "php": "8.2.13"

diff --git a/composer.lock b/composer.lock
diff --git a/example/templates/composer.json b/example/templates/composer.json
@@ -20,6 +20,7 @@
     "devizzent/cebe-php-openapi": "^1",
     "eventsauce/object-hydrator": "^1.1",
     "league/openapi-psr7-validator": "^0.21",
+    "league/uri": "^7.3 || ^6.8",
     "psr/http-message": "^1.0",
     "react/http": "^1.8",
     "react/async": "^4.0",

diff --git a/src/Gatherer/ExampleData.php b/src/Gatherer/ExampleData.php
@@ -14,18 +14,20 @@
 use ReverseRegex\Lexer;
 use ReverseRegex\Parser;
 
+use function explode;
 use function gettype;
 use function is_array;
 use function is_string;
 use function Safe\date;
 use function Safe\json_encode;
 use function strlen;
+use function strpos;
 
 final class ExampleData
 {
     public static function gather(mixed $exampleData, PropertyType $type, string $propertyName): Representation\ExampleData
     {
-        if ($type->type === 'array') {
+        if ($type->type === 'array' || $type->type === 'union') {
             if ($type->payload instanceof Schema) {
                 $exampleData = ArrayMerger::doMerge(
                     $type->payload->example,
@@ -34,6 +36,11 @@ public static function gather(mixed $exampleData, PropertyType $type, string $pr
                 );
             } elseif ($type->payload instanceof PropertyType) {
                 return self::gather($exampleData, $type->payload, $propertyName);
+
+//            } elseif (is_array($type->payload)) {
+//                $exampleData = [
+//                    self::gather($exampleData, $type->payload[0], $propertyName),
+//                ];
             }
 
             return new Representation\ExampleData($exampleData, $exampleData instanceof Node\Expr ? $exampleData : self::turnArrayIntoNode((array) $exampleData));
@@ -90,6 +97,12 @@ public static function determiteType(mixed $exampleData): Representation\Example
     /** @phpstan-ignore-next-line */
     public static function scalarData(int $seed, string $type, string|null $format, string|null $pattern = null): Representation\ExampleData
     {
+        if (strpos($type, '|') !== false) {
+            [$firstType] = explode('|', $type);
+
+            return self::scalarData($seed, $firstType, $format, $pattern);
+        }
+
         if ($type === 'int' || $type === '?int') {
             return new Representation\ExampleData($seed, new Node\Scalar\LNumber($seed));
         }
@@ -149,6 +162,23 @@ public static function scalarData(int $seed, string $type, string|null $format,
             return new Representation\ExampleData('generated', new Node\Scalar\String_('generated'));
         }
 
+        if ($type === 'array' || $type === '?array') {
+            $string = self::scalarData($seed, 'string', $format, $pattern);
+
+            return new Representation\ExampleData(
+                [
+                    $string->raw,
+                ],
+                new Node\Expr\Array_(
+                    [
+                        new Node\Expr\ArrayItem(
+                            $string->node,
+                        ),
+                    ],
+                ),
+            );
+        }
+
         return new Representation\ExampleData(
             null,
             new Node\Expr\ConstFetch(

diff --git a/src/Gatherer/Operation.php b/src/Gatherer/Operation.php
@@ -6,6 +6,7 @@
 
 use ApiClients\Tools\OpenApiClientGenerator\ClassString;
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\ThrowableSchema;
 use ApiClients\Tools\OpenApiClientGenerator\Representation\Header;
@@ -45,11 +46,20 @@ public static function gather(
         openAPIOperation $operation,
         ThrowableSchema $throwableSchemaRegistry,
         SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
     ): \ApiClients\Tools\OpenApiClientGenerator\Representation\Operation {
         $returnType = [];
         $parameters = [];
         $empties    = [];
         foreach ($operation->parameters as $parameter) {
+            $types = is_array($parameter->schema->type) ? $parameter->schema->type : [$parameter->schema->type];
+            if (count($parameter->schema->oneOf ?? []) > 0) {
+                $types = [];
+                foreach ($parameter->schema->oneOf as $oneOfSchema) {
+                    $types[] = $oneOfSchema->type;
+                }
+            }
+
             $parameterType = str_replace([
                 'integer',
                 'any',
@@ -58,7 +68,7 @@ public static function gather(
                 'int',
                 'string|object',
                 'bool',
-            ], implode('|', is_array($parameter->schema->type) ? $parameter->schema->type : [$parameter->schema->type]));
+            ], implode('|', $types));
 
             $parameters[] = new Parameter(
                 (new Convert($parameter->name))->toCamel(),
@@ -82,7 +92,7 @@ public static function gather(
                 );
                 $requestBody[]        = new OperationRequestBody(
                     $contentType,
-                    Schema::gather($baseNamespace, $requestBodyClassname, $requestBodyDetails->schema, $schemaRegistry),
+                    Schema::gather($baseNamespace, $requestBodyClassname, $requestBodyDetails->schema, $schemaRegistry, $contractRegistry),
                 );
             }
         }
@@ -115,6 +125,7 @@ public static function gather(
                         $contentTypeMediaType->schema,
                         true,
                         $schemaRegistry,
+                        $contractRegistry,
                     ),
                 );
                 if ($isError) {

diff --git a/src/Gatherer/Path.php b/src/Gatherer/Path.php
@@ -7,6 +7,7 @@
 use ApiClients\Tools\OpenApiClientGenerator\ClassString;
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Voter;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\ThrowableSchema;
 use ApiClients\Tools\OpenApiClientGenerator\Utils;
@@ -23,6 +24,7 @@ public static function gather(
         string $path,
         PathItem $pathItem,
         SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
         ThrowableSchema $throwableSchemaRegistry,
         Voter|null $voters,
     ): \ApiClients\Tools\OpenApiClientGenerator\Representation\Path {
@@ -45,6 +47,7 @@ public static function gather(
                 $operation,
                 $throwableSchemaRegistry,
                 $schemaRegistry,
+                $contractRegistry,
             );
 
             if ($voters !== null && is_array($voters->listOperation)) {
@@ -75,6 +78,7 @@ public static function gather(
                         $operation,
                         $throwableSchemaRegistry,
                         $schemaRegistry,
+                        $contractRegistry,
                     );
                 }
             }
@@ -105,6 +109,7 @@ public static function gather(
                 $operation,
                 $throwableSchemaRegistry,
                 $schemaRegistry,
+                $contractRegistry,
             );
         }
 

diff --git a/src/Gatherer/Property.php b/src/Gatherer/Property.php
@@ -5,6 +5,7 @@
 namespace ApiClients\Tools\OpenApiClientGenerator\Gatherer;
 
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Representation;
 use cebe\openapi\spec\Schema as baseSchema;
@@ -13,6 +14,7 @@
 use PhpParser\Node;
 
 use function array_filter;
+use function array_key_exists;
 use function array_values;
 use function count;
 use function is_array;
@@ -30,6 +32,7 @@ public static function gather(
         bool $required,
         baseSchema $property,
         SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
     ): Representation\Property {
         $enum        = [];
         $exampleData = null;
@@ -80,14 +83,19 @@ static function ($matches) {
             $property,
             $required,
             $schemaRegistry,
+            $contractRegistry,
         );
 
         if ($property->type === 'array' && is_array($type->payload)) {
             $arrayItemsRaw  = [];
             $arrayItemsNode = [];
 
             foreach ($type->payload as $index => $arrayItem) {
-                $arrayItemExampleData = ExampleData::gather($exampleData, $arrayItem, $propertyName . str_pad('', $index + 1, '_'));
+                $arrayItemExampleData = ExampleData::gather(
+                    $exampleData,
+                    $arrayItem->type === 'union' ? $arrayItem->payload[(array_key_exists($index, $arrayItem->payload) ? $index : 0)] : $arrayItem,
+                    $propertyName . str_pad('', $index + 1, '_'),
+                );
                 $arrayItemsRaw[]      = $arrayItemExampleData->raw;
                 $arrayItemsNode[]     = new Node\Expr\ArrayItem($arrayItemExampleData->node);
             }

diff --git a/src/Gatherer/Schema.php b/src/Gatherer/Schema.php
@@ -6,6 +6,7 @@
 
 use ApiClients\Tools\OpenApiClientGenerator\ClassString;
 use ApiClients\Tools\OpenApiClientGenerator\Configuration\Namespace_;
+use ApiClients\Tools\OpenApiClientGenerator\Registry\Contract as ContractRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Registry\Schema as SchemaRegistry;
 use ApiClients\Tools\OpenApiClientGenerator\Utils;
 use cebe\openapi\spec\Schema as baseSchema;
@@ -22,6 +23,7 @@ public static function gather(
         string $className,
         baseSchema $schema,
         SchemaRegistry $schemaRegistry,
+        ContractRegistry $contractRegistry,
     ): \ApiClients\Tools\OpenApiClientGenerator\Representation\Schema {
         $className  = Utils::className($className);
         $isArray    = $schema->type === 'array';
@@ -38,12 +40,13 @@ public static function gather(
                 $className,
                 (string) $propertyName,
                 in_array(
-                    $propertyName,
+                    (string) $propertyName,
                     $schema->required ?? [],
                     false,
                 ),
                 $property,
                 $schemaRegistry,
+                $contractRegistry,
             );
             $properties[]     = $gatheredProperty;
 
@@ -60,6 +63,11 @@ public static function gather(
             }
 
             $example[$gatheredProperty->sourceName] = $gatheredProperty->example->raw;
+
+            foreach ($property->enum ?? [] as $value) {
+                $example[$gatheredProperty->sourceName] = $value;
+                break;
+            }
         }
 
         return new \ApiClients\Tools\OpenApiClientGenerator\Representation\Schema(