修复validate没有命名空间问题

nick-bai · Jul 13, 2021 · 9febaaa · 9febaaa
1 parent 62b6fc1
commit 9febaaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/template/impl/ValidateAutoMake.php b/src/template/impl/ValidateAutoMake.php
@@ -34,6 +34,7 @@ public function make($table, $path, $other)
 
         $model = ucfirst(Utils::camelize($table));
         $filePath = empty($path) ? '' : DS . $path;
+        $namespace = empty($path) ? '\\' : '\\' . $path . '\\';
 
         $prefix = config('database.connections.mysql.prefix');
         $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`');
@@ -47,6 +48,7 @@ public function make($table, $path, $other)
         $ruleArr = VarExporter::export($rule);
         $attributesArr = VarExporter::export($attributes);
 
+        $tplContent = str_replace('<namespace>', $namespace, $tplContent);
         $tplContent = str_replace('<model>', $model, $tplContent);
         $tplContent = str_replace('<rule>', '' . $ruleArr, $tplContent);
         $tplContent = str_replace('<attributes>', $attributesArr, $tplContent);

diff --git a/src/tpl/validate.tpl b/src/tpl/validate.tpl
@@ -1,6 +1,6 @@
 <?php
 
-namespace app\validate;
+namespace app<namespace>validate;
 
 use nickbai\tp6curd\extend\ExtendValidate;