Fix issues + add support for all refs only in oneOf

Author: SOHELAHMED7

README.md

@@ -309,6 +309,8 @@ Provide custom database table column name in case of relationship column. This w
               - x-fk-column-name: redelivery_of # this will create `redelivery_of` column instead of `redelivery_of_id`
 ```
 
+### `x-no-relation`
+
 ## Many-to-Many relation definition
 
 There are two ways for define many-to-many relations:

src/lib/FakerStubResolver.php

@@ -87,7 +87,7 @@ public function resolve(): ?string
             $mn = $config->modelNamespace;
             return '$faker->randomElement(\\' . $mn
                 . ($mn ? '\\' : '')
-                . ucfirst((string) $this->attribute->reference) . '::find()->select("id")->column())';
+                . ucfirst((string)$this->attribute->reference) . '::find()->select("id")->column())'; // TODO PK "id" can be also something else
         }
 
         $limits = $this->attribute->limits;
@@ -285,19 +285,18 @@ private function fakeForArray(SpecObjectInterface $property, int $count = 4): st
         }
 
         if ($items instanceof Reference) {
-            $class = str_replace('#/components/schemas/', '', $items->getReference());
-            $class .= 'Faker';
-            return $this->wrapInArray('(new ' . $class . ')->generateModel()->attributes', false, $count);
-        } elseif (!empty($items->oneOf)) {
+            $aFakerForRef = $this->aElementFaker($items);
+            return $this->wrapInArray($aFakerForRef, $uniqueItems, $count);
+        }
+        if (!empty($items->oneOf)) {
             return $this->handleOneOf($items, $count);
         }
 
         $type = $items->type;
         if ($type === null) {
             return $this->arbitraryArray();
         }
-        $aFaker = $this->aElementFaker($this->property->getProperty()->getSerializableData());
-
+        $aFaker = $this->aElementFaker($this->property->getProperty());
         if (in_array($type, ['string', 'number', 'integer', 'boolean', 'array'])) {
             return $this->wrapInArray($aFaker, $uniqueItems, $count);
         }
@@ -350,9 +349,16 @@ public function fakeForObject(SpecObjectInterface $items): string
     }
 
     /**
-     * @param $items
-     * @param $count
+     * This method must be only used incase of array
+     * @param SpecObjectInterface $items
+     * @param int $count
      * @return string
+     * @throws ExceptionInterface
+     * @throws IOException
+     * @throws InvalidConfigException
+     * @throws InvalidDefinitionException
+     * @throws TypeErrorException
+     * @throws UnresolvableReferenceException
      * @internal
      */
     public function handleOneOf(SpecObjectInterface $items, int $count): string
@@ -361,8 +367,9 @@ public function handleOneOf(SpecObjectInterface $items, int $count): string
         foreach ($items->oneOf as $key => $aDataType) {
             /** @var Schema|Reference $aDataType */
 
-            $a1 = $this->aElementFaker(['items' => $aDataType->getSerializableData()]);
-            $result .= '$dataType' . $key . ' = ' . $a1 . ';';
+            $inp = $aDataType instanceof Reference ? $aDataType : ['items' => $aDataType->getSerializableData()];
+            $aFaker = $this->aElementFaker($inp);
+            $result .= '$dataType' . $key . ' = ' . $aFaker . ';';
         }
         $ct = count($items->oneOf) - 1;
         $result .= 'return ${"dataType".rand(0, ' . $ct . ')};';
@@ -385,7 +392,7 @@ public function arbitraryArray(): string
     /**
      * This method is only for `fakeForArray()` or methods only used inside `fakeForArray()`. If needed to use outside `fakeForArray()` context then some changes might be required.
      * Also see OpenAPI extension `x-no-relation` in README.md
-     * @param $data object|array
+     * @param $data array|\stdClass|SpecObjectInterface
      * @return string|null
      * @throws ExceptionInterface
      * @throws InvalidConfigException
@@ -397,7 +404,14 @@ public function arbitraryArray(): string
      */
     public function aElementFaker($data): ?string
     {
-        $aElementData = Json::decode(Json::encode($data)); // element object of stdClass -> array
+        if ($data instanceof Reference) {
+            $class = str_replace('#/components/schemas/', '', $data->getReference());
+            $class .= 'Faker';
+            return '(new ' . $class . ')->generateModel()->attributes';
+        }
+
+        $inp = $data instanceof SpecObjectInterface ? $data->getSerializableData() : $data;
+        $aElementData = Json::decode(Json::encode($inp));
         $compoSchemaData = [
             'properties' => [
                 'unnamedProp' => $aElementData['items']

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

@@ -24,6 +24,12 @@ components:
           type: integer
         name:
           type: string
+    Fruit:
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
     Pet:
       required:
         - id
@@ -188,7 +194,16 @@ components:
               - type: array
                 items:
                   $ref: '#/components/schemas/User'
+              - $ref: '#/components/schemas/Fruit'
+
+        one_of_from_multi_ref_arr:
+          type: array
+          x-no-relation: true
+          items:
+            oneOf:
+              - $ref: '#/components/schemas/User'
+              - $ref: '#/components/schemas/Fruit'
+
 
 
-# oneOf
-# TODO count is not working in some cases
+# TODO count is not working in some cases