fix code style

Author: igor-chepurnoi

.php_cs

@@ -0,0 +1,23 @@
+<?php
+
+$finder = Symfony\CS\Finder::create()
+    ->exclude('vendor')
+    ->in([__DIR__]);
+
+$config = Symfony\CS\Config::create()
+    ->fixers([
+        '-phpdoc_params',
+        '-phpdoc_short_description',
+        '-phpdoc_inline_tag',
+        '-pre_increment',
+        '-heredoc_to_nowdoc',
+        '-spaces_cast',
+        '-include',
+        '-phpdoc_no_package',
+        'concat_with_spaces',
+        'ordered_use',
+        'short_array_syntax',
+    ])
+    ->finder($finder);
+
+return $config;

.travis.yml

@@ -5,14 +5,6 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
-
-# run build against hhvm but allow them to fail
-# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false
@@ -21,6 +13,7 @@ sudo: false
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
 
 install:
   - travis_retry composer self-update && composer --version
@@ -29,4 +22,5 @@ install:
   - travis_retry composer install --prefer-dist --no-interaction
 
 script:
-  - phpunit --verbose $PHPUNIT_FLAGS
+  - vendor/friendsofphp/php-cs-fixer/php-cs-fixer fix --dry-run --diff
+  - phpunit --verbose $PHPUNIT_FLAGS

ECCValidator.php

