Fix this issue

Author: SOHELAHMED7

src/generator/default/dbmodel.php

@@ -49,8 +49,8 @@
  */
 abstract class <?= $model->getClassName() ?> extends \yii\db\ActiveRecord
 {
-<?php if($scenarios = $model->getScenarios()):
-foreach($scenarios as $scenario): ?>
+<?php if ($scenarios = $model->getScenarios()):
+foreach ($scenarios as $scenario): ?>
     /**
      *<?= $scenario['description'] ?>
 
@@ -76,7 +76,7 @@ public static function tableName()
     {
         return <?= var_export($model->getTableAlias()) ?>;
     }
-<?php if($scenarios): ?>
+<?php if ($scenarios): ?>
 
     /**
      * Automatically generated scenarios from the model 'x-scenarios'.
@@ -92,7 +92,7 @@ public function scenarios()
         $default = parent::scenarios()[self::SCENARIO_DEFAULT];
 
         return [
-<?php foreach($scenarios as $scenario): ?>
+<?php foreach ($scenarios as $scenario): ?>
             self::<?= $scenario['const'] ?> => $default,
 <?php endforeach; ?>
             /**

src/lib/ValidationRulesBuilder.php

@@ -10,8 +10,7 @@
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\ValidationRule;
-use yii\helpers\VarDumper;
-use yii\validators\DateValidator;
+use yii\db\Expression;
 use function count;
 use function implode;
 use function in_array;
@@ -192,12 +191,11 @@ private function defaultRule(Attribute $attribute):void
         if ($attribute->defaultValue === null) {
             return;
         }
-        if ($attribute->defaultValue instanceof \yii\db\Expression) {
-            return;
-        }
 
         $params = [];
-        $params['value'] = $attribute->defaultValue;
+        $params['value'] = ($attribute->defaultValue instanceof \yii\db\Expression) ?
+            $this->f($attribute->defaultValue) :
+            $attribute->defaultValue;
         $key = $attribute->columnName . '_default';
         $this->rules[$key] = new ValidationRule([$attribute->columnName], 'default', $params);
     }
@@ -251,4 +249,14 @@ private function prepareTypeScope():void
             $this->typeScope['safe'][$attribute->columnName] = $attribute->columnName;
         }
     }
+
+    private function f($dbExpr) // TODO rename
+    {
+        return new class($dbExpr->expression) extends Expression {
+            public function __toString()
+            {
+                return '-yii-db-expression-starts-("' . $this->expression . '")-yii-db-expression-ends-';
+            }
+        };
+    }
 }

src/lib/items/DbModel.php

@@ -13,7 +13,6 @@
 use yii\base\BaseObject;
 use yii\db\ColumnSchema;
 use yii\helpers\Inflector;
-use yii\helpers\StringHelper;
 use yii\helpers\VarDumper;
 use function array_filter;
 use function array_map;
@@ -109,7 +108,8 @@ public function getValidationRules():string
         $rules = Yii::createObject(ValidationRulesBuilder::class, [$this])->build();
         $rules = array_map('strval', $rules);
         $rules = VarDumper::export($rules);
-        return str_replace([
+
+        $rules = str_replace([
             PHP_EOL,
             "\'",
             "'[[",
@@ -120,6 +120,15 @@ public function getValidationRules():string
             '[[',
             '],'
         ], $rules);
+
+        $rules = str_replace(
+            ["'value' => '-yii-db-expression-starts-", "-yii-db-expression-ends-'"],
+            ["'value' => new \yii\db\Expression", ""],
+            $rules,
+            $count
+        );
+
+        return $rules;
     }
 
     /**

tests/unit/IssueFixTest.php

@@ -360,4 +360,18 @@ public function test158BugGiiapiGeneratedRulesEnumWithTrim()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
+
+    // https://github.com/php-openapi/yii2-openapi/issues/65
+    // public function test65DefaultValueByConstantAndExpressionInCrudModelsFakerEtc()
+    // {
+    //     $testFile = Yii::getAlias("@specs/issue_fix/65_default_value_by_constant_and_expression_in_crud_models_faker_etc/index.php");
+    //     $this->runGenerator($testFile);
+    //     $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+    //         'recursive' => true,
+    //     ]);
+    //     $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/65_default_value_by_constant_and_expression_in_crud_models_faker_etc/mysql"), [
+    //         'recursive' => true,
+    //     ]);
+    //     // $this->checkFiles($actualFiles, $expectedFiles); // TODO
+    // }
 }