Fix #162 - WIP

Author: SOHELAHMED7

.gitignore

@@ -4,3 +4,5 @@
 /.php_cs.cache
 /.env
 /.phpunit.result.cache
+
+/.idea

src/lib/AttributeResolver.php

@@ -225,6 +225,7 @@ protected function resolveProperty(
                   ->setReadOnly($property->isReadonly())
                   ->setDefault($property->guessDefault())
                   ->setXDbType($property->getAttr(CustomSpecAttr::DB_TYPE))
+                  // ->setXFaker($property->getAttr(CustomSpecAttr::FAKER))
                   ->setXDbDefaultExpression($property->getAttr(CustomSpecAttr::DB_DEFAULT_EXPRESSION))
                   ->setNullable($nullableValue)
                   ->setIsPrimary($property->isPrimaryKey())

src/lib/FakerStubResolver.php

@@ -44,9 +44,24 @@ public function __construct(Attribute $attribute, PropertySchema $property, ?Con
 
     public function resolve():?string
     {
+        // if ($this->property->getName() === 'invoice') {
+        //     var_dump($this->property->xFaker); die();
+        // }
+        if ($this->property->xFaker === false) {
+            $this->attribute->setFakerStub(null);
+            return null;
+        }
         if ($this->property->hasAttr(CustomSpecAttr::FAKER)) {
             return $this->property->getAttr(CustomSpecAttr::FAKER);
         }
+        // if ($this->property->hasAttr(CustomSpecAttr::FAKER) || $this->property->xFaker) {
+        //     $fakerValueInYml = $this->property->getAttr(CustomSpecAttr::FAKER) || $this->property->xFaker;
+        //     if ($fakerValueInYml === false) {
+        //         $this->attribute->setFakerStub(null);
+        //         return null;
+        //     }
+        //     return $fakerValueInYml;
+        // }
         if ($this->attribute->isReadOnly() && $this->attribute->isVirtual()) {
             return null;
         }

src/lib/items/Attribute.php

@@ -71,6 +71,8 @@ class Attribute extends BaseObject
      */
     public $xDbType;
 
+    // public $xFaker;
+
     /**
      * nullable
      * bool | null
@@ -154,6 +156,12 @@ public function setXDbType($xDbType):Attribute
         return $this;
     }
 
+    // public function setXFaker($xFaker):Attribute
+    // {
+    //     $this->xFaker = $xFaker;
+    //     return $this;
+    // }
+
     public function setXDbDefaultExpression($xDbDefaultExpression): Attribute
     {
         // first priority is given to `default` and then to `x-db-default-expression`

src/lib/openapi/PropertySchema.php

@@ -46,6 +46,8 @@ class PropertySchema
      */
     public $fkColName;
 
+    public $xFaker;
+
     /**
      * @var \cebe\openapi\SpecObjectInterface
      */
@@ -93,7 +95,7 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
         $this->schema = $schema;
         $this->isPk = $name === $schema->getPkName();
 
-        $onUpdate = $onDelete = $reference = $fkColName = null;
+        $onUpdate = $onDelete = $xFaker = $reference = $fkColName = null;
 
         foreach ($property->allOf ?? [] as $element) {
             // x-fk-on-delete | x-fk-on-update
@@ -103,6 +105,14 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             if (!empty($element->{CustomSpecAttr::FK_ON_DELETE})) {
                 $onDelete = $element->{CustomSpecAttr::FK_ON_DELETE};
             }
+
+            if ($element->{CustomSpecAttr::FAKER} !== null) {
+                $xFaker = $element->{CustomSpecAttr::FAKER};
+            }
+            // if (property_exists($element, CustomSpecAttr::FAKER)) {
+            //     $xFaker = $element->{CustomSpecAttr::FAKER};
+            // }
+
             if ($element instanceof Reference) {
                 $reference = $element;
             }
@@ -128,6 +138,10 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             $this->fkColName = $fkColName;
             $this->property = $reference;
             $property = $this->property;
+        } elseif($xFaker !== null && $reference instanceof Reference) {
+            $this->xFaker = $xFaker;
+            $this->property = $reference;
+            $property = $this->property;
         }
 
         if ($property instanceof Reference) {

tests/specs/issue_fix/162_bug_dollarref_with_x_faker/162_bug_dollarref_with_x_faker.php

@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/162_bug_dollarref_with_x_faker/162_bug_dollarref_with_x_faker.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => false,
+    'generateModelFaker' => true,
+];

tests/specs/issue_fix/162_bug_dollarref_with_x_faker/162_bug_dollarref_with_x_faker.yaml

@@ -0,0 +1,54 @@
+openapi: 3.0.3
+# Edit this schema and start your project
+# This is sample schema
+# To generate code which is based on this schema
+# run commands mentioned Development section in README.md file
+info:
+  title: 'Proxy-Service'
+  description: ""
+  version: 1.0.0
+  contact:
+    name: '...'
+    email: you@example.com
+paths:
+  /:
+    get:
+      summary: List
+      operationId: list
+      responses:
+        '200':
+          description: The information
+servers:
+  - url: 'http://localhost:9937'
+    description: 'Local Dev API'
+security:
+  - BasicAuth: []
+components:
+  securitySchemes:
+    BasicAuth:
+      type: http
+      scheme: basic
+  schemas:
+
+    Invoice:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: integer
+
+    Order:
+      type: object
+      required:
+        - id
+      properties:
+        id:
+          type: integer
+        invoice:
+          # type: integer
+          # x-faker: 5
+          allOf:
+            - $ref: '#/components/schemas/Invoice'
+            - x-faker: false
+

tests/unit/IssueFixTest.php

@@ -272,4 +272,17 @@ public function testNullableFalseInRequired()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
+
+    public function test162BugDollarrefWithXFaker()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/162_bug_dollarref_with_x_faker/162_bug_dollarref_with_x_faker.php");
+        $this->runGenerator($testFile, 'mysql');
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+            'recursive' => true,
+        ]);
+        // $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/153_nullable_false_in_required/app"), [
+        //     'recursive' => true,
+        // ]);
+        // $this->checkFiles($actualFiles, $expectedFiles);
+    }
 }