Implement oneOf and refactor - WIP 3

Author: SOHELAHMED7

src/lib/FakerStubResolver.php

@@ -207,15 +207,15 @@ private function fakeForInt(?int $min, ?int $max): ?string
             $fakerVariable = 'uniqueFaker';
         }
         if ($min !== null && $max !== null) {
-            return "\$$fakerVariable->numberBetween($min, $max)";
+            return "\${$fakerVariable}->numberBetween($min, $max)";
         }
 
         if ($min !== null) {
-            return "\$$fakerVariable->numberBetween($min, " . self::MAX_INT . ")";
+            return "\${$fakerVariable}->numberBetween($min, " . self::MAX_INT . ")";
         }
 
         if ($max !== null) {
-            return "\$$fakerVariable->numberBetween(0, $max)";
+            return "\${$fakerVariable}->numberBetween(0, $max)";
         }
 
         $patterns = [
@@ -229,7 +229,7 @@ private function fakeForInt(?int $min, ?int $max): ?string
                 return $fake;
             }
         }
-        return "\$$fakerVariable->numberBetween(0, " . self::MAX_INT . ")";
+        return "\${$fakerVariable}->numberBetween(0, " . self::MAX_INT . ")";
     }
 
     private function fakeForFloat(?int $min, ?int $max): ?string
@@ -247,6 +247,7 @@ private function fakeForFloat(?int $min, ?int $max): ?string
     }
 
     /**
+     * @param int $count let's set a number to default number of elements
      * @throws InvalidConfigException
      * @throws TypeErrorException
      * @throws UnresolvableReferenceException
@@ -255,8 +256,6 @@ private function fakeForFloat(?int $min, ?int $max): ?string
     private function fakeForArray(SpecObjectInterface $property, int $count = 4): string
     {
         $uniqueItems = false;
-        $arbitrary = false;
-        $type = null;
         if ($property->minItems) {
             $count = $property->minItems;
         }
@@ -272,41 +271,26 @@ private function fakeForArray(SpecObjectInterface $property, int $count = 4): st
 
         // TODO consider example of OpenAPI spec
 
-//        $count = 4; # let's set a number to default number of elements
-
         /** @var Schema|Reference|null $items */
-        $items = $property->items ?? $property; # later is used in `oneOf`
+        $items = $property->items; # later is used only in `oneOf`
 
-        $aElementData = Json::decode(Json::encode($this->property->getProperty()->getSerializableData()));
-        $compoSchemaArr = [
-            'properties' => [
-                'unnamedProp' => $aElementData['items']
-            ]
-        ];
+        if (!$items) {
+            return $this->arbitraryArray();
+        }
 
-        if ($items) {
-            if ($items instanceof Reference) {
-                $class = str_replace('#/components/schemas/', '', $items->getReference());
-                $class .= 'Faker';
-                return $this->wrapAsArray('(new ' . $class . ')->generateModel()->attributes', false, $count);
-            } elseif (!empty($items->oneOf)) {
-                return $this->handleOneOf($items, $count);
-            } else {
-                $type = $items->type;
-                if ($type === null) {
-                    $arbitrary = true;
-                }
-                $cs = new ComponentSchema(new Schema($compoSchemaArr), 'UnnamedCompo');
-                $dbModels = (new AttributeResolver('UnnamedCompo', $cs, new JunctionSchemas([])))->resolve();
-                $aElementFaker = (new static($dbModels->attributes['unnamedProp'], $cs->getProperty('unnamedProp')))->resolve();
-            }
-        } else {
-            $arbitrary = true;
+        if ($items instanceof Reference) {
+            $class = str_replace('#/components/schemas/', '', $items->getReference());
+            $class .= 'Faker';
+            return $this->wrapAsArray('(new ' . $class . ')->generateModel()->attributes', false, $count);
+        } elseif (!empty($items->oneOf)) {
+            return $this->handleOneOf($items, $count);
         }
 
-        if ($arbitrary) {
-            return '$faker->words()';
+        $type = $items->type;
+        if ($type === null) {
+            return $this->arbitraryArray();
         }
+        $aElementFaker = $this->aElementFaker();
 
         if (in_array($type, ['string', 'number', 'integer', 'boolean'])) {
             return $this->wrapAsArray($aElementFaker, $uniqueItems, $count);
@@ -390,7 +374,8 @@ public function handleOneOf($items, $count): string
         foreach ($items->oneOf as $key => $aDataType) {
             /** @var Schema|Reference $aDataType */
 
-            $a1 = $this->fakeForArray($aDataType, 1);
+//            $a1 = $this->fakeForArray($aDataType, 1);
+            $a1 = $this->aElementFaker();
             $result .= '$dataType' . $key . ' = ' . $a1 . ';';
         }
         $ct = count($items->oneOf) - 1;
@@ -405,4 +390,22 @@ public function wrapAsArray($aElementFaker, $uniqueItems, $count): string
             return ' . ($uniqueItems ? str_replace('$faker->', '$uniqueFaker->', $aElementFaker) : $aElementFaker) . ';
         }, range(1, ' . $count . '))';
     }
+
+    public function arbitraryArray(): string
+    {
+        return '$faker->words()';
+    }
+
+    public function aElementFaker(): ?string
+    {
+        $aElementData = Json::decode(Json::encode($this->property->getProperty()->getSerializableData()));
+        $compoSchemaData = [
+            'properties' => [
+                'unnamedProp' => $aElementData['items']
+            ]
+        ];
+        $cs = new ComponentSchema(new Schema($compoSchemaData), 'UnnamedCompo');
+        $dbModels = (new AttributeResolver('UnnamedCompo', $cs, new JunctionSchemas([])))->resolve();
+        return (new static($dbModels->attributes['unnamedProp'], $cs->getProperty('unnamedProp')))->resolve();
+    }
 }

tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/index.yaml

@@ -155,8 +155,8 @@ components:
           maxItems: 8
           items:
             oneOf:
-              - type: string
               - type: integer
+              - type: string
 
 
 # oneOf