Merge branch '12.x'

2021-02-19 13:17:23 +08:00
parent 3ee2aa34a7 fc28bbfc9e
commit 6bf40e474d
109 changed files with 5297 additions and 1570 deletions
@@ -1648,8 +1648,8 @@ class testcase extends control

                        foreach($steps as $step)
                        {
-                            $step = trim($step);
-                            if(empty($step)) continue;
+                            $trimedStep = trim($step);
+                            if(empty($trimedStep)) continue;
                            if(preg_match('/^(([0-9]+)\.[0-9]+)([.、]{1})/U', $step, $out))
                            {
                                $num     = $out[1];