@@ -7,7 +7,6 @@
 use yii\validators\Validator;
 
 /**
- *
  * ECCValidator class
  *
  * Credit Card Validator
@@ -17,14 +16,14 @@
  *
  * References of the Mod 10 algorithm
  * http://en.wikipedia.org/wiki/Luhn_algorithm#Mod_10.2B5_Variant
- *
  */
 class ECCValidator extends Validator
 {
     /**
-     *
      * Detected Credit Card list
+     *
      * @var string
+     *
      * @link http://en.wikipedia.org/wiki/Bank_card_number#cite_note-NoMoreBankCard-4
      */
     const MAESTRO = 'Maestro';
@@ -41,7 +40,6 @@ class ECCValidator extends Validator
     const LASER = 'Laser';
     const ALL = 'All';
     /**
-     *
      * @var array holds the regex patterns to check for valid
      * Credit Card number prefixes
      */
@@ -58,29 +56,30 @@ class ECCValidator extends Validator
         self::SWITCH_CARD => '/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
         self::ELECTRON => '/^(?:417500|4026\\d{2}|4917\\d{2}|4913\\d{2}|4508\\d{2}|4844\\d{2})\\d{10}$/',
         self::LASER => '/^(?:6304|6706|6771|6709)\\d{12}(\\d{2,3})?$/',
-        self::ALL => '/^(5[1-5][0-9]{14}|4[0-9]{12}([0-9]{3})?|3[47][0-9]{13}|3(0[0-5]|[68][0-9])[0-9]{11}|(6011\d{12}|65\d{14})|(3[0-9]{4}|2131|1800)[0-9]{11}|2(?:014|149)\\d{11}|8699[0-9]{11}|(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?|(?:5020|6\\d{3})\\d{12}|56(10\\d\\d|022[1-5])\\d{10}|(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)|(?:417500|4026\\d{2}|4917\\d{2}|4913\\d{2}|4508\\d{2}|4844\\d{2})\\d{10}|(?:417500|4026\\d{2}|4917\\d{2}|4913\\d{2}|4508\\d{2}|4844\\d{2})\\d{10})$/'
+        self::ALL => '/^(5[1-5][0-9]{14}|4[0-9]{12}([0-9]{3})?|3[47][0-9]{13}|3(0[0-5]|[68][0-9])[0-9]{11}|(6011\d{12}|65\d{14})|(3[0-9]{4}|2131|1800)[0-9]{11}|2(?:014|149)\\d{11}|8699[0-9]{11}|(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?|(?:5020|6\\d{3})\\d{12}|56(10\\d\\d|022[1-5])\\d{10}|(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)|(?:417500|4026\\d{2}|4917\\d{2}|4913\\d{2}|4508\\d{2}|4844\\d{2})\\d{10}|(?:417500|4026\\d{2}|4917\\d{2}|4913\\d{2}|4508\\d{2}|4844\\d{2})\\d{10})$/',
     ];
     /**
-     *
      * @var string set with selected Credit Card type to check -ie ECCValidator::MAESTRO
      */
     public $format = self::ALL;
     /**
-     * @var boolean whether the attribute value can be null or empty. Defaults to true,
-     * meaning that if the attribute is empty, it is considered valid.
+     * @var bool whether the attribute value can be null or empty. Defaults to true,
+     * meaning that if the attribute is empty, it is considered valid
      */
     public $allowEmpty = true;
 
     /**
      * Validate attribute
+     *
      * @see Validator::validateAttribute()
+     *
      * @param \yii\base\Model $object
      * @param string $attribute
+     *
      * @throws Exception
      */
     public function validateAttribute($object, $attribute)
     {
-
         $value = $object->$attribute;
         if ($this->allowEmpty && $this->isEmpty($value)) {
             return;
@@ -92,51 +91,52 @@ public function validateAttribute($object, $attribute)
     }
 
     /**
-     *
      * Validates a Credit Card number
      *
      * @param string $creditCardNumber
      *
      * @throws \yii\base\Exception
+     *
      * @return bool
      * @return bool
      */
     public function validateNumber($creditCardNumber)
     {
-
-        if (!$this->checkType())
+        if (!$this->checkType()) {
             throw new Exception(Yii::t('ECCValidator', 'The "format" property must be specified with a supported Credit Card format.'));
+        }
 
         $creditCardNumber = preg_replace('/[ -]+/', '', $creditCardNumber);
 
         return $this->checkFormat($creditCardNumber) && $this->mod10($creditCardNumber);
     }
 
     /**
-     *
      * Validates a Credit Card date
      *
-     * @param integer $creditCardExpiredMonth
-     * @param integer $creditCardExpiredYear
+     * @param int $creditCardExpiredMonth
+     * @param int $creditCardExpiredYear
      *
      * @return bool
      */
     public function validateDate($creditCardExpiredMonth, $creditCardExpiredYear)
     {
-
         $currentYear = intval(date('Y'));
         $currentMonth = intval(date('m'));
 
-        if (is_scalar($creditCardExpiredMonth)) $creditCardExpiredMonth = intval($creditCardExpiredMonth);
-        if (is_scalar($creditCardExpiredYear)) $creditCardExpiredYear = intval($creditCardExpiredYear);
+        if (is_scalar($creditCardExpiredMonth)) {
+            $creditCardExpiredMonth = intval($creditCardExpiredMonth);
+        }
+        if (is_scalar($creditCardExpiredYear)) {
+            $creditCardExpiredYear = intval($creditCardExpiredYear);
+        }
 
         return is_integer($creditCardExpiredMonth) && is_integer($creditCardExpiredYear) && $creditCardExpiredMonth <= 12
         && ($creditCardExpiredMonth >= 1 && $creditCardExpiredYear > $currentYear
             && $creditCardExpiredYear < $currentYear + 21) || ($creditCardExpiredYear == $currentYear && $creditCardExpiredMonth >= $currentMonth);
     }
 
     /**
-     *
      * Validates Credit Card holder
      *
      * @param string $creditCardHolder
@@ -145,31 +145,29 @@ public function validateDate($creditCardExpiredMonth, $creditCardExpiredYear)
      */
     public function validateName($creditCardHolder)
     {
-
         return !empty($creditCardHolder) && preg_match('/^[A-Z ]+$/i', $creditCardHolder);
     }
 
     /**
-     *
      * Validates holder, number, and dates of Credit Card numbers
      *
      * @param string $creditCardHolder
      * @param string $creditCardNumber
-     * @param integer $creditCardExpiredMonth
-     * @param integer $creditCardExpiredYear
+     * @param int $creditCardExpiredMonth
+     * @param int $creditCardExpiredYear
      *
      * @return bool
      */
     public function validateAll($creditCardHolder, $creditCardNumber, $creditCardExpiredMonth, $creditCardExpiredYear)
     {
-
         return $this->validateName($creditCardHolder) && $this->validateNumber($creditCardNumber) && $this->validateDate($creditCardExpiredMonth, $creditCardExpiredYear);
-
     }
 
     /**
      * Checks Credit Card Prefixes
+     *
      * @param $cardNumber
+     *
      * @return bool
      */
     protected function checkFormat($cardNumber)
@@ -179,8 +177,11 @@ protected function checkFormat($cardNumber)
 
     /**
      * Check credit card number by Mod 10 algorithm
+     *
      * @param $cardNumber
+     *
      * @return bool
+     *
      * @see http://en.wikipedia.org/wiki/Luhn_algorithm#Mod_10.2B5_Variant
      */
     protected function mod10($cardNumber)
@@ -199,34 +200,35 @@ protected function mod10($cardNumber)
             }
             $numSum += $currentNum;
         }
