Merge remote master branch

.gitignore

@@ -3,3 +3,4 @@
 composer.phar
 composer.lock
 vendor
+.idea/

.travis.yml

@@ -1,21 +1,27 @@
 # see http://about.travis-ci.org/docs/user/languages/php/ for more hints
 language: php
-dist: precise
 
 # list any PHP version you want to test against
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
+  - 7.2
+  - nightly
   - hhvm
 
 matrix:
   allow_failures:
     - php: hhvm
+    - php: nightly
+  include:
+    - php: 5.3
+      dist: precise
 
 before_script:
   - composer install
 
 # Script to run tests
-script: ./vendor/bin/phpunit
+script: composer test

README.md

@@ -133,12 +133,15 @@ V::lang('ar');
  * `in` - Performs in_array check on given array values
  * `notIn` - Negation of `in` rule (not in array of values)
  * `ip` - Valid IP address
+ * `ipv4` - Valid IP v4 address
+ * `ipv6` - Valid IP v6 address
  * `email` - Valid email address
  * `emailDNS` - Valid email address with active DNS record
  * `url` - Valid URL
  * `urlActive` - Valid URL with active DNS record
  * `alpha` - Alphabetic characters only
  * `alphaNum` - Alphabetic and numeric characters only
+ * `ascii` - ASCII characters only
  * `slug` - URL slug characters (a-z, 0-9, -, \_)
  * `regex` - Field matches given regex pattern
  * `date` - Field is a valid date

composer.json

@@ -16,11 +16,19 @@
         "php": ">=5.3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8.35"
