Fix issue with rusing validator rule NotEmpty and IsRequired (#192)

* Add testcase and fix bug for NotEmpty rule being reused

* Fix the same for Required rule

Author: RobQuistNL

src/Rule/NotEmpty.php

@@ -40,7 +40,7 @@ class NotEmpty extends Rule
      *
      * @var bool
      */
-    protected $shouldBreak;
+    protected $shouldBreak = false;
 
     /**
      * Indicates if the value can be empty.
@@ -89,6 +89,7 @@ public function shouldBreakChain()
      */
     public function validate($value)
     {
+        $this->shouldBreak = false;
         if ($this->isEmpty($value)) {
             $this->shouldBreak = true;
 

src/Rule/Required.php

@@ -40,7 +40,7 @@ class Required extends Rule
      *
      * @var bool
      */
-    protected $shouldBreak;
+    protected $shouldBreak = false;
 
     /**
      * Indicates if the value is required.
@@ -101,6 +101,7 @@ public function validate($value)
      */
     public function isValid($key, Container $input)
     {
+        $this->shouldBreak = false;
         $this->required = $this->isRequired($input);
 
         if (!$input->has($key)) {

tests/ReusableValidatorTest.php

@@ -0,0 +1,112 @@
+<?php
+namespace Particle\Validator\Tests;
+
+use Particle\Validator\Validator;
+
+class ReusableValidatorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Validator
+     */
+    protected $validator;
+
+    protected function configureValidator()
+    {
+        $this->validator = new Validator();
+
+        $this->validator->required('customerNr')->alnum();
+        $this->validator->required('paymentType')->inArray([
+            'downPaymentChangeBankAccount',
+            'downPaymentHighSpend',
+        ]);
+        $this->validator->required('reference')->alnum();
+        $this->validator->required('description')->lengthBetween(1, 250);
+        $this->validator->required('amountPaid')->float()->between(0.01, 10000);
+        $this->validator->required('notificationDate')->datetime('Ymd');
+    }
+
+    public function testCanUseNewValidatorEveryTime()
+    {
+        foreach ($this->getTestData() as $rowKey => $testRow) {
+            $this->configureValidator();
+
+            $result = $this->validator->validate($testRow['data']);
+            $this->assertEquals($testRow['valid'], $result->isValid());
+            $this->assertEquals($testRow['messages'], $result->getMessages());
+        }
+    }
+
+    public function testCanReuseValidatorMultipleTimes()
+    {
+        $this->configureValidator();
+
+        foreach ($this->getTestData() as $rowKey => $testRow) {
+            $result = $this->validator->validate($testRow['data']);
+            $this->assertEquals($testRow['valid'], $result->isValid());
+            $this->assertEquals($testRow['messages'], $result->getMessages());
+        }
+    }
+
+    private function getTestData()
+    {
+        return [
+            [
+                'data' => [
+                    'customerNr' => 'c000012340',
+                    'paymentType' => '',
+                    'reference' => '',
+                    'description' => 'Test payment 1',
+                    'amountPaid' => 1000.00,
+                    'notificationDate' => '20150401',
+                ],
+                'valid' => false,
+                'messages' => [
+                    'paymentType' => [
+                        'NotEmpty::EMPTY_VALUE' => 'paymentType must not be empty',
+                    ],
+                    'reference' => [
+                        'NotEmpty::EMPTY_VALUE' => 'reference must not be empty',
+                    ],
+                ],
+            ],
+
+            [
+                'data' => [
+                    'customerNr' => 'c000001234',
+                    'paymentType' => 'gfh',
+                    'description' => 'Test payment 2',
+                    'amountPaid' => 25.00,
+                    'notificationDate' => '20150401',
+                ],
+                'valid' => false,
+                'messages' => [
+                    'paymentType' => [
+                        'InArray::NOT_IN_ARRAY' => 'paymentType must be in the defined set of values',
+                    ],
+                    'reference' => [
+                        'Required::NON_EXISTENT_KEY' => 'reference must be provided, but does not exist',
+                    ],
+                ],
+            ],
+            [
+                'data' => [
+                    'customerNr' => 'c000005678',
+                    'paymentType' => 'sdf ',
+                    'reference' => '',
+                    'description' => 'Test payment 3',
+                    'amountPaid' => 25.00,
+                    'notificationDate' => '20150401',
+                ],
+                'valid' => false,
+                'messages' => [
+                    'paymentType' => [
+                        'InArray::NOT_IN_ARRAY' => 'paymentType must be in the defined set of values',
+                    ],
+                    'reference' => [
+                        'NotEmpty::EMPTY_VALUE' => 'reference must not be empty',
+                    ],
+                ],
+            ],
+        ];
+    }
+}