Merge pull request #37 from Chrisleung/master

修复执行单元测试时,fast\Form重复定义的问题
2018-10-11 21:07:12 +08:00 · 2018-10-11 21:07:12 +08:00 · c8e4c56e80
parent 7a4fdb61c9 2c366f06b3
commit c8e4c56e80
1 changed files with 3 additions and 1 deletions
--- a/application/common/behavior/Common.php
+++ b/application/common/behavior/Common.php
@ -59,7 +59,9 @@ class Common
            \think\Cookie::set('think_var', $request->get('lang'));
        }
        // Form别名
-        class_alias('fast\\Form', 'Form');
+        if (!class_exists('Form')) {
+            class_alias('fast\\Form', 'Form');
+        }
    }

    public function addonBegin(&$request)