Release version 1.0.2

Author: vuongxuongminh

.styleci.yml

@@ -1,4 +1,4 @@
-preset: recommended
+preset: laravel
 
 disabled:
   - single_class_element_per_statement

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Tất cả lịch sử tiến trình phát triển thư viện
 
+# 1.0.2
+
+- Sữa các câu báo lỗi trong các exception ở mode negative.
+
 # 1.0.1
 
 - Hổ trợ kiểm tra version ip và báo lỗi nếu không hợp lệ.

src/Exceptions/IdVNException.php

@@ -12,7 +12,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IdVNException extends ValidationException
@@ -22,7 +21,7 @@ class IdVNException extends ValidationException
             self::STANDARD => '{{name}} must be a valid Viet Nam id number',
         ],
         self::MODE_NEGATIVE => [
-            self::STANDARD => '{{name}} must be a valid Viet Nam id number',
+            self::STANDARD => '{{name}} must not be a valid Viet Nam id number',
         ],
     ];
 }

src/Exceptions/IpVNException.php

@@ -12,7 +12,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IpVNException extends ValidationException
@@ -24,11 +23,11 @@ class IpVNException extends ValidationException
     public static $defaultTemplates = [
         self::MODE_DEFAULT => [
             self::STANDARD => '{{name}} must be an IP address of Viet Nam',
-            self::VERSION  => '{{name}} must be an IP address version {{version}} of Viet Nam',
+            self::VERSION  => '{{name}} must not be an IP address version {{version}} of Viet Nam',
         ],
         self::MODE_NEGATIVE => [
             self::STANDARD => '{{name}} must be an IP address of Viet Nam',
-            self::VERSION  => '{{name}} must be an IP address version {{version}} of Viet Nam',
+            self::VERSION  => '{{name}} must not be an IP address version {{version}} of Viet Nam',
         ],
     ];
 

src/Exceptions/LandLineVNException.php

@@ -12,7 +12,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class LandLineVNException extends ValidationException
@@ -22,7 +21,7 @@ class LandLineVNException extends ValidationException
             self::STANDARD => '{{name}} must be a valid Viet Nam land line phone number',
         ],
         self::MODE_NEGATIVE => [
-            self::STANDARD => '{{name}} must be a valid Viet Nam land line phone number',
+            self::STANDARD => '{{name}} must not be a valid Viet Nam land line phone number',
         ],
     ];
 }

src/Exceptions/MobileVNException.php

@@ -12,7 +12,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class MobileVNException extends ValidationException
@@ -22,7 +21,7 @@ class MobileVNException extends ValidationException
             self::STANDARD => '{{name}} must be a valid Viet Nam mobile phone number',
         ],
         self::MODE_NEGATIVE => [
-            self::STANDARD => '{{name}} must be a valid Viet Nam mobile phone number',
+            self::STANDARD => '{{name}} must not be a valid Viet Nam mobile phone number',
         ],
     ];
 }

src/Rules/AbstractStaticRegexRule.php

@@ -12,12 +12,11 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 abstract class AbstractStaticRegexRule extends AbstractRegexRule
 {
-    protected function getPregFormat()
+    protected function getPregFormat(): string
     {
         return static::pregFormat();
     }

src/Rules/IdVN.php

@@ -10,7 +10,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IdVN extends AbstractStaticRegexRule

src/Rules/IpVN.php

@@ -16,7 +16,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IpVN extends AbstractRule
@@ -36,7 +35,7 @@ public function __construct(?int $version = null)
         $this->version = $version;
     }
 
-    public function validate($input)
+    public function validate($input): bool
     {
         if (!$ip = IpFactory::addressFromString($input)) {
             return false;
@@ -72,9 +71,11 @@ protected function getIpRanges(string $ip, int $version): ?array
 
             return $map['range'] ?? null;
         }
+
+        return null;
     }
 
-    protected function validateIpInRange(IpInterface $ip, array $ranges)
+    protected function validateIpInRange(IpInterface $ip, array $ranges): bool
     {
         foreach ($ranges as $range) {
             [$begin, $end] = $range;
@@ -92,7 +93,7 @@ protected static function getIpV4Range(): array
         static $range = null;
 
         if (null === $range) {
-            $range = require __DIR__.'/../../resources/ip-v4-range.php';
+            $range = require __DIR__ . '/../../resources/ip-v4-range.php';
         }
 
         return $range;
@@ -103,7 +104,7 @@ protected static function getIpV6Range(): array
         static $range = null;
 
         if (null === $range) {
-            $range = require __DIR__.'/../../resources/ip-v6-range.php';
+            $range = require __DIR__ . '/../../resources/ip-v6-range.php';
         }
 
         return $range;

src/Rules/LandLineVN.php

@@ -10,7 +10,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class LandLineVN extends AbstractStaticRegexRule

src/Rules/MobileVN.php

@@ -10,7 +10,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class MobileVN extends AbstractStaticRegexRule

src/Validator.php

@@ -18,7 +18,6 @@
  * @method static Validator idVN()
  *
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class Validator extends BaseValidator

tests/Rules/IdVNTest.php

@@ -13,7 +13,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IdVNTest extends TestCase

tests/Rules/IpVNTest.php

@@ -13,7 +13,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class IpVNTest extends TestCase

tests/Rules/LandLineVNTest.php

@@ -13,7 +13,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class LandLineVNTest extends TestCase

tests/Rules/MobileVNTest.php

@@ -13,7 +13,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class MobileVNTest extends TestCase

tests/ValidatorTest.php

@@ -14,7 +14,6 @@
 
 /**
  * @author Vuong Minh <[email protected]>
- *
  * @since 1.0.0
  */
 class ValidatorTest extends TestCase