From 235106e8c49a9a36744092f73de8490f152b720d Mon Sep 17 00:00:00 2001 From: insolita Date: Mon, 12 Oct 2020 23:50:43 +0800 Subject: [PATCH 1/2] style-fix --- src/generator/default/faker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/generator/default/faker.php b/src/generator/default/faker.php index 071cc52c..2d9d2219 100644 --- a/src/generator/default/faker.php +++ b/src/generator/default/faker.php @@ -52,7 +52,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -70,7 +70,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } From 4ed9fe38d6b25c7945e24e02f60db0b87a3b56f0 Mon Sep 17 00:00:00 2001 From: insolita Date: Tue, 13 Oct 2020 00:37:23 +0800 Subject: [PATCH 2/2] prevent id generation for integer primary keys --- src/generator/default/faker.php | 14 ++++++-------- tests/specs/blog/models/CategoryFaker.php | 6 +++--- tests/specs/blog/models/CommentFaker.php | 6 +++--- tests/specs/blog/models/FakerableFaker.php | 6 +++--- tests/specs/blog/models/PostFaker.php | 6 +++--- tests/specs/blog/models/UserFaker.php | 6 +++--- tests/specs/blog_v2/models/CategoryFaker.php | 6 +++--- tests/specs/blog_v2/models/CommentFaker.php | 6 +++--- tests/specs/blog_v2/models/PostFaker.php | 6 +++--- tests/specs/blog_v2/models/PostTagFaker.php | 6 +++--- tests/specs/blog_v2/models/TagFaker.php | 6 +++--- tests/specs/blog_v2/models/UserFaker.php | 6 +++--- tests/specs/menu/models/MenuFaker.php | 6 +++--- tests/specs/petstore/models/PetFaker.php | 6 +++--- tests/specs/petstore/models/StoreFaker.php | 6 +++--- tests/specs/petstore_arrayref/models/PetFaker.php | 6 +++--- tests/specs/petstore_jsonapi/models/PetFaker.php | 6 +++--- .../petstore_namespace/mymodels/faker/PetFaker.php | 6 +++--- .../mymodels/faker/StoreFaker.php | 6 +++--- tests/specs/petstore_xtable/models/PetFaker.php | 6 +++--- tests/specs/postgres_custom/models/CustomFaker.php | 6 +++--- 21 files changed, 66 insertions(+), 68 deletions(-) diff --git a/src/generator/default/faker.php b/src/generator/default/faker.php index 2d9d2219..fd0d07ab 100644 --- a/src/generator/default/faker.php +++ b/src/generator/default/faker.php @@ -30,16 +30,14 @@ public function generateModel() attributes as $attribute): if (!$attribute->fakerStub || $attribute->isReference()) { continue; - } ?> - $model->columnName ?> = fakerStub ?>; -attributes as $attribute): - if (!$attribute->fakerStub || !$attribute->isReference()) { - continue; - } ?> + } + ?> +primary === true && $attribute->phpType === 'int'):?> + //$model->columnName ?> = fakerStub ?>; + $model->columnName ?> = fakerStub ?>; + - **/?> return $model; } diff --git a/tests/specs/blog/models/CategoryFaker.php b/tests/specs/blog/models/CategoryFaker.php index 0c9f9fe8..84493aef 100644 --- a/tests/specs/blog/models/CategoryFaker.php +++ b/tests/specs/blog/models/CategoryFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Category(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->title = substr($faker->sentence, 0, 255); $model->active = $faker->boolean; return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog/models/CommentFaker.php b/tests/specs/blog/models/CommentFaker.php index bb3613a3..a404f779 100644 --- a/tests/specs/blog/models/CommentFaker.php +++ b/tests/specs/blog/models/CommentFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Comment(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->message = []; $model->created_at = $faker->unixTime; return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog/models/FakerableFaker.php b/tests/specs/blog/models/FakerableFaker.php index 703e65e3..678415fa 100644 --- a/tests/specs/blog/models/FakerableFaker.php +++ b/tests/specs/blog/models/FakerableFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Fakerable(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->active = $faker->boolean; $model->floatval = $faker->randomFloat(); $model->floatval_lim = $faker->randomFloat(null, 0, 1); @@ -43,7 +43,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -61,7 +61,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog/models/PostFaker.php b/tests/specs/blog/models/PostFaker.php index 480ba29c..080800d4 100644 --- a/tests/specs/blog/models/PostFaker.php +++ b/tests/specs/blog/models/PostFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Post(); - $model->uid = $uniqueFaker->numberBetween(0, 2147483647); + //$model->uid = $uniqueFaker->numberBetween(0, 2147483647); $model->title = substr($faker->sentence, 0, 255); $model->slug = substr($uniqueFaker->slug, 0, 200); $model->active = $faker->boolean; @@ -32,7 +32,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -50,7 +50,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog/models/UserFaker.php b/tests/specs/blog/models/UserFaker.php index 297fc201..84aee93b 100644 --- a/tests/specs/blog/models/UserFaker.php +++ b/tests/specs/blog/models/UserFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new User(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->username = substr($faker->userName, 0, 200); $model->email = substr($faker->safeEmail, 0, 200); $model->password = $faker->password; @@ -34,7 +34,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -52,7 +52,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/CategoryFaker.php b/tests/specs/blog_v2/models/CategoryFaker.php index 60b332cc..866bde33 100644 --- a/tests/specs/blog_v2/models/CategoryFaker.php +++ b/tests/specs/blog_v2/models/CategoryFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Category(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->title = substr($faker->sentence, 0, 100); $model->cover = $faker->sentence; $model->active = $faker->boolean; @@ -31,7 +31,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -49,7 +49,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/CommentFaker.php b/tests/specs/blog_v2/models/CommentFaker.php index fe37e8a3..378b98e7 100644 --- a/tests/specs/blog_v2/models/CommentFaker.php +++ b/tests/specs/blog_v2/models/CommentFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Comment(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->message = $faker->sentence; $model->created_at = $faker->dateTimeThisYear('now', 'UTC')->format(DATE_ATOM); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/PostFaker.php b/tests/specs/blog_v2/models/PostFaker.php index 58fd9ad4..472a5662 100644 --- a/tests/specs/blog_v2/models/PostFaker.php +++ b/tests/specs/blog_v2/models/PostFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Post(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->title = substr($faker->sentence, 0, 255); $model->slug = substr($uniqueFaker->slug, 0, 200); $model->lang = $faker->randomElement(['ru','eng']); @@ -33,7 +33,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -51,7 +51,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/PostTagFaker.php b/tests/specs/blog_v2/models/PostTagFaker.php index e4bce8b0..821c3f72 100644 --- a/tests/specs/blog_v2/models/PostTagFaker.php +++ b/tests/specs/blog_v2/models/PostTagFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new PostTag(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); return $model; } @@ -28,7 +28,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -46,7 +46,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/TagFaker.php b/tests/specs/blog_v2/models/TagFaker.php index ddc9f1f5..1740c1a3 100644 --- a/tests/specs/blog_v2/models/TagFaker.php +++ b/tests/specs/blog_v2/models/TagFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Tag(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = substr($faker->text(100), 0, 100); $model->lang = $faker->randomElement(['ru','eng']); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/blog_v2/models/UserFaker.php b/tests/specs/blog_v2/models/UserFaker.php index 9d421bb1..e7269914 100644 --- a/tests/specs/blog_v2/models/UserFaker.php +++ b/tests/specs/blog_v2/models/UserFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new User(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->login = $faker->userName; $model->email = $faker->safeEmail; $model->password = $faker->password; @@ -34,7 +34,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -52,7 +52,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/menu/models/MenuFaker.php b/tests/specs/menu/models/MenuFaker.php index 24c9ab9f..d6b8fc2b 100644 --- a/tests/specs/menu/models/MenuFaker.php +++ b/tests/specs/menu/models/MenuFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Menu(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = substr($faker->text(100), 0, 100); $model->args = []; $model->kwargs = []; @@ -31,7 +31,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -49,7 +49,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore/models/PetFaker.php b/tests/specs/petstore/models/PetFaker.php index 1f58bb9d..5d850693 100644 --- a/tests/specs/petstore/models/PetFaker.php +++ b/tests/specs/petstore/models/PetFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Pet(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; $model->tag = $faker->randomElement(['one', 'two', 'three', 'four']); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore/models/StoreFaker.php b/tests/specs/petstore/models/StoreFaker.php index 961d33ce..fd73da05 100644 --- a/tests/specs/petstore/models/StoreFaker.php +++ b/tests/specs/petstore/models/StoreFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Store(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; return $model; } @@ -29,7 +29,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -47,7 +47,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore_arrayref/models/PetFaker.php b/tests/specs/petstore_arrayref/models/PetFaker.php index 1f58bb9d..5d850693 100644 --- a/tests/specs/petstore_arrayref/models/PetFaker.php +++ b/tests/specs/petstore_arrayref/models/PetFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Pet(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; $model->tag = $faker->randomElement(['one', 'two', 'three', 'four']); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore_jsonapi/models/PetFaker.php b/tests/specs/petstore_jsonapi/models/PetFaker.php index 1f58bb9d..5d850693 100644 --- a/tests/specs/petstore_jsonapi/models/PetFaker.php +++ b/tests/specs/petstore_jsonapi/models/PetFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Pet(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; $model->tag = $faker->randomElement(['one', 'two', 'three', 'four']); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore_namespace/mymodels/faker/PetFaker.php b/tests/specs/petstore_namespace/mymodels/faker/PetFaker.php index 0f0e8aa0..d0b2f5c7 100644 --- a/tests/specs/petstore_namespace/mymodels/faker/PetFaker.php +++ b/tests/specs/petstore_namespace/mymodels/faker/PetFaker.php @@ -16,7 +16,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Pet(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; $model->tag = $faker->randomElement(['one', 'two', 'three', 'four']); return $model; @@ -31,7 +31,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -49,7 +49,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore_namespace/mymodels/faker/StoreFaker.php b/tests/specs/petstore_namespace/mymodels/faker/StoreFaker.php index 76fbed92..7c111bb8 100644 --- a/tests/specs/petstore_namespace/mymodels/faker/StoreFaker.php +++ b/tests/specs/petstore_namespace/mymodels/faker/StoreFaker.php @@ -16,7 +16,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Store(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; return $model; } @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/petstore_xtable/models/PetFaker.php b/tests/specs/petstore_xtable/models/PetFaker.php index 1f58bb9d..5d850693 100644 --- a/tests/specs/petstore_xtable/models/PetFaker.php +++ b/tests/specs/petstore_xtable/models/PetFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Pet(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->name = $faker->sentence; $model->tag = $faker->randomElement(['one', 'two', 'three', 'four']); return $model; @@ -30,7 +30,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -48,7 +48,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); } diff --git a/tests/specs/postgres_custom/models/CustomFaker.php b/tests/specs/postgres_custom/models/CustomFaker.php index 912073f8..848ea804 100644 --- a/tests/specs/postgres_custom/models/CustomFaker.php +++ b/tests/specs/postgres_custom/models/CustomFaker.php @@ -15,7 +15,7 @@ public function generateModel() $faker = FakerFactory::create(\Yii::$app->language); $uniqueFaker = new UniqueGenerator($faker); $model = new Custom(); - $model->id = $uniqueFaker->numberBetween(0, 2147483647); + //$model->id = $uniqueFaker->numberBetween(0, 2147483647); $model->num = $faker->numberBetween(0, 2147483647); $model->json1 = []; $model->json2 = []; @@ -34,7 +34,7 @@ public static function makeOne(array $attributes, bool $save = false) { $model = (new static())->generateModel(); $model->setAttributes($attributes); - if($save === true){ + if ($save === true) { $model->save(); } return $model; @@ -52,7 +52,7 @@ public static function make($number, array $commonAttributes, bool $save = false if ($number < 1) { return []; } - return array_map(function() use ($commonAttributes, $save){ + return array_map(function () use ($commonAttributes, $save) { return static::makeOne($commonAttributes, $save); }, range(0, $number -1)); }