+        "phpunit/phpunit": "^4.8.35 || ^5.5 || ^6.5"
+    },
+    "suggest": {
+        "ext-mbstring": "It can support the multiple bytes string length."
     },
     "autoload": {
-        "psr-0": {
+        "psr-4": {
-            "Valitron": "src/"
+            "Valitron\\": "src/Valitron"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Valitron\\": "tests/Valitron"
         }
     },
     "scripts": {

lang/ko.php

@@ -0,0 +1,34 @@
+<?php
+
+return array(
+    'required'      => "을(를) 입력해야 합니다.",
+    'equals'        => "은(는) '%s'와(과) 같아야 합니다.",
+    'different'     => "은(는) '%s'와(과) 달라야 합니다.",
+    'accepted'      => "을(를) 동의해야 합니다.",
+    'numeric'       => "은(는) 숫자여야 합니다.",
+    'integer'       => "은(는) 정수여야 합니다.",
+    'length'        => "의 길이는 %d 이어야 합니다.",
+    'min'           => "은(는) %s 이상이어야 합니다.",
+    'max'           => "은(는) %s 이하여야 합니다.",
+    'in'            => "은(는) 올바르지 않은 값을 포함하고 있습니다.",
+    'notIn'         => "은(는) 올바르지 않은 값을 포함하고 있습니다.",
+    'ip'            => "은(는) 올바르지 않은 IP입니다.",
+    'email'         => "은(는) 올바르지 않은 email입니다.",
+    'url'           => "은(는) 올바르지 않은 URL입니다.",
+    'urlActive'     => "은(는) 접속 가능한 도메인이어야 합니다.",
+    'alpha'         => "은(는) 영문자(a-z)로만 이루어져야 합니다.",
+    'alphaNum'      => "은(는) 영문자(a-z)와 숫자(0-9)로만 이루어져야 합니다.",
+    'slug'          => "은(는) 영문자(a-z)와 숫자(0-9), 특수문자 -와 _로만 이루어져야 합니다.",
+    'regex'         => "은(는) 올바르지 않은 문자를 포함하고 있습니다.",
+    'date'          => "은(는) 올바르지 않은 날짜입니다.",
+    'dateFormat'    => "은(는) '%s' 형태의 날짜여야 합니다.",
+    'dateBefore'    => "은(는) '%s' 보다 이전이어야 합니다.",
+    'dateAfter'     => "은(는) '%s' 보다 이후여야 합니다.",
+    'contains'      => "은(는) '%s'을(를) 포함해야 합니다.",
+    'boolean'       => "은(는) boolean이어야 합니다.",
+    'lengthBetween' => "의 길이는 %d에서 %d 사이여야 합니다.",
+    'creditCard'    => "은(는) 올바른 신용카드 번호가 아닙니다.",
+    'lengthMin'     => "의 길이는 %d 이상이어야 합니다.",
+    'lengthMax'     => "의 길이는 %d을(를) 넘을 수 없습니다.",
+    'instanceOf'    => "는 '%s'의 객체여야 합니다."
+);

phpunit.xml

@@ -15,4 +15,12 @@
       <directory suffix="Test.php">tests/Valitron</directory>
     </testsuite>
   </testsuites>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">src/</directory>
+    </whitelist>
+      <blacklist>
+        <directory suffix=".php">vendor/</directory>
+      </blacklist>
+    </filter>
 </phpunit>

src/Valitron/Validator.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Valitron;
 
 /**
@@ -77,6 +78,11 @@ class Validator
      */
     protected $validUrlPrefixes = array('http://', 'https://', 'ftp://');
 
+    /**
+     * @var bool
+     */
+    protected $stop_on_first_fail = false;
+
     /**
      * Setup validation
      *
@@ -244,7 +250,7 @@ class Validator
     {
         if (isset($params[0]) && (bool)$params[0]) {
             //strict mode
-            return preg_match('/^-?([0-9])+$/i', $value);
+            return preg_match('/^([0-9]|-[1-9]|-?[1-9][0-9]*)$/i', $value);
         }
 
         return filter_var($value, \FILTER_VALIDATE_INT) !== false;
@@ -377,7 +383,6 @@ class Validator
      * @param  string $field
      * @param  mixed $value
      * @param  array $params
-
      * @return bool
      */
     protected function validateBetween($field, $value, $params)
@@ -520,6 +525,30 @@ class Validator
         return filter_var($value, \FILTER_VALIDATE_IP) !== false;
     }
 
+    /**
+     * Validate that a field is a valid IP v4 address
+     *
+     * @param  string $field
+     * @param  mixed  $value
+     * @return bool
+     */
+    protected function validateIpv4($field, $value)
+    {
+        return filter_var($value, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV4) !== false;
+    }
+
+    /**
+     * Validate that a field is a valid IP v6 address
+     *
+     * @param  string $field
+     * @param  mixed  $value
+     * @return bool
+     */
+    protected function validateIpv6($field, $value)
+    {
+        return filter_var($value, \FILTER_VALIDATE_IP, \FILTER_FLAG_IPV6) !== false;
+    }
+
     /**
      * Validate that a field is a valid e-mail address
      *
@@ -532,6 +561,24 @@ class Validator
         return filter_var($value, \FILTER_VALIDATE_EMAIL) !== false;
     }
 
+    /**
+     * Validate that a field contains only ASCII characters
+     *
+     * @param $field
+     * @param $value
+     * @return bool|false|string
+     */
+    protected function validateAscii($field, $value)
+    {
+        // multibyte extension needed
+        if (function_exists('mb_detect_encoding')) {
+            return mb_detect_encoding($value, 'ASCII', true);
+        }
+
+        // fallback with regex
+        return 0 === preg_match('/[^\x00-\x7F]/', $value);
+    }
+
     /**
      * Validate that a field is a valid e-mail address and the domain name is active
      *
@@ -765,7 +812,7 @@ class Validator
                 return false;
             }
             for ($i = 0; $i < $strlen; $i++) {
-                $digit = (int) substr($number, $strlen - $i - 1, 1);
+                $digit = (int)substr($number, $strlen - $i - 1, 1);
                 if ($i % 2 == 1) {
                     $sub_total = $digit * 2;
                     if ($sub_total > 9) {
@@ -973,16 +1020,14 @@ class Validator
                 return array(null, array_key_exists($identifier, $data));
             }
             return array(null, false);
-        }
+        } // Match array element
-        // Match array element
         elseif (count($identifiers) === 0) {
-            if ($allow_empty){
+            if ($allow_empty) {
                 //when empty values are allowed, we only care if the key exists
                 return array(null, array_key_exists($identifier, $data));
             }
-            return array($data[$identifier], false);
+            return array($data[$identifier], $allow_empty);
-        }
+        } // We need to go deeper
-        // We need to go deeper
         else {
             return $this->getPart($data[$identifier], $identifiers, $allow_empty);
         }
@@ -995,9 +1040,10 @@ class Validator
      */
     public function validate()
     {
+        $set_to_break = false;
         foreach ($this->_validations as $v) {
             foreach ($v['fields'] as $field) {
-                 list($values, $multiple) = $this->getPart($this->_fields, explode('.', $field));
+                list($values, $multiple) = $this->getPart($this->_fields, explode('.', $field), false);
 
                 // Don't validate if the field is not required and the value is empty
                 if ($this->hasRule('optional', $field) && isset($values)) {
@@ -1005,7 +1051,7 @@ class Validator
                 } elseif (
                     $v['rule'] !== 'required' && !$this->hasRule('required', $field) &&
                     $v['rule'] !== 'accepted' &&
-                    (! isset($values) || $values === '' || ($multiple && count($values) == 0))
+                    (!isset($values) || $values === '' || ($multiple && count($values) == 0))
                 ) {
                     continue;
                 }
@@ -1020,6 +1066,8 @@ class Validator
 
                 if (!$multiple) {
                     $values = array($values);
+                } else if (! $this->hasRule('required', $field)){
+                    $values = array_filter($values);
                 }
 
                 $result = true;
@@ -1029,13 +1077,27 @@ class Validator
 
                 if (!$result) {
                     $this->error($field, $v['message'], $v['params']);
+                    if ($this->stop_on_first_fail) {
+                        $set_to_break = true;
+                        break;
                     }
                 }
             }
+            if ($set_to_break) break;
+        }
 
         return count($this->errors()) === 0;
     }
 
+    /**
+     * Should the validation stop a rule is failed
+     * @param bool $stop
+     */
+    public function stopOnFirstFail($stop = true)
+    {
+        $this->stop_on_first_fail = (bool)$stop;
+    }
+
     /**
      * Returns all rule callbacks, the static and instance ones.
      *
@@ -1169,7 +1231,8 @@ class Validator
         // Get any other arguments passed to function
         $params = array_slice(func_get_args(), 2);
 
-        if (is_callable($rule) && !(is_string($rule) && $this->hasValidator($rule))) {
+        if (is_callable($rule)
+            && !(is_string($rule) && $this->hasValidator($rule))) {
             $name = $this->getUniqueRuleName($fields);
             $message = isset($params[0]) ? $params[0] : null;
             $this->addInstanceRule($name, $rule, $message);
@@ -1330,7 +1393,7 @@ class Validator
             if (!empty($message)) {
                 $added->message($message);
             }
-        }, (array) $rules);
+        }, (array)$rules);
     }
 
     /**

tests/Valitron/StopOnFirstFailTest.php

@@ -0,0 +1,28 @@
+<?php
+use Valitron\Validator;
+
+
+class StopOnFirstFail extends BaseTestCase {
+
+	public function testStopOnFirstFail() {
+		$rules = array(
+			'myField1' => array(
+				array('lengthMin', 5, 'message'=>'myField1 must be 5 characters minimum'),
+				array('url', 'message' => 'myField1 is not a valid url'),
+				array('urlActive', 'message' => 'myField1 is not an active url')
+			)
+		);
+
+		$v = new Validator(array(
+			'myField1' => 'myVal'
+		));
+
+		$v->mapFieldsRules($rules);
+		$v->stopOnFirstFail(true);
+		$this->assertFalse($v->validate());
+
+		$errors = $v->errors();
+		$this->assertCount(1, $errors['myField1']);
+	}
+
+}

tests/Valitron/ValidateTest.php

@@ -1,4 +1,5 @@
 <?php
+
 use Valitron\Validator;
 
 class ValidateTest extends BaseTestCase
@@ -15,12 +16,13 @@ class ValidateTest extends BaseTestCase
         $this->assertEquals($v->data(), array('foo' => 'bar'));
     }
 
-    public function testAccurateErrorCount()
+    public function testAccurateErrorShouldReturnFalse()
     {
         $v = new Validator(array('name' => 'Chester Tester'));
         $v->rule('required', 'name');
-        $this->assertSame(1, count($v->errors('name')));
+        $this->assertFalse($v->errors('name'));
     }
+
     public function testArrayOfFieldsToValidate()
     {
         $v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.com'));
@@ -158,7 +160,8 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
-    public function testAcceptedNotSet(){
+    public function testAcceptedNotSet()
+    {
         $v = new Validator();
         $v->rule('accepted', 'agree');
         $this->assertFalse($v->validate());
@@ -189,7 +192,8 @@ class ValidateTest extends BaseTestCase
         $this->assertTrue($v->validate());
     }
 
-    public function testIntegerStrict(){
+    public function testIntegerStrict()
+    {
 
         $v = new Validator(array('num' => ' 41243'));
         $v->rule('integer', 'num');
@@ -203,11 +207,37 @@ class ValidateTest extends BaseTestCase
         $v->rule('integer', 'num');
         $this->assertTrue($v->validate());
 
-
         $v = new Validator(array('num' => '+41243'));
         $v->rule('integer', 'num', true);
         $this->assertFalse($v->validate());
 
+        $v = new Validator(array('num' => '-1'));
+        $v->rule('integer', 'num', true);
+        $this->assertTrue($v->validate());
+
+        $v = new Validator(array('num' => '-0'));
+        $v->rule('integer', 'num', true);
+        $this->assertFalse($v->validate());
+
+        $v = new Validator(array('num' => '0'));
+        $v->rule('integer', 'num', true);
+        $this->assertTrue($v->validate());
+
+        $v = new Validator(array('num' => '+0'));
+        $v->rule('integer', 'num', true);
+        $this->assertFalse($v->validate());
+
+        $v = new Validator(array('num' => '+1'));
+        $v->rule('integer', 'num', true);
+        $this->assertFalse($v->validate());
+
+        $v = new Validator(array('num' => '0123'));
+        $v->rule('integer', 'num', true);
+        $this->assertFalse($v->validate());
+
+        $v = new Validator(array('num' => '-0123'));
+        $v->rule('integer', 'num', true);
+        $this->assertFalse($v->validate());
     }
 
     public function testIntegerInvalid()
@@ -216,7 +246,6 @@ class ValidateTest extends BaseTestCase
         $v->rule('integer', 'num');
         $this->assertFalse($v->validate());
 
-
         $v = new Validator(array('num' => '--1231'));
         $v->rule('integer', 'num');
         $this->assertFalse($v->validate());
@@ -592,6 +621,20 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
+    public function testAsciiValid()
+    {
+        $v = new Validator(array('text' => '12345 abcde'));
+        $v->rule('ascii', 'text');
+        $this->assertTrue($v->validate());
+    }
+
+    public function testAsciiInvalid()
+    {
+        $v = new Validator(array('text' => '12345 abcdé'));
+        $v->rule('ascii', 'text');
+        $this->assertFalse($v->validate());
+    }
+
     public function testIpValid()
     {
         $v = new Validator(array('ip' => '127.0.0.1'));
@@ -606,6 +649,34 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
+    public function testIpv4Valid()
+    {
+        $v = new Validator(array('ip' => '127.0.0.1'));
+        $v->rule('ipv4', 'ip');
+        $this->assertTrue($v->validate());
+    }
+
+    public function testIpv4Invalid()
+    {
+        $v = new Validator(array('ip' => 'FE80::0202:B3FF:FE1E:8329'));
+        $v->rule('ipv4', 'ip');
+        $this->assertFalse($v->validate());
+    }
+
+    public function testIpv6Valid()
+    {
+        $v = new Validator(array('ip' => 'FE80::0202:B3FF:FE1E:8329'));
+        $v->rule('ipv6', 'ip');
+        $this->assertTrue($v->validate());
+    }
+
+    public function testIpv6Invalid()
+    {
+        $v = new Validator(array('ip' => '127.0.0.1'));
+        $v->rule('ipv6', 'ip');
+        $this->assertFalse($v->validate());
+    }
+
     public function testEmailValid()
     {
         $v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.com'));
@@ -620,13 +691,15 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
-    public function testEmailDnsValid(){
+    public function testEmailDnsValid()
+    {
         $v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.com'));
         $v->rule('emailDNS', 'email');
         $this->assertTrue($v->validate());
     }
 
-    public function testEmailDnsInvalid(){
+    public function testEmailDnsInvalid()
+    {
         $v = new Validator(array('name' => 'Chester Tester', 'email' => 'chester@tester.zyx'));
         $v->rule('emailDNS', 'email');
         $this->assertFalse($v->validate());
@@ -1059,11 +1132,12 @@ class ValidateTest extends BaseTestCase
         $this->assertEquals($v1->errors(), $v2->errors());
     }
 
-    public function testMalformedBulkRules(){
+    public function testMalformedBulkRules()
+    {
         $v = new Validator();
         $v->rules(
             array(
-            'required'=>array('foo', 'bar')
+                'required' => array('foo', 'bar')
             )
         );
 
@@ -1117,7 +1191,9 @@ class ValidateTest extends BaseTestCase
     public function testAddRuleClosure()
     {
         $v = new Validator(array('name' => 'Chester Tester'));
-        $v->addRule('testRule', function() { return true; });
+        $v->addRule('testRule', function () {
+            return true;
+        });
         $v->rule('testRule', 'name');
         $this->assertTrue($v->validate());
     }
@@ -1125,7 +1201,9 @@ class ValidateTest extends BaseTestCase
     public function testAddRuleClosureReturnsFalse()
     {
         $v = new Validator(array('name' => 'Chester Tester'));
-        $v->addRule('testRule', function() { return false; });
+        $v->addRule('testRule', function () {
+            return false;
+        });
         $v->rule('testRule', 'name');
         $this->assertFalse($v->validate());
     }
@@ -1133,7 +1211,9 @@ class ValidateTest extends BaseTestCase
     public function testAddRuleClosureWithFieldArray()
     {
         $v = new Validator(array('name' => 'Chester Tester', 'email' => 'foo@example.com'));
-        $v->addRule('testRule', function() { return true; });
+        $v->addRule('testRule', function () {
+            return true;
+        });
         $v->rule('testRule', array('name', 'email'));
         $this->assertTrue($v->validate());
     }
@@ -1141,7 +1221,9 @@ class ValidateTest extends BaseTestCase
     public function testAddRuleClosureWithArrayAsExtraParameter()
     {
         $v = new Validator(array('name' => 'Chester Tester'));
-        $v->addRule('testRule', function() { return true; });
+        $v->addRule('testRule', function () {
+            return true;
+        });
         $v->rule('testRule', 'name', array('foo', 'bar'));
         $this->assertTrue($v->validate());
     }
@@ -1154,8 +1236,16 @@ class ValidateTest extends BaseTestCase
         $this->assertTrue($v->validate());
     }
 
-    public function sampleObjectCallback() { return true; }
+    public function sampleObjectCallback()
-    public function sampleObjectCallbackFalse() { return false; }
+    {
+        return true;
+    }
+
+    public function sampleObjectCallbackFalse()
+    {
+        return false;
+    }
+
     public function testAddRuleCallbackArray()
     {
         $v = new Validator(array('name' => 'Chester Tester'));
@@ -1226,7 +1316,7 @@ class ValidateTest extends BaseTestCase
         $discover = array(6011712400392605, 6011536340491809, 6011785775263015, 6011984124619056, 6011320958064251);
 
         foreach (compact('visa', 'mastercard', 'amex', 'dinersclub', 'discover') as $type => $numbers) {
-            foreach($numbers as $number) {
+            foreach ($numbers as $number) {
                 $v = new Validator(array('test' => $number));
                 $v->rule('creditCard', 'test');
                 $this->assertTrue($v->validate());
@@ -1250,7 +1340,7 @@ class ValidateTest extends BaseTestCase
         $discover = array(5011712400392605, 5011536340491809, 5011785775263015, 5011984124619056, 5011320958064251);
 
         foreach (compact('visa', 'mastercard', 'amex', 'dinersclub', 'discover') as $type => $numbers) {
-            foreach($numbers as $number) {
+            foreach ($numbers as $number) {
                 $v = new Validator(array('test' => $number));
                 $v->rule('creditCard', 'test');
                 $this->assertFalse($v->validate());
@@ -1522,6 +1612,38 @@ class ValidateTest extends BaseTestCase
         $this->assertFalse($v->validate());
     }
 
+    /**
+     * @see https://github.com/vlucas/valitron/issues/262
+     */
+    public function testOptionalArrayPartsAreIgnored()
+    {
+        $v = new Validator(array(
+                'data' => array(
+                    array('foo' => '2018-01-01'),
+                    array('bar' => 1)
+                )
+            )
+        );
+        $v->rule('date', 'data.*.foo');
+        $this->assertTrue($v->validate());
+    }
+
+    /**
+     * @see https://github.com/vlucas/valitron/issues/262
+     */
+    public function testRequiredArrayPartsAreNotIgnored()
+    {
+        $v = new Validator(array(
+                'data' => array(
+                    array('foo' => '2018-01-01'),
+                    array('bar' => 1)
+                )
+            )
+        );
+        $v->rule('required', 'data.*.foo');
+        $v->rule('date', 'data.*.foo');
+        $this->assertFalse($v->validate());
+    }
 }
 
 function sampleFunctionCallback($field, $value, array $params)