-        return ($numSum % 10 == 0);
+
+        return $numSum % 10 == 0;
     }
 
     /**
-     *
      * Checks if Credit Card Format is a supported one
      * and builds new pattern format in case user has
      * a mixed match search (mastercard|visa)
      *
-     * @access private
-     * @return boolean
+     * @return bool
      */
     protected function checkType()
     {
-
         if (is_scalar($this->format)) {
             return array_key_exists($this->format, $this->patterns);
-        } else if (is_array($this->format)) {
-            $pattern = array();
+        } elseif (is_array($this->format)) {
+            $pattern = [];
             foreach ($this->format as $f) {
-                if (!array_key_exists($f, $this->patterns)) return false;
+                if (!array_key_exists($f, $this->patterns)) {
+                    return false;
+                }
                 $pattern[] = substr($this->patterns[$f], 2, strlen($this->patterns[$f]) - 4);
             }
             $this->format = 'custom';
-            $this->patterns[$this->format] = '/^(' . join('|', $pattern) . ')$/';
+            $this->patterns[$this->format] = '/^(' . implode('|', $pattern) . ')$/';
+
             return true;
         }
-        return false;
 
+        return false;
     }
 }

PhoneValidator.php

@@ -2,11 +2,11 @@
 
 namespace yii2mod\validators;
 
+use libphonenumber\NumberParseException;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil;
 use Yii;
 use yii\validators\Validator;
-use libphonenumber\PhoneNumberUtil;
-use libphonenumber\PhoneNumberFormat;
-use libphonenumber\NumberParseException;
 
 /**
  * Phone validator class that validates phone numbers for given
@@ -16,23 +16,23 @@
 class PhoneValidator extends Validator
 {
     /**
-     * @var bool $strict If country is not set or selected adds error
+     * @var bool If country is not set or selected adds error
      */
     public $strict = true;
     /**
-     * @var string $country The country is fixed
+     * @var string The country is fixed
      */
     public $country;
     /**
-     * @var string $countryAttribute The country attribute of model
+     * @var string The country attribute of model
      */
     public $countryAttribute;
     /**
-     * @var string $countryCodeAttribute
+     * @var string
      */
     public $countryCodeAttribute;
     /**
-     * @var bool $format If phone number is valid formats value with international phone number
+     * @var bool If phone number is valid formats value with international phone number
      */
     public $format = true;
     /**
@@ -50,8 +50,10 @@ class PhoneValidator extends Validator
 
     /**
      * Validate attribute
+     *
      * @param \yii\base\Model $model
      * @param string $attribute
+     *
      * @return bool|void
      */
     public function validateAttribute($model, $attribute)
@@ -67,6 +69,7 @@ public function validateAttribute($model, $attribute)
         // if empty country and used strict mode
         if (empty($country) && $this->strict) {
             $this->addError($model, $attribute, Yii::t('app', $this->strictModeMessage));
+
             return false;
         }
         if (empty($country)) {
@@ -79,12 +82,13 @@ public function validateAttribute($model, $attribute)
                 if ($this->format) {
                     $model->$attribute = $phoneUtil->format($numberProto, PhoneNumberFormat::INTERNATIONAL);
                 }
+
                 return true;
             } else {
                 $this->addError($model, $attribute, Yii::t('app', $this->message));
+
                 return false;
             }
-
         } catch (NumberParseException $e) {
             $this->addError($model, $attribute, Yii::t('app', $this->numberParseExceptionMessage));
         }

composer.json

@@ -1,8 +1,13 @@
 {
     "name": "yii2mod/yii2-validators",
-    "description": "Yii2 validators",
+    "description": "Collection of useful validators for Yii Framework 2.0",
     "type": "yii2-extension",
-    "keywords": ["yii2", "extension"],
+    "keywords": [
+        "yii2",
+        "yii2 validators",
+        "yii2 card validator",
+        "yii2 phone validator"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -18,6 +23,9 @@
         "yiisoft/yii2": "*",
         "giggsey/libphonenumber-for-php": "~7.0"
     },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "~1.7"
+    },
     "autoload": {
         "psr-4": {
             "yii2mod\\validators\\": ""