Skip to content

Commit 9126089

Browse files
cebecebe
committed
Merge #66 remote-tracking branch 'php-openapi/65-default-value-by-constant-and-expression-in-crud-models-faker-etc'
* php-openapi/65-default-value-by-constant-and-expression-in-crud-models-faker-etc: Add docs Undo create PR Create PR Cleanup Fix another failing tests 3 Fix another failing tests 2 Fix another failing tests Fix failing tests + refactor Fix this issue Create pull request
2 parents ac05063 + 8e14987 commit 9126089

File tree

22 files changed

+630
-6
lines changed

22 files changed

+630
-6
lines changed

‎src/lib/ValidationRulesBuilder.php‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use cebe\yii2openapi\lib\items\Attribute;
1111
use cebe\yii2openapi\lib\items\DbModel;
1212
use cebe\yii2openapi\lib\items\ValidationRule;
13+
use yii\db\Expression;
1314
use yii\helpers\Inflector;
1415
use function count;
1516
use function implode;
@@ -209,12 +210,11 @@ private function defaultRule(Attribute $attribute):void
209210
if ($attribute->defaultValue === null) {
210211
return;
211212
}
212-
if ($attribute->defaultValue instanceof \yii\db\Expression) {
213-
return;
214-
}
215213

216214
$params = [];
217-
$params['value'] = $attribute->defaultValue;
215+
$params['value'] = ($attribute->defaultValue instanceof \yii\db\Expression) ?
216+
$this->wrapDefaultExpression($attribute->defaultValue) :
217+
$attribute->defaultValue;
218218
$key = $attribute->columnName . '_default';
219219
$this->rules[$key] = new ValidationRule([$attribute->columnName], 'default', $params);
220220
}
@@ -268,4 +268,14 @@ private function prepareTypeScope():void
268268
$this->typeScope['safe'][$attribute->columnName] = $attribute->columnName;
269269
}
270270
}
271+
272+
private function wrapDefaultExpression(Expression $dbExpr): Expression
273+
{
274+
return new class($dbExpr->expression) extends Expression {
275+
public function __toString()
276+
{
277+
return '-yii-db-expression-starts-("' . $this->expression . '")-yii-db-expression-ends-';
278+
}
279+
};
280+
}
271281
}

