Updated test cases

Author: vuongxuongminh

resource/ip-v4-range.php

@@ -16,13 +16,27 @@
 class IpVNException extends ValidationException
 {
 
+    const STANDARD = 0;
+
+    const VERSION = 1;
+
     public static $defaultTemplates = [
         self::MODE_DEFAULT => [
-            self::STANDARD => '{{name}} must be an IP address of Viet Nam'
+            self::STANDARD => '{{name}} must be an IP address of Viet Nam',
+            self::VERSION => '{{name}} must be an IP version {{version}}'
         ],
         self::MODE_NEGATIVE => [
-            self::STANDARD => '{{name}} must be an IP address of Viet Nam'
+            self::STANDARD => '{{name}} must be an IP address of Viet Nam',
+            self::VERSION => '{{name}} must be an IP version {{version}}'
         ],
     ];
 
+    public function chooseTemplate()
+    {
+        if (null !== $this->getParam('version')) {
+            return static::VERSION;
+        } else {
+            return static::STANDARD;
+        }
+    }
 }

resource/ip-v6-range.php

@@ -20,7 +20,7 @@ public static function pregFormat(): string
         $oldId = self::idPregFormatPart(true);
         $cId = self::cIdPregFormatPart();
 
-        return '~^(' . implode(')|(', [$id, $oldId, $cId]) . ')$~';
+        return '~^((' . implode(')|(', [$id, $oldId, $cId]) . '))$~';
     }
 
     private static function idPregFormatPart(bool $old): string

src/Exceptions/IpVNException.php

@@ -18,6 +18,16 @@
  */
 class IpVN extends AbstractRule
 {
+    const IPV4 = IpType::T_IPv4;
+
+    const IPV6 = IpType::T_IPv6;
+
+    public $version;
+
+    public function __construct($version = null)
+    {
+        $this->version = $version;
+    }
 
     public function validate($input)
     {
@@ -26,17 +36,22 @@ public function validate($input)
             return false;
         }
 
-        if (!$ranges = $this->getIpRanges($input, $ip->getAddressType())) {
+        if (($version = $ip->getAddressType()) !== $this->version && null !== $this->version) {
+
+            return false;
+        }
+
+        if (!$ranges = $this->getIpRanges($input, $version)) {
 
             return false;
         }
 
         return $this->validateIpInRange($ip, $ranges);
     }
 
-    protected function getIpRanges(string $ip, int $type): ?array
+    protected function getIpRanges(string $ip, int $version): ?array
     {
-        if ($type === IpType::T_IPv4) {
+        if (self::IPV4 === $version) {
             $keys = explode('.', $ip);
             $map = static::getIpV4Range();
         } else {
@@ -78,9 +93,9 @@ protected function validateIpInRange(IpInterface $ip, array $ranges)
 
     protected static function getIpV4Range(): array
     {
-        static $range = [];
+        static $range = null;
 
-        if ($range === null) {
+        if (null === $range) {
             $range = require(__DIR__ . '/../../resource/ip-v4-range.php');
         }
 
@@ -89,9 +104,9 @@ protected static function getIpV4Range(): array
 
     protected static function getIpV6Range(): array
     {
-        static $range = [];
+        static $range = null;
 
-        if ($range === null) {
+        if (null === $range) {
             $range = require(__DIR__ . '/../../resource/ip-v6-range.php');
         }
 

src/Rules/IdVN.php

@@ -0,0 +1,103 @@
+<?php
+/**
+ * @link https://github.com/phpviet/validation
+ * @copyright (c) PHP Viet
+ * @license [MIT](https://opensource.org/licenses/MIT)
+ */
+
+namespace PHPViet\Validation\Tests\Rules;
+
+use PHPUnit\Framework\TestCase;
+use PHPViet\Validation\Rules\IdVN;
+
+/**
+ * @author Vuong Minh <vuongxuongminh@gmail.com>
+ * @since 1.0.0
+ */
+class IdVNTest extends TestCase
+{
+    /**
+     * @var IdVN
+     */
+    protected $validator;
+
+    protected function setUp()
+    {
+        $this->validator = new IdVN;
+    }
+
+    /**
+     * @dataProvider providerValid
+     */
+    public function testValidShouldReturnTrue($input)
+    {
+        $this->assertTrue($this->validator->__invoke($input));
+        $this->assertTrue($this->validator->assert($input));
+        $this->assertTrue($this->validator->check($input));
+    }
+
+    /**
+     * @dataProvider providerInvalid
+     */
+    public function testInvalidShouldThrowException($input)
+    {
+        $this->expectException('\PHPViet\Validation\Exceptions\IdVNException');
+        $this->assertFalse($this->validator->__invoke($input));
+        $this->assertFalse($this->validator->assert($input));
+    }
+
+    public function providerValid()
+    {
+        return [
+            ['006487975'],
+            ['116487952'],
+            ['290649784'],
+            ['356497220'],
+            ['090649752'],
+            ['231649700'],
+            ['245697911'],
+            ['285649733'],
+            ['006448799975'],
+            ['116448722952'],
+            ['290646975584'],
+            ['356499722047'],
+            ['090764975265'],
+            ['231864970011'],
+            ['245069791197'],
+            ['285264973388'],
+            ['086497542199'],
+            ['106497006444'],
+            ['223131316790'],
+            ['316498797104'],
+            ['499797976410'],
+            ['526499998877'],
+            ['649879870111'],
+            ['776464646777'],
+            ['866646777797'],
+            ['964646497971']
+        ];
+    }
+
+    public function providerInvalid()
+    {
+        return [
+            ['0064 87975'],
+            ['11648!7952'],
+            ['2906a49784'],
+            ['35649f7220'],
+            ['a231649700'],
+            [' 245697911'],
+            ['@285649733'],
+            ['0964487975'],
+            ['3964997220'],
+            ['0967649752'],
+            ['2470697911'],
+            ['096497542199'],
+            ['439797976410'],
+            ['596499998877'],
+            ['699879870111'],
+            ['856646777797'],
+            ['994646497971']
+        ];
+    }
+}