Merge f08f232 into 38d3fe0

particle-php · Jan 27, 2018 · a68ac63 · a68ac63
2 parents 38d3fe0 + f08f232
commit a68ac63
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 17 deletions.
diff --git a/src/Chain.php b/src/Chain.php
@@ -450,7 +450,7 @@ public function validate(MessageStack $messageStack, Container $input, Container
 
             $valid = $rule->isValid($this->key, $input) && $valid;
 
-            if ($rule->shouldBreakChain()) {
+            if (!$valid && $rule->shouldBreakChainOnError() || $rule->shouldBreakChain()) {
                 break;
             }
         }

diff --git a/src/Rule.php b/src/Rule.php
@@ -71,6 +71,16 @@ public function shouldBreakChain()
         return false;
     }
 
+    /**
+     * This indicates whether or not the rule should break the chain it's in on validation failure.
+     *
+     * @return bool
+     */
+    public function shouldBreakChainOnError()
+    {
+        return false;
+    }
+
     /**
      * Registers the message stack to append errors to.
      *

diff --git a/src/Rule/Boolean.php b/src/Rule/Boolean.php
@@ -45,7 +45,7 @@ public function validate($value)
     /**
      * {@inheritdoc}
      */
-    public function shouldBreakChain()
+    public function shouldBreakChainOnError()
     {
         return true;
     }

diff --git a/src/Rule/Integer.php b/src/Rule/Integer.php
@@ -78,7 +78,7 @@ public function validate($value)
     /**
      * {@inheritdoc}
      */
-    public function shouldBreakChain()
+    public function shouldBreakChainOnError()
     {
         return true;
     }

diff --git a/src/Rule/IsArray.php b/src/Rule/IsArray.php
@@ -49,7 +49,7 @@ public function validate($value)
     /**
      * {@inheritdoc}
      */
-    public function shouldBreakChain()
+    public function shouldBreakChainOnError()
     {
         return true;
     }

diff --git a/src/Rule/IsFloat.php b/src/Rule/IsFloat.php
@@ -49,7 +49,7 @@ public function validate($value)
     /**
      * {@inheritdoc}
      */
-    public function shouldBreakChain()
+    public function shouldBreakChainOnError()
     {
         return true;
     }

diff --git a/src/Rule/IsString.php b/src/Rule/IsString.php
@@ -49,7 +49,7 @@ public function validate($value)
     /**
      * {@inheritdoc}
      */
-    public function shouldBreakChain()
+    public function shouldBreakChainOnError()
     {
         return true;
     }

diff --git a/tests/ChainTest.php b/tests/ChainTest.php
@@ -3,10 +3,16 @@
 
 use Particle\Validator\Rule;
 use Particle\Validator\Rule\Boolean;
+use Particle\Validator\Rule\Each;
+use Particle\Validator\Rule\Email;
+use Particle\Validator\Rule\GreaterThan;
+use Particle\Validator\Rule\InArray;
 use Particle\Validator\Rule\Integer;
 use Particle\Validator\Rule\IsArray;
 use Particle\Validator\Rule\IsFloat;
 use Particle\Validator\Rule\IsString;
+use Particle\Validator\Rule\LengthBetween;
+use Particle\Validator\Rule\Required;
 use Particle\Validator\Tests\Support\CustomRule;
 use Particle\Validator\Validator;
 
@@ -41,19 +47,20 @@ public function testCanMountRulesOnChain()
     }
 
     /**
-     * @dataProvider providePrimitiveRulesData
+     * @dataProvider provideBreakChainData
      *
-     * @param Rule $rule
+     * @param Rule $firstRule
+     * @param Rule $secondRule
      * @param array $data
      * @param array $expected
      */
-    public function testBreakChain($rule, $data, $expected)
+    public function testBreakChain($firstRule, $secondRule, $data, $expected)
     {
         $this
             ->validator
             ->required('foo')
-            ->mount($rule)
-            ->lengthBetween(1, 50);
+            ->mount($firstRule)
+            ->mount($secondRule);
 
         $result = $this->validator->validate($data);
 
@@ -64,11 +71,12 @@ public function testBreakChain($rule, $data, $expected)
     /**
      * @return array
      */
-    public function providePrimitiveRulesData()
+    public function provideBreakChainData()
     {
         return [
-            [
+            'break boolean rule on error' => [
                 new Boolean(),
+                new InArray([true, false]),
                 [
                     'foo' => 'string',
                 ],
@@ -78,8 +86,9 @@ public function providePrimitiveRulesData()
                     ],
                 ],
             ],
-            [
+            'break integer rule on error' => [
                 new Integer(),
+                new GreaterThan(10),
                 [
                     'foo' => 'string',
                 ],
@@ -89,8 +98,12 @@ public function providePrimitiveRulesData()
                     ],
                 ],
             ],
-            [
+            'break isArray rule on error' => [
                 new IsArray(),
+                new Each(function ($v) {
+                    /** @var Validator $v */
+                    $v->required('bar')->email();
+                }),
                 [
                     'foo' => 'string',
                 ],
@@ -100,8 +113,9 @@ public function providePrimitiveRulesData()
                     ],
                 ],
             ],
-            [
+            'break isFloat rule on error' => [
                 new IsFloat(),
+                new GreaterThan(20),
                 [
                     'foo' => 'string',
                 ],
@@ -111,8 +125,9 @@ public function providePrimitiveRulesData()
                     ],
                 ],
             ],
-            [
+            'break isString rule on error' => [
                 new IsString(),
+                new LengthBetween(1, 3),
                 [
                     'foo' => ['array-value'],
                 ],
@@ -122,6 +137,80 @@ public function providePrimitiveRulesData()
                     ],
                 ],
             ],
+            'break required rule' => [
+                new Boolean(),
+                new InArray([true, false]),
+                [],
+                [
+                    'foo' => [
+                        Required::NON_EXISTENT_KEY => 'foo must be provided, but does not exist',
+                    ],
+                ],
+            ],
+            'do not break boolean rule' => [
+                new Boolean(),
+                new InArray([false]),
+                [
+                    'foo' => true,
+                ],
+                [
+                    'foo' => [
+                        InArray::NOT_IN_ARRAY => 'foo must be in the defined set of values',
+                    ],
+                ],
+            ],
+            'do not break integer rule' => [
+                new Integer(),
+                new GreaterThan(10),
+                [
+                    'foo' => 5,
+                ],
+                [
+                    'foo' => [
+                        GreaterThan::NOT_GREATER_THAN => 'foo must be greater than 10',
+                    ],
+                ],
+            ],
+            'do not break isArray rule' => [
+                new IsArray(),
+                new Each(function (Validator $v) {
+                    $v->required('bar')->email();
+                }),
+                [
+                    'foo' => [
+                        ['bar' => 'invalid@email'],
+                    ],
+                ],
+                [
+                    'foo.0.bar' => [
+                        Email::INVALID_FORMAT => 'bar must be a valid email address',
+                    ],
+                ],
+            ],
+            'do not break isFloat rule' => [
+                new IsFloat(),
+                new GreaterThan(20),
+                [
+                    'foo' => 5.00,
+                ],
+                [
+                    'foo' => [
+                        GreaterThan::NOT_GREATER_THAN => 'foo must be greater than 20',
+                    ],
+                ],
+            ],
+            'do not break isString rule' => [
+                new IsString(),
+                new LengthBetween(1, 3),
+                [
+                    'foo' => 'abcdefg',
+                ],
+                [
+                    'foo' => [
+                        LengthBetween::TOO_LONG => 'foo must be 3 characters or shorter',
+                    ],
+                ],
+            ],
         ];
     }
 }