Merge branches 'master' and '81-avoid-calling-getserializabledata' of github.com:php-openapi/yii2-openapi into 81-avoid-calling-getserializabledata

SOHELAHMED7 · SOHELAHMED7 · commit 6c55bf199dd3 · 2025-03-12T11:27:30.000+05:30
diff --git a/README.md b/README.md
@@ -350,7 +350,7 @@ related objects, `x-no-relation` (type: boolean, default: false) is used.
 
 This will not generate 'comments' column in database migrations. But it will generate `getComments()` relation in Yii model file.
 
-In order to make it real database column, extension `x-no-relation` can be used.
+In order to make it real database column, OpenAPI extension `x-no-relation` can be used.
 
 ```yaml
         comments:
diff --git a/src/lib/ValidationRulesBuilder.php b/src/lib/ValidationRulesBuilder.php
@@ -243,10 +243,7 @@ private function prepareTypeScope():void
             if ($attribute->isReadOnly()) {
                 continue;
             }
-            // column/field/property with name `id` is considered as Primary Key by this library, and it is automatically handled by DB/Yii; so remove it from validation `rules()`
-            if (in_array($attribute->columnName, ['id', $this->model->pkName]) ||
-                in_array($attribute->propertyName, ['id', $this->model->pkName])
-            ) {
+            if ($this->isIdColumn($attribute)) {
                 continue;
             }
             if (/*$attribute->defaultValue === null &&*/ $attribute->isRequired()) {
diff --git a/src/lib/openapi/ComponentSchema.php b/src/lib/openapi/ComponentSchema.php
@@ -14,8 +14,6 @@
 use cebe\yii2openapi\lib\SchemaToDatabase;
 use Generator;
 use Yii;
-use yii\helpers\Inflector;
-use yii\helpers\StringHelper;
 use function in_array;
 
 class ComponentSchema
@@ -106,7 +104,9 @@ public function isRequiredProperty(string $propName):bool
 
     public function isNonDb():bool
     {
-        return isset($this->schema->{CustomSpecAttr::TABLE}) && $this->schema->{CustomSpecAttr::TABLE} === false;
+        return
+            isset($this->schema->{CustomSpecAttr::TABLE}) &&
+            $this->schema->{CustomSpecAttr::TABLE} === false;
     }
 
     public function resolveTableName(string $schemaName):string
diff --git a/src/lib/openapi/PropertySchema.php b/src/lib/openapi/PropertySchema.php
@@ -145,6 +145,11 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             $property = $this->property;
         }
 
+        // don't go reference part if `x-no-relation` is true
+        if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {
+            return;
+        }
+
         if ($property instanceof Reference) {
             $this->initReference();
         } elseif (
@@ -497,6 +502,7 @@ public function guessDbType($forReference = false):string
                 }
                 return YiiDbSchema::TYPE_TEXT;
             case 'object':
+            case 'array':
             {
                 return YiiDbSchema::TYPE_JSON;
             }
diff --git a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/migrations_mysql_db/m200000_000001_create_table_pets.php b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/migrations_mysql_db/m200000_000001_create_table_pets.php
@@ -11,21 +11,21 @@ public function up()
             'id' => $this->primaryKey(),
             'name' => $this->text()->notNull(),
             'age' => $this->integer()->notNull(),
-            'tags' => $this->text()->notNull(),
-            'tags_arbit' => $this->text()->notNull(),
-            'number_arr' => $this->text()->notNull(),
-            'number_arr_min_uniq' => $this->text()->notNull(),
-            'int_arr' => $this->text()->notNull(),
-            'int_arr_min_uniq' => $this->text()->notNull(),
-            'bool_arr' => $this->text()->notNull(),
-            'arr_arr_int' => $this->text()->notNull(),
-            'arr_arr_str' => $this->text()->notNull(),
-            'arr_arr_arr_str' => $this->text()->notNull(),
-            'arr_of_obj' => $this->text()->notNull(),
-            'user_ref_obj_arr' => $this->string()->notNull(),
-            'one_of_arr' => $this->text()->notNull(),
-            'one_of_arr_complex' => $this->text()->notNull(),
-            'one_of_from_multi_ref_arr' => $this->text()->notNull(),
+            'tags' => 'json NOT NULL',
+            'tags_arbit' => 'json NOT NULL',
+            'number_arr' => 'json NOT NULL',
+            'number_arr_min_uniq' => 'json NOT NULL',
+            'int_arr' => 'json NOT NULL',
+            'int_arr_min_uniq' => 'json NOT NULL',
+            'bool_arr' => 'json NOT NULL',
+            'arr_arr_int' => 'json NOT NULL',
+            'arr_arr_str' => 'json NOT NULL',
+            'arr_arr_arr_str' => 'json NOT NULL',
+            'arr_of_obj' => 'json NOT NULL',
+            'user_ref_obj_arr' => 'json NOT NULL',
+            'one_of_arr' => 'json NOT NULL',
+            'one_of_arr_complex' => 'json NOT NULL',
+            'one_of_from_multi_ref_arr' => 'json NOT NULL',
         ]);
     }
 
diff --git a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php
@@ -23,13 +23,12 @@
  * @property array $arr_arr_str
  * @property array $arr_arr_arr_str
  * @property array $arr_of_obj
- * @property User[] $user_ref_obj_arr
+ * @property array $user_ref_obj_arr
  * @property array $one_of_arr
  * @property array $one_of_arr_complex
  * @property array $one_of_from_multi_ref_arr
  *
  * @property array|\app\models\User[] $userRefObjArrNormal
- * @property array|\app\models\User[] $userRefObjArr
  */
 abstract class Pet extends \yii\db\ActiveRecord
 {
@@ -53,9 +52,4 @@ public function getUserRefObjArrNormal()
     {
         return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');
     }
-
-    public function getUserRefObjArr()
-    {
-        return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');
-    }
 }
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/index.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/index.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/index.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => true,
+    'generateModelFaker' => true, // `generateModels` must be `true` in order to use `generateModelFaker` as `true`
+];
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/index.yaml b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/index.yaml
@@ -0,0 +1,35 @@
+openapi: 3.0.3
+
+info:
+  title: '#23'
+  version: 1.0.0
+
+paths:
+  /:
+    get:
+      responses:
+        '200':
+          description: The Response
+
+
+
+components:
+  schemas:
+    Payments:
+      properties:
+        id:
+          type: integer
+        currency:
+          type: string
+        samples:
+          type: array
+          x-no-relation: true
+          items:
+            $ref: '#/components/schemas/Sample'
+
+    Sample:
+      properties:
+        id:
+          type: integer
+        message:
+          type: string
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/migrations_mysql_db/m200000_000000_create_table_payments.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/migrations_mysql_db/m200000_000000_create_table_payments.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Table for Payments
+ */
+class m200000_000000_create_table_payments extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->createTable('{{%payments}}', [
+            'id' => $this->primaryKey(),
+            'currency' => $this->text()->null(),
+            'samples' => 'json NOT NULL',
+        ]);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%payments}}');
+    }
+}
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/migrations_mysql_db/m200000_000001_create_table_samples.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/migrations_mysql_db/m200000_000001_create_table_samples.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Sample
+ */
+class m200000_000001_create_table_samples extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->createTable('{{%samples}}', [
+            'id' => $this->primaryKey(),
+            'message' => $this->text()->null(),
+        ]);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%samples}}');
+    }
+}
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/BaseModelFaker.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/BaseModelFaker.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace app\models;
+
+use Faker\Factory as FakerFactory;
+use Faker\Generator;
+use Faker\UniqueGenerator;
+
+/**
+ * Base fake data generator
+ */
+abstract class BaseModelFaker
+{
+    /**
+     * @var Generator
+    */
+    protected $faker;
+    /**
+     * @var UniqueGenerator
+    */
+    protected $uniqueFaker;
+
+    public function __construct()
+    {
+        $this->faker = FakerFactory::create(str_replace('-', '_', \Yii::$app->language));
+        $this->uniqueFaker = new UniqueGenerator($this->faker);
+    }
+
+    abstract public function generateModel($attributes = []);
+
+    public function getFaker():Generator
+    {
+        return $this->faker;
+    }
+
+    public function getUniqueFaker():UniqueGenerator
+    {
+        return $this->uniqueFaker;
+    }
+
+    public function setFaker(Generator $faker):void
+    {
+        $this->faker = $faker;
+    }
+
+    public function setUniqueFaker(UniqueGenerator $faker):void
+    {
+        $this->uniqueFaker = $faker;
+    }
+
+    /**
+     * Generate and return model
+     * @param array|callable $attributes
+     * @param UniqueGenerator|null $uniqueFaker
+     * @return \yii\db\ActiveRecord
+     * @example MyFaker::makeOne(['user_id' => 1, 'title' => 'foo']);
+     * @example MyFaker::makeOne( function($model, $faker) {
+     *        $model->scenario = 'create';
+     *        $model->setAttributes(['user_id' => 1, 'title' => $faker->sentence]);
+     *        return $model;
+     *  });
+     */
+    public static function makeOne($attributes = [], ?UniqueGenerator $uniqueFaker = null)
+    {
+        $fakeBuilder = new static();
+        if ($uniqueFaker !== null) {
+            $fakeBuilder->setUniqueFaker($uniqueFaker);
+        }
+        $model = $fakeBuilder->generateModel($attributes);
+        return $model;
+    }
+
+    /**
+     * Generate, save and return model
+     * @param array|callable $attributes
+     * @param UniqueGenerator|null $uniqueFaker
+     * @return \yii\db\ActiveRecord
+     * @example MyFaker::saveOne(['user_id' => 1, 'title' => 'foo']);
+     * @example MyFaker::saveOne( function($model, $faker) {
+     *        $model->scenario = 'create';
+     *        $model->setAttributes(['user_id' => 1, 'title' => $faker->sentence]);
+     *        return $model;
+     *  });
+     */
+    public static function saveOne($attributes = [], ?UniqueGenerator $uniqueFaker = null)
+    {
+        $model = static::makeOne($attributes, $uniqueFaker);
+        $model->save();
+        return $model;
+    }
+
+    /**
+     * Generate and return multiple models
+     * @param int $number
+     * @param array|callable $commonAttributes
+     * @return \yii\db\ActiveRecord[]|array
+     * @example TaskFaker::make(5, ['project_id'=>1, 'user_id' => 2]);
+     * @example TaskFaker::make(5, function($model, $faker, $uniqueFaker) {
+     *       $model->setAttributes(['name' => $uniqueFaker->username, 'state'=>$faker->boolean(20)]);
+     *       return $model;
+     * });
+     */
+    public static function make(int $number, $commonAttributes = [], ?UniqueGenerator $uniqueFaker = null):array
+    {
+        if ($number < 1) {
+            return [];
+        }
+        $fakeBuilder = new static();
+        if ($uniqueFaker !== null) {
+            $fakeBuilder->setUniqueFaker($uniqueFaker);
+        }
+        return array_map(function () use ($commonAttributes, $fakeBuilder) {
+            $model = $fakeBuilder->generateModel($commonAttributes);
+            return $model;
+        }, range(0, $number -1));
+    }
+
+    /**
+     * Generate, save and return multiple models
+     * @param int $number
+     * @param array|callable $commonAttributes
+     * @return \yii\db\ActiveRecord[]|array
+     * @example TaskFaker::save(5, ['project_id'=>1, 'user_id' => 2]);
+     * @example TaskFaker::save(5, function($model, $faker, $uniqueFaker) {
+     *       $model->setAttributes(['name' => $uniqueFaker->username, 'state'=>$faker->boolean(20)]);
+     *       return $model;
+     * });
+     */
+    public static function save(int $number, $commonAttributes = [], ?UniqueGenerator $uniqueFaker = null):array
+    {
+        if ($number < 1) {
+            return [];
+        }
+        $fakeBuilder = new static();
+        if ($uniqueFaker !== null) {
+            $fakeBuilder->setUniqueFaker($uniqueFaker);
+        }
+        return array_map(function () use ($commonAttributes, $fakeBuilder) {
+            $model = $fakeBuilder->generateModel($commonAttributes);
+            $model->save();
+            return $model;
+        }, range(0, $number -1));
+    }
+}
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/Payments.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/Payments.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Payments extends \app\models\base\Payments
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/PaymentsFaker.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/PaymentsFaker.php
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/Sample.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/Sample.php
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/SampleFaker.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/SampleFaker.php
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/base/Payments.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/base/Payments.php
diff --git a/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/base/Sample.php b/tests/specs/issue_fix/23_consider_openapi_extension_x_no_relation_also_in_other_pertinent_place/mysql/models/base/Sample.php
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php

Original file line number	Diff line number	Diff line change
`@@ -243,10 +243,7 @@ private function prepareTypeScope():void`
`243`	`243`	`if ($attribute->isReadOnly()) {`
`244`	`244`	`continue;`
`245`	`245`	`}`
`246`		- // column/field/property with name `id` is considered as Primary Key by this library, and it is automatically handled by DB/Yii; so remove it from validation `rules()`
`247`		`- if (in_array($attribute->columnName, ['id', $this->model->pkName]) \|\|`
`248`		`- in_array($attribute->propertyName, ['id', $this->model->pkName])`
`249`		`- ) {`
	`246`	`+ if ($this->isIdColumn($attribute)) {`
`250`	`247`	`continue;`
`251`	`248`	`}`
`252`	`249`	`if (/$attribute->defaultValue === null &&/ $attribute->isRequired()) {`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,11 @@ public function __construct(SpecObjectInterface $property, string $name, Compone`
`145`	`145`	`$property = $this->property;`
`146`	`146`	`}`
`147`	`147`
	`148`	+ // don't go reference part if `x-no-relation` is true
	`149`	`+ if ($this->getAttr(CustomSpecAttr::NO_RELATION)) {`
	`150`	`+ return;`
	`151`	`+ }`
	`152`	`+`
`148`	`153`	`if ($property instanceof Reference) {`
`149`	`154`	`$this->initReference();`
`150`	`155`	`} elseif (`
`@@ -497,6 +502,7 @@ public function guessDbType($forReference = false):string`
`497`	`502`	`}`
`498`	`503`	`return YiiDbSchema::TYPE_TEXT;`
`499`	`504`	`case 'object':`
	`505`	`+ case 'array':`
`500`	`506`	`{`
`501`	`507`	`return YiiDbSchema::TYPE_JSON;`
`502`	`508`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,13 +23,12 @@`
`23`	`23`	`* @property array $arr_arr_str`
`24`	`24`	`* @property array $arr_arr_arr_str`
`25`	`25`	`* @property array $arr_of_obj`
`26`		`- * @property User[] $user_ref_obj_arr`
	`26`	`+ * @property array $user_ref_obj_arr`
`27`	`27`	`* @property array $one_of_arr`
`28`	`28`	`* @property array $one_of_arr_complex`
`29`	`29`	`* @property array $one_of_from_multi_ref_arr`
`30`	`30`	`*`
`31`	`31`	`* @property array\|\app\models\User[] $userRefObjArrNormal`
`32`		`- * @property array\|\app\models\User[] $userRefObjArr`
`33`	`32`	`*/`
`34`	`33`	`abstract class Pet extends \yii\db\ActiveRecord`
`35`	`34`	`{`
`@@ -53,9 +52,4 @@ public function getUserRefObjArrNormal()`
`53`	`52`	`{`
`54`	`53`	`return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');`
`55`	`54`	`}`
`56`		`-`
`57`		`- public function getUserRefObjArr()`
`58`		`- {`
`59`		`- return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');`
`60`		`- }`
`61`	`55`	`}`