Updated for laravel 5.5

Author: tylercd100

README.md

@@ -1,39 +1,50 @@
-# Validate phone numbers with Laravel 5
-[![Latest Version](https://img.shields.io/github/release/laravel-validation-rules/us-phone.svg?style=flat-square)](https://github.com/laravel-validation-rules/us-phone/releases)
-[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://travis-ci.org/laravel-validation-rules/us-phone.svg?branch=master)](https://travis-ci.org/laravel-validation-rules/us-phone)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone/?branch=master)
-[![Code Coverage](https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone/?branch=master)
-[![Total Downloads](https://img.shields.io/packagist/dt/laravel-validation-rules/us-phone.svg?style=flat-square)](https://packagist.org/packages/laravel-validation-rules/us-phone)
-
-This package only checks phone number formatting and not actual number validity.
+# Phone
+
+Validates phone number format.
+
+<p >
+  <a href="https://travis-ci.org/laravel-validation-rules/us-phone">
+    <img src="https://img.shields.io/travis/laravel-validation-rules/us-phone.svg?style=flat-square">
+  </a>
+  <a href="https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone/code-structure/master/code-coverage">
+    <img src="https://img.shields.io/scrutinizer/coverage/g/laravel-validation-rules/us-phone.svg?style=flat-square">
+  </a>
+  <a href="https://scrutinizer-ci.com/g/laravel-validation-rules/us-phone">
+    <img src="https://img.shields.io/scrutinizer/g/laravel-validation-rules/us-phone.svg?style=flat-square">
+  </a>
+  <a href="https://github.com/laravel-validation-rules/us-phone/blob/master/LICENSE">
+    <img src="https://img.shields.io/github/license/laravel-validation-rules/us-phone.svg?style=flat-square">
+  </a>
+  <a href="https://twitter.com/clarkeash">
+    <img src="http://img.shields.io/badge/[email protected]?style=flat-square">
+  </a>
+</p>
 
 ## Installation
 
-Install via [composer](https://getcomposer.org/) - In the terminal:
 ```bash
 composer require laravel-validation-rules/us-phone
 ```
 
-Now add the following to the `providers` array in your `config/app.php`
-```php
-LVR\Phone\ServiceProvider::class
-```
-
 ## Usage
 
 ```php
+use LVR\Phone\Phone;
+use LVR\Phone\E164;
+use LVR\Phone\NANP;
+use LVR\Phone\Digits;
+
 // Test any phone number
-Validator::make(['test' => '15556667777'], ['test' => 'phone']); //true
-Validator::make(['test' => '+15556667777'], ['test' => 'phone']); //true
-Validator::make(['test' => '+1 (555) 666-7777'], ['test' => 'phone']); //true
+$request->validate(['test' => '15556667777'], new Phone); //true
+$request->validate(['test' => '+15556667777'], new Phone); //true
+$request->validate(['test' => '+1 (555) 666-7777'], new Phone); //true
 
 // Test for E164
-Validator::make(['test' => '+15556667777'], ['test' => 'phone:E164']); //true
+$request->validate(['test' => '+15556667777'], ['test' => new E164]); //true
 
 // Test for NANP (North American Numbering Plan)
-Validator::make(['test' => '+1 (555) 666-7777'], ['test' => 'phone:NANP']); //true
+$request->validate(['test' => '+1 (555) 666-7777'], ['test' => new NANP); //true
 
 // Test for digits only
-Validator::make(['test' => '15556667777'], ['test' => 'phone:digits']); //true
+$request->validate(['test' => '15556667777'], ['test' => new Digits]); //true
 ```

composer.json

@@ -27,12 +27,12 @@
     },
     "minimum-stability": "stable",  
     "require": {
-        "illuminate/validation": "^5.0",
-        "illuminate/support": "^5.0",
-        "php": "^5.5.9|^7.0"
+        "illuminate/validation": "^5.5",
+        "illuminate/support": "^5.5",
+        "php": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.0",
+        "phpunit/phpunit": "^6.0",
         "orchestra/testbench": "^3.2"
     },
     "suggest": {

src/Digits.php

@@ -0,0 +1,30 @@
+<?php
+namespace LVR\Phone;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class Digits extends Phone
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *s
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->isDigits($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return ':attribute must be in digits only phone format';
+    }
+}

src/E164.php

@@ -0,0 +1,30 @@
+<?php
+namespace LVR\Phone;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class E164 extends Phone
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->isE164($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return ':attribute must be in E.164 phone format';
+    }
+}

src/NANP.php

@@ -0,0 +1,30 @@
+<?php
+namespace LVR\Phone;
+
+use Illuminate\Contracts\Validation\Rule;
+
+class NANP extends Phone
+{
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *s
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->isNANP($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
+    {
+        return ':attribute must be in the NANP phone format';
+    }
+}

src/Validator.php renamed to src/Phone.php

@@ -1,12 +1,31 @@
 <?php
-
 namespace LVR\Phone;
 
-class Validator
+use Illuminate\Contracts\Validation\Rule;
+
+class Phone implements Rule
 {
-    public function __call($a, $b)
+    /**
+     * Determine if the validation rule passes.
+     *
+     * @param  string $attribute
+     * @param  mixed  $value
+     *
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->isPhone($value);
+    }
+
+    /**
+     * Get the validation error message.
+     *
+     * @return string
+     */
+    public function message()
     {
-        return empty($b[0]) || $this->{$a}($b[0]);
+        return 'Incorrect phone format for :attribute.';
     }
 
     /**
@@ -61,4 +80,4 @@ protected function isNANP($value)
         $conditions[] = preg_match("/^(?:\+1|1)?\s?-?\(?\d{3}\)?(\s|-)?\d{3}-\d{4}$/i", $value) > 0;
         return (bool) array_product($conditions);
     }
-}
+}

src/ServiceProvider.php

@@ -6,61 +6,5 @@
 
 class TestCase extends Orchestra
 {
-    /**
-     * Setup the test environment.
-     */
-    public function setUp()
-    {
-        parent::setUp();
-    }
 
-    public function tearDown()
-    {
-        parent::tearDown();
-    }
-
-    /**
-     * @param \Illuminate\Foundation\Application $app
-     */
-    protected function getPackageProviders($app)
-    {
-        return ['LVR\Phone\ServiceProvider'];
-    }
-
-    /**
-     * @param \Illuminate\Foundation\Application $app
-     */
-    protected function getPackageAliases($app)
-    {
-        return [];
-    }
-
-    /**
-     * Define environment setup.
-     *
-     * @param  \Illuminate\Foundation\Application  $app
-     * @return void
-     */
-    protected function getEnvironmentSetUp($app)
-    {
-
-    }
-
-    /**
-     * Call protected/private method of a class.
-     *
-     * @param object &$object    Instantiated object that we will run method on.
-     * @param string $methodName Method name to call
-     * @param array  $parameters Array of parameters to pass into method.
-     *
-     * @return mixed Method return.
-     */
-    public function invokeMethod(&$object, $methodName, array $parameters = array())
-    {
-        $reflection = new \ReflectionClass(get_class($object));
-        $method = $reflection->getMethod($methodName);
-        $method->setAccessible(true);
-
-        return $method->invokeArgs($object, $parameters);
-    }
 }