php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 14:29:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into 313-Inflector-Helper

Browse Source 
* upstream:
  Fixes #312. Additional docs on IDN in EmailValidator and UrlValidator.
This commit is contained in:
Antonio Ramirez
2013-05-22 10:59:41 +02:00
parent 05523640f2 a954312a18
commit 6316c4242c
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/validators/EmailValidator.php
View File

@@ -8,6 +8,7 @@
namespace yii\validators; namespace yii\validators;
use Yii; use Yii;
use yii\base\InvalidConfigException;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\JsExpression; use yii\web\JsExpression;
use yii\helpers\Json; use yii\helpers\Json;
@@ -50,6 +51,8 @@ class EmailValidator extends Validator
/** /**
* @var boolean whether validation process should take into account IDN (internationalized domain * @var boolean whether validation process should take into account IDN (internationalized domain
* names). Defaults to false meaning that validation of emails containing IDN will always fail. * names). Defaults to false meaning that validation of emails containing IDN will always fail.
* Note that in order to use IDN validation you have to install and enable `intl` PHP extension,
* otherwise an exception would be thrown.
*/ */
public $enableIDN = false; public $enableIDN = false;
@@ -60,6 +63,9 @@ class EmailValidator extends Validator
public function init() public function init()
{ {
parent::init(); parent::init();
if ($this->enableIDN && !function_exists('idn_to_ascii')) {
throw new InvalidConfigException('In order to use IDN validation intl extension must be installed and enabled.');
}
if ($this->message === null) { if ($this->message === null) {
$this->message = Yii::t('yii', '{attribute} is not a valid email address.'); $this->message = Yii::t('yii', '{attribute} is not a valid email address.');
} }

7
framework/yii/validators/UrlValidator.php
View File

@@ -8,6 +8,7 @@
namespace yii\validators; namespace yii\validators;
use Yii; use Yii;
use yii\base\InvalidConfigException;
use yii\helpers\Html; use yii\helpers\Html;
use yii\web\JsExpression; use yii\web\JsExpression;
use yii\helpers\Json; use yii\helpers\Json;
@@ -40,7 +41,8 @@ class UrlValidator extends Validator
/** /**
* @var boolean whether validation process should take into account IDN (internationalized * @var boolean whether validation process should take into account IDN (internationalized
* domain names). Defaults to false meaning that validation of URLs containing IDN will always * domain names). Defaults to false meaning that validation of URLs containing IDN will always
* fail. * fail. Note that in order to use IDN validation you have to install and enable `intl` PHP
* extension, otherwise an exception would be thrown.
*/ */
public $enableIDN = false; public $enableIDN = false;
@@ -51,6 +53,9 @@ class UrlValidator extends Validator
public function init() public function init()
{ {
parent::init(); parent::init();
if ($this->enableIDN && !function_exists('idn_to_ascii')) {
throw new InvalidConfigException('In order to use IDN validation intl extension must be installed and enabled.');
}
if ($this->message === null) { if ($this->message === null) {
$this->message = Yii::t('yii', '{attribute} is not a valid URL.'); $this->message = Yii::t('yii', '{attribute} is not a valid URL.');
} }