‎src/lib/items/DbModel.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ public function getValidationRules():string
108108
$rules = Yii::createObject(ValidationRulesBuilder::class, [$this])->build();
109109
$rules = array_map('strval', $rules);
110110
$rules = VarDumper::export($rules);
111-
return str_replace([
111+
112+
$rules = str_replace([
112113
PHP_EOL,
113114
"\'",
114115
"'[[",
@@ -119,6 +120,15 @@ public function getValidationRules():string
119120
'[[',
120121
'],'
121122
], $rules);
123+
124+
// https://github.com/php-openapi/yii2-openapi/issues/65
125+
$rules = str_replace(
126+
["'value' => '-yii-db-expression-starts-", "-yii-db-expression-ends-'"],
127+
["'value' => new \yii\db\Expression", ""],
128+
$rules,
129+
);
130+
131+
return $rules;
122132
}
123133

124134
/**

‎tests/specs/blog/models/base/User.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public function rules()
4141
'flags_integer' => [['flags'], 'integer'],
4242
'flags_default' => [['flags'], 'default', 'value' => 0],
4343
'created_at_datetime' => [['created_at'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
44+
'created_at_default' => [['created_at'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
4445
];
4546
}
4647
}

‎tests/specs/x_db_default_expression/maria/edit/app/models/Fruit.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace app\models;
4+
5+
class Fruit extends \app\models\base\Fruit
6+
{
7+
8+
9+
}
10+

‎tests/specs/x_db_default_expression/maria/edit/app/models/base/Fruit.php‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
7+
namespace app\models\base;
8+
9+
/**
10+
* x-db-default-expression test
11+
*
12+
* @property string $ts
13+
* @property string $ts2
14+
* @property string $ts3
15+
* @property string $ts4
16+
* @property string $ts5
17+
* @property string $ts6
18+
* @property string $d
19+
* @property string $d2
20+
* @property string $d3
21+
* @property string $ts7
22+
*
23+
*/
24+
abstract class Fruit extends \yii\db\ActiveRecord
25+
{
26+
public static function tableName()
27+
{
28+
return '{{%fruits}}';
29+
}
30+
31+
public function rules()
32+
{
33+
return [
34+
'trim' => [['ts', 'ts2', 'ts3', 'ts4', 'ts5', 'ts6', 'd', 'd2', 'd3', 'ts7'], 'trim'],
35+
'ts_datetime' => [['ts'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
36+
'ts_default' => [['ts'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
37+
'ts2_datetime' => [['ts2'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
38+
'ts2_default' => [['ts2'], 'default', 'value' => '2011-11-11 00:00:00'],
39+
'ts3_datetime' => [['ts3'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
40+
'ts3_default' => [['ts3'], 'default', 'value' => '2022-11-11 00:00:00'],
41+
'ts4_string' => [['ts4'], 'string'],
42+
'ts4_default' => [['ts4'], 'default', 'value' => '2022-11-11 00:00:00'],
43+
'ts5_string' => [['ts5'], 'string'],
44+
'ts5_default' => [['ts5'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
45+
'ts6_string' => [['ts6'], 'string'],
46+
'ts6_default' => [['ts6'], 'default', 'value' => '2000-11-11 00:00:00'],
47+
'd_date' => [['d'], 'date', 'format' => 'php:Y-m-d'],
48+
'd_default' => [['d'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
49+
'd2_string' => [['d2'], 'string'],
50+
'd2_default' => [['d2'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
51+
'd3_string' => [['d3'], 'string'],
52+
'd3_default' => [['d3'], 'default', 'value' => 'text default'],
53+
'ts7_date' => [['ts7'], 'date', 'format' => 'php:Y-m-d'],
54+
'ts7_default' => [['ts7'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
55+
];
56+
}
57+
}

‎tests/specs/x_db_default_expression/maria/edit_expression/app/models/Fruit.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace app\models;
4+
5+
class Fruit extends \app\models\base\Fruit
6+
{
7+
8+
9+
}
10+

‎tests/specs/x_db_default_expression/maria/edit_expression/app/models/base/Fruit.php‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
7+
namespace app\models\base;
8+
9+
/**
10+
* x-db-default-expression test
11+
*
12+
* @property string $ts
13+
* @property string $ts2
14+
* @property string $ts3
15+
* @property string $ts4
16+
* @property string $ts5
17+
* @property string $ts6
18+
* @property string $d
19+
* @property string $d2
20+
* @property string $d3
21+
* @property string $ts7
22+
*
23+
*/
24+
abstract class Fruit extends \yii\db\ActiveRecord
25+
{
26+
public static function tableName()
27+
{
28+
return '{{%fruits}}';
29+
}
30+
31+
public function rules()
32+
{
33+
return [
34+
'trim' => [['ts', 'ts2', 'ts3', 'ts4', 'ts5', 'ts6', 'd', 'd2', 'd3', 'ts7'], 'trim'],
35+
'ts_datetime' => [['ts'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
36+
'ts_default' => [['ts'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
37+
'ts2_datetime' => [['ts2'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
38+
'ts2_default' => [['ts2'], 'default', 'value' => '2011-11-11 00:00:00'],
39+
'ts3_datetime' => [['ts3'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
40+
'ts3_default' => [['ts3'], 'default', 'value' => '2022-11-11 00:00:00'],
41+
'ts4_string' => [['ts4'], 'string'],
42+
'ts4_default' => [['ts4'], 'default', 'value' => '2022-11-11 00:00:00'],
43+
'ts5_string' => [['ts5'], 'string'],
44+
'ts5_default' => [['ts5'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
45+
'ts6_string' => [['ts6'], 'string'],
46+
'ts6_default' => [['ts6'], 'default', 'value' => '2000-11-11 00:00:00'],
47+
'd_date' => [['d'], 'date', 'format' => 'php:Y-m-d'],
48+
'd_default' => [['d'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
49+
'd2_string' => [['d2'], 'string'],
50+
'd2_default' => [['d2'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
51+
'd3_string' => [['d3'], 'string'],
52+
'd3_default' => [['d3'], 'default', 'value' => 'text default'],
53+
'ts7_date' => [['ts7'], 'date', 'format' => 'php:Y-m-d'],
54+
'ts7_default' => [['ts7'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
55+
];
56+
}
57+
}

‎tests/specs/x_db_default_expression/maria/simple/app/models/Fruit.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace app\models;
4+
5+
class Fruit extends \app\models\base\Fruit
6+
{
7+
8+
9+
}
10+

‎tests/specs/x_db_default_expression/maria/simple/app/models/base/Fruit.php‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?php
2+
3+
/**
4+
* This file is generated by Gii, do not change manually!
5+
*/
6+
7+
namespace app\models\base;
8+
9+
/**
10+
* x-db-default-expression test
11+
*
12+
* @property string $ts
13+
* @property string $ts2
14+
* @property string $ts3
15+
* @property string $ts4
16+
* @property string $ts5
17+
* @property string $ts6
18+
* @property string $d
19+
* @property string $d2
20+
* @property string $d3
21+
* @property string $ts7
22+
*
23+
*/
24+
abstract class Fruit extends \yii\db\ActiveRecord
25+
{
26+
public static function tableName()
27+
{
28+
return '{{%fruits}}';
29+
}
30+
31+
public function rules()
32+
{
33+
return [
34+
'trim' => [['ts', 'ts2', 'ts3', 'ts4', 'ts5', 'ts6', 'd', 'd2', 'd3', 'ts7'], 'trim'],
35+
'ts_datetime' => [['ts'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
36+
'ts_default' => [['ts'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
37+
'ts2_datetime' => [['ts2'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
38+
'ts2_default' => [['ts2'], 'default', 'value' => '2011-11-11 00:00:00'],
39+
'ts3_datetime' => [['ts3'], 'datetime', 'format' => 'php:Y-m-d H:i:s'],
40+
'ts3_default' => [['ts3'], 'default', 'value' => '2022-11-11 00:00:00'],
41+
'ts4_string' => [['ts4'], 'string'],
42+
'ts4_default' => [['ts4'], 'default', 'value' => '2022-11-11 00:00:00'],
43+
'ts5_string' => [['ts5'], 'string'],
44+
'ts5_default' => [['ts5'], 'default', 'value' => new \yii\db\Expression("(CURRENT_TIMESTAMP)")],
45+
'ts6_string' => [['ts6'], 'string'],
46+
'ts6_default' => [['ts6'], 'default', 'value' => '2000-11-11 00:00:00'],
47+
'd_date' => [['d'], 'date', 'format' => 'php:Y-m-d'],
48+
'd_default' => [['d'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
49+
'd2_string' => [['d2'], 'string'],
50+
'd2_default' => [['d2'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
51+
'd3_string' => [['d3'], 'string'],
52+
'd3_default' => [['d3'], 'default', 'value' => 'text default'],
53+
'ts7_date' => [['ts7'], 'date', 'format' => 'php:Y-m-d'],
54+
'ts7_default' => [['ts7'], 'default', 'value' => new \yii\db\Expression("(CURRENT_DATE + INTERVAL 1 YEAR)")],
55+
];
56+
}
57+
}

‎tests/specs/x_db_default_expression/mysql/edit/app/models/Fruit.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace app\models;
4+
5+
class Fruit extends \app\models\base\Fruit
6+
{
7+
8+
9+
}
10+

0 commit comments

Comments
 (0)