Completed
Push — 6.0 ( 92d464...2656ee )
by yun
05:21
created
src/think/Validate.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
@@ -367,7 +367,7 @@  discard block
 block discarded – undo
367 367
      */
368 368
     public function hasScene(string $name): bool
369 369
     {
370
-        return isset($this->scene[$name]) || method_exists($this, 'scene' . $name);
370
+        return isset($this->scene[$name]) || method_exists($this, 'scene'.$name);
371 371
     }
372 372
 
373 373
     /**
@@ -719,7 +719,7 @@  discard block
 block discarded – undo
719 719
             if (strpos($field, '_confirm')) {
720 720
                 $rule = strstr($field, '_confirm', true);
721 721
             } else {
722
-                $rule = $field . '_confirm';
722
+                $rule = $field.'_confirm';
723 723
             }
724 724
         }
725 725
 
@@ -870,9 +870,9 @@  discard block
 block discarded – undo
870 870
                 if (isset($this->type[$rule])) {
871 871
                     // 注册的验证规则
872 872
                     $result = call_user_func_array($this->type[$rule], [$value]);
873
-                } elseif (function_exists('ctype_' . $rule)) {
873
+                } elseif (function_exists('ctype_'.$rule)) {
874 874
                     // ctype验证规则
875
-                    $ctypeFun = 'ctype_' . $rule;
875
+                    $ctypeFun = 'ctype_'.$rule;
876 876
                     $result   = $ctypeFun($value);
877 877
                 } elseif (isset($this->filter[$rule])) {
878 878
                     // Filter_var验证规则
@@ -1510,7 +1510,7 @@  discard block
 block discarded – undo
1510 1510
 
1511 1511
         if (is_string($rule) && 0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
1512 1512
             // 不是正则表达式则两端补上/
1513
-            $rule = '/^' . $rule . '$/';
1513
+            $rule = '/^'.$rule.'$/';
1514 1514
         }
1515 1515
 
1516 1516
         return is_scalar($value) && 1 === preg_match($rule, (string) $value);
@@ -1560,8 +1560,8 @@  discard block
 block discarded – undo
1560 1560
      */
1561 1561
     protected function getRuleMsg(string $attribute, string $title, string $type, $rule)
1562 1562
     {
1563
-        if (isset($this->message[$attribute . '.' . $type])) {
1564
-            $msg = $this->message[$attribute . '.' . $type];
1563
+        if (isset($this->message[$attribute.'.'.$type])) {
1564
+            $msg = $this->message[$attribute.'.'.$type];
1565 1565
         } elseif (isset($this->message[$attribute][$type])) {
1566 1566
             $msg = $this->message[$attribute][$type];
1567 1567
         } elseif (isset($this->message[$attribute])) {
@@ -1571,7 +1571,7 @@  discard block
 block discarded – undo
1571 1571
         } elseif (0 === strpos($type, 'require')) {
1572 1572
             $msg = $this->typeMsg['require'];
1573 1573
         } else {
1574
-            $msg = $title . $this->lang->get('not conform to the rules');
1574
+            $msg = $title.$this->lang->get('not conform to the rules');
1575 1575
         }
1576 1576
 
1577 1577
         if (is_array($msg)) {
@@ -1633,8 +1633,8 @@  discard block
 block discarded – undo
1633 1633
     {
1634 1634
         $this->only = $this->append = $this->remove = [];
1635 1635
 
1636
-        if (method_exists($this, 'scene' . $scene)) {
1637
-            call_user_func([$this, 'scene' . $scene]);
1636
+        if (method_exists($this, 'scene'.$scene)) {
1637
+            call_user_func([$this, 'scene'.$scene]);
1638 1638
         } elseif (isset($this->scene[$scene])) {
1639 1639
             // 如果设置了验证适用场景
1640 1640
             $this->only = $this->scene[$scene];
Please login to merge, or discard this patch.
tests/EventTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     {
43 43
         $this->event->bind(['foo' => 'baz']);
44 44
 
45
-        $this->event->listen('foo', function ($bar) {
45
+        $this->event->listen('foo', function($bar) {
46 46
             $this->assertEquals('bar', $bar);
47 47
         });
48 48
 
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
     public function testOnceEvent()
59 59
     {
60
-        $this->event->listen('AppInit', function ($bar) {
60
+        $this->event->listen('AppInit', function($bar) {
61 61
             $this->assertEquals('bar', $bar);
62 62
             return 'foo';
63 63
         });
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 
75 75
         $this->event->listen('some', "SomeListener");
76 76
 
77
-        $this->assertTrue($this->event->until('some'));;
77
+        $this->assertTrue($this->event->until('some')); ;
78 78
     }
79 79
 
80 80
     public function testSubscribe()
81 81
     {
82 82
         $listener = m::mock("overload:SomeListener", TestListener::class);
83 83
 
84
-        $listener->shouldReceive('subscribe')->andReturnUsing(function (Event $event) use ($listener) {
84
+        $listener->shouldReceive('subscribe')->andReturnUsing(function(Event $event) use ($listener) {
85 85
 
86 86
             $listener->shouldReceive('onBar')->once()->andReturnFalse();
87 87
 
Please login to merge, or discard this patch.