* fix: chained validator not usable

Author: no7mks

phpunit.xml

@@ -19,6 +19,7 @@
             <file>ut/EmailValidatorTest.php</file>
             <file>ut/UrlValidatorTest.php</file>
             <file>ut/RegexValidatorTest.php</file>
+            <file>ut/ChainedValidatorTest.php</file>
         </testsuite>
     </testsuites>
 </phpunit>

src/Validators/ChainedValidator.php

@@ -22,6 +22,7 @@ public function __construct(...$args)
                 );
             }
         }
+        $this->validators = $args;
     }
 
     public function validate($target)

src/Validators/RegexValidator.php

@@ -23,7 +23,7 @@ public function __construct($pattern)
         if (@preg_match($pattern, '') === false) {
             throw new \InvalidArgumentException("Invalid pattern: " . $pattern);
         }
-        
+    
         $this->pattern = $pattern;
     }
 
@@ -32,11 +32,11 @@ public function validate($target)
         if (!is_string($target)) {
             throw new InvalidDataTypeException("Target is not a string, and cannot be validated by REGEX!");
         }
-        
+    
         if (!preg_match($this->pattern, $target)) {
             throw new RegexNotMatchedException("Target given cannot be matched by REGEX!");
         }
-        
+    
         return $target;
     }
 }

ut/ChainedValidatorTest.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: minhao
+ * Date: 2017-05-22
+ * Time: 14:53
+ */
+
+use Oasis\Mlib\Utils\Exceptions\DataValidationException;
+use Oasis\Mlib\Utils\Validators\ChainedValidator;
+use Oasis\Mlib\Utils\Validators\RegexValidator;
+use Oasis\Mlib\Utils\Validators\StringLengthValidator;
+use Oasis\Mlib\Utils\Validators\StringValidator;
+
+class ChainedValidatorTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provideChainedTestData
+     *
+     * @param $val
+     */
+    public function testValidData($val)
+    {
+        $cv = new ChainedValidator(
+            new StringValidator(),
+            new StringLengthValidator(20),
+            new RegexValidator('/^[0-9]+$/')
+        );
+        $this->assertEquals($val, $cv->validate($val));
+    }
+    
+    /**
+     * @dataProvider provideInvalidChainedTestData
+     *
+     * @param $val
+     */
+    public function testInvalidData($val)
+    {
+        $cv = new ChainedValidator(
+            new StringValidator(),
+            new StringLengthValidator(20),
+            new RegexValidator('/^[0-9]+$/')
+        );
+        $this->expectException(DataValidationException::class);
+        $cv->validate($val);
+    }
+    
+    public function provideChainedTestData()
+    {
+        return [
+            ['123'],
+            [str_repeat('1', 20)],
+        ];
+    }
+    
+    public function provideInvalidChainedTestData()
+    {
+        return [
+            [''],
+            ['ab22'],
+            [str_repeat('1', 22)],
+        ];
+    }
+}

ut/StringValidatorTest.php

@@ -18,7 +18,7 @@ class StringValidatorTest extends PHPUnit_Framework_TestCase
     public function testNonStrictInputWithValidInput($target)
     {
         $validator = new StringValidator();
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->assertTrue(is_string($validator->validate($target)));
     }
 
     /**
@@ -29,8 +29,8 @@ public function testNonStrictInputWithValidInput($target)
     public function testNonStrictInputWithInvalidInput($target)
     {
         $validator = new StringValidator();
-        self::setExpectedException(DataValidationException::class);
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->expectException(DataValidationException::class);
+        $this->assertTrue(is_string($validator->validate($target)));
     }
 
     /**
@@ -41,7 +41,7 @@ public function testNonStrictInputWithInvalidInput($target)
     public function testStrictInputWithValidInput($target)
     {
         $validator = new StringValidator(true);
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->assertTrue(is_string($validator->validate($target)));
     }
 
     /**
@@ -52,8 +52,8 @@ public function testStrictInputWithValidInput($target)
     public function testStrictInputWithInvalidInput($target)
     {
         $validator = new StringValidator(true);
-        self::setExpectedException(DataValidationException::class);
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->expectException(DataValidationException::class);
+        $this->assertTrue(is_string($validator->validate($target)));
     }
 
     /**
@@ -64,7 +64,7 @@ public function testStrictInputWithInvalidInput($target)
     public function testStrictInputWithEmptyNotAllowed($target)
     {
         $validator = new StringValidator(true, false);
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->assertTrue(is_string($validator->validate($target)));
     }
 
     /**
@@ -75,8 +75,8 @@ public function testStrictInputWithEmptyNotAllowed($target)
     public function testStrictInputWithInvalidInputEmptyNotAllowed($target)
     {
         $validator = new StringValidator(true, false);
-        self::setExpectedException(DataValidationException::class);
-        self::assertTrue(is_string($validator->validate($target)));
+        $this->expectException(DataValidationException::class);
+        $this->assertTrue(is_string($validator->validate($target)));
 
     }