@@ -20,11 +20,13 @@ |
||
20 | 20 | */ |
21 | 21 | public static function format($phone) |
22 | 22 | { |
23 | - if (preg_match('/^(\d{1})(\d{3})(\d{3})(\d{2})(\d{2})$/', $phone, $matches)) |
|
24 | - return "+" . $matches[1] . ' (' . $matches[2] . ') ' . $matches[3] . "-" . $matches[4] . '-' . $matches[5]; |
|
23 | + if (preg_match('/^(\d{1})(\d{3})(\d{3})(\d{2})(\d{2})$/', $phone, $matches)) { |
|
24 | + return "+" . $matches[1] . ' (' . $matches[2] . ') ' . $matches[3] . "-" . $matches[4] . '-' . $matches[5]; |
|
25 | + } |
|
25 | 26 | |
26 | - if (preg_match('/^(\d{2})(\d{3})(\d{3})(\d{2})(\d{2})$/', $phone, $matches)) |
|
27 | - return "+" . $matches[1] . ' (' . $matches[2] . ') ' . $matches[3] . "-" . $matches[4] . '-' . $matches[5]; |
|
27 | + if (preg_match('/^(\d{2})(\d{3})(\d{3})(\d{2})(\d{2})$/', $phone, $matches)) { |
|
28 | + return "+" . $matches[1] . ' (' . $matches[2] . ') ' . $matches[3] . "-" . $matches[4] . '-' . $matches[5]; |
|
29 | + } |
|
28 | 30 | |
29 | 31 | return $phone; |
30 | 32 | } |
@@ -45,14 +45,17 @@ |
||
45 | 45 | */ |
46 | 46 | protected function validateValue($value) |
47 | 47 | { |
48 | - if (is_array($value) || is_object($value)) |
|
49 | - return [Yii::t('yii', '{attribute} is invalid.'), []]; |
|
48 | + if (is_array($value) || is_object($value)) { |
|
49 | + return [Yii::t('yii', '{attribute} is invalid.'), []]; |
|
50 | + } |
|
50 | 51 | |
51 | - if (!is_numeric($value)) |
|
52 | - return ["Телефонный номер должен содержать только цифры.", []]; |
|
52 | + if (!is_numeric($value)) { |
|
53 | + return ["Телефонный номер должен содержать только цифры.", []]; |
|
54 | + } |
|
53 | 55 | |
54 | - if ((strlen(strval($value)) > 12) || (strlen(strval($value)) < 11)) |
|
55 | - return ["Телефонный номер должны быть длиною 11 или 12 цифр.", []]; |
|
56 | + if ((strlen(strval($value)) > 12) || (strlen(strval($value)) < 11)) { |
|
57 | + return ["Телефонный номер должны быть длиною 11 или 12 цифр.", []]; |
|
58 | + } |
|
56 | 59 | } |
57 | 60 | |
58 | 61 | /** |