Merge pull request #12 from RichWeber/master

Added validation of countries (by @RichWeber)
Borales · Jun 5, 2016 · 1f4eeb6 · 1f4eeb6
2 parents 2a578a2 + 722faf1
commit 1f4eeb6
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.0.5 (June 05, 2016)
+
+- Added validation of countries (thanks to @RichWeber)
+
 ## 0.0.4 (April 12, 2016)
 
 - Namespace fix (thanks to @sample-game)

diff --git a/README.md b/README.md
@@ -2,8 +2,8 @@ Yii2 International telephone numbers - Asset Bundle, Behavior, Validator, Widget
 ================================================================================
 
 [![Latest Stable Version](https://poser.pugx.org/borales/yii2-phone-input/v/stable.svg)](https://packagist.org/packages/borales/yii2-phone-input)
-[![Total Downloads](https://poser.pugx.org/borales/yii2-phone-input/downloads.svg)](https://packagist.org/packages/borales/yii2-phone-input) 
-[![Latest Unstable Version](https://poser.pugx.org/borales/yii2-phone-input/v/unstable.svg)](https://packagist.org/packages/borales/yii2-phone-input) 
+[![Total Downloads](https://poser.pugx.org/borales/yii2-phone-input/downloads.svg)](https://packagist.org/packages/borales/yii2-phone-input)
+[![Latest Unstable Version](https://poser.pugx.org/borales/yii2-phone-input/v/unstable.svg)](https://packagist.org/packages/borales/yii2-phone-input)
 [![License](https://poser.pugx.org/borales/yii2-phone-input/license.svg)](https://packagist.org/packages/borales/yii2-phone-input)
 
 This extension uses 2 libraries:
@@ -82,6 +82,28 @@ class Company extends Model
 }
 ```
 
+or if you need to validate phones of some countries:
+
+```php
+namespace frontend\models;
+
+use borales\extensions\phoneInput\PhoneInputValidator;
+
+class Company extends Model
+{
+    public $phone;
+
+    public function rules()
+    {
+        return [
+            [['phone'], 'string'],
+            // [['phone'], PhoneInputValidator::className(), 'region' => 'UA'],
+            [['phone'], PhoneInputValidator::className(), 'region' => ['PL', 'UA']],
+        ];
+    }
+}
+```
+
 Using phone behavior in a model (auto-formats phone string to the required phone format):
 
 ```php

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "borales/yii2-phone-input",
-    "version": "0.0.4",
+    "version": "0.0.5",
     "description": "Yii2 International telephone numbers - Asset Bundle, Behavior, Validator, Widget",
     "keywords": [
         "yii2",

diff --git a/src/PhoneInputValidator.php b/src/PhoneInputValidator.php
@@ -14,6 +14,14 @@
  */
 class PhoneInputValidator extends Validator
 {
+    /**
+     * @var mixed
+     */
+    public $region;
+
+    /**
+     * @inheritdoc
+     */
     public function init()
     {
         if (!$this->message) {
@@ -32,14 +40,31 @@ protected function validateValue($value)
         $phoneUtil = PhoneNumberUtil::getInstance();
         try {
             $phoneProto = $phoneUtil->parse($value, null);
-            if ($phoneUtil->isValidNumber($phoneProto)) {
-                $valid = true;
+
+            if ($this->region !== null) {
+                if (is_array($this->region)) {
+                    foreach ($this->region as $region) {
+                        if ($phoneUtil->isValidNumberForRegion($phoneProto, $region)) {
+                            $valid = true;
+                            break;
+                        }
+                    }
+                } else {
+                    if ($phoneUtil->isValidNumberForRegion($phoneProto, $this->region)) {
+                        $valid = true;
+                    }
+                }
+            } else {
+                if ($phoneUtil->isValidNumber($phoneProto)) {
+                    $valid = true;
+                }
             }
+
         } catch (NumberParseException $e) {
         }
         return $valid ? null : [$this->message, []];
     }
-    
+
     /**
      * @inheritdoc
      */