php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed wrong client validation issue in numbervalidator

Browse Source 
fixes #3118
This commit is contained in:
Carsten Brandt
2014-04-23 01:29:19 +02:00
parent 4f6e1d305f
commit 83a63f2346
22 changed files with 101 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
- Bug #3042: `yii\widgets\Pjax` should end application right after it finishes responding to a pjax request (qiangxue)
- Bug #3066: `yii\db\mssql\Schema::getTableSchema()` should return null when the table does not exist (qiangxue)
- Bug #3091: Fixed inconsistent treatment of `Widget::run()` when a widget is used as a container and as a self-contained object (qiangxue)
- Bug #3118: Ensure client validation has the same behavior as server side validation for number validator (cebe)
- Bug #3121: `yii\base\Application::bootstrap` may fail to load some components if they are specified as class names (qiangxue)
- Bug #3125: `yii\console\controllers\AssetController` now respects data URL resources (klimov-paul)
- Bug #3128: Fixed the bug that `defaultRoles` set in RBAC manager was not working as specified (qiangxue)

8
framework/validators/NumberValidator.php
View File

@@ -128,14 +128,18 @@ class NumberValidator extends Validator
];
if ($this->min !== null) {
$options['min'] = $this->min;
// ensure numeric value to make javascript comparison equal to PHP comparison
// https://github.com/yiisoft/yii2/issues/3118
$options['min'] = is_string($this->min) ? (float)$this->min : $this->min;
$options['tooSmall'] = Yii::$app->getI18n()->format($this->tooSmall, [
'attribute' => $label,
'min' => $this->min,
], Yii::$app->language);
}
if ($this->max !== null) {
$options['max'] = $this->max;
// ensure numeric value to make javascript comparison equal to PHP comparison
// https://github.com/yiisoft/yii2/issues/3118
$options['max'] = is_string($this->max) ? (float)$this->max : $this->max;
$options['tooBig'] = Yii::$app->getI18n()->format($this->tooBig, [
'attribute' => $label,
'max' => $this->max,

2
tests/unit/framework/validators/BooleanValidatorTest.php
View File

@@ -6,7 +6,7 @@ use yii\validators\BooleanValidator;
use yiiunit\TestCase;
/**
* BooleanValidatorTest
* @group validators
*/
class BooleanValidatorTest extends TestCase
{

3
tests/unit/framework/validators/CompareValidatorTest.php
View File

@@ -6,6 +6,9 @@ use yii\validators\CompareValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class CompareValidatorTest extends TestCase
{
protected function setUp()

3
tests/unit/framework/validators/DateValidatorTest.php
View File

@@ -7,6 +7,9 @@ use yii\validators\DateValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class DateValidatorTest extends TestCase
{
protected function setUp()

2
tests/unit/framework/validators/DefaultValueValidatorTest.php
View File

@@ -6,7 +6,7 @@ use yii\validators\DefaultValueValidator;
use yiiunit\TestCase;
/**
* DefaultValueValidatorTest
* @group validators
*/
class DefaultValueValidatorTest extends TestCase
{

1
tests/unit/framework/validators/EmailValidatorTest.php
View File

@@ -6,7 +6,6 @@ use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* EmailValidatorTest
* @group validators
*/
class EmailValidatorTest extends TestCase

3
tests/unit/framework/validators/ExistValidatorDriverTests/ExistValidatorPostgresTest.php
View File

@@ -3,6 +3,9 @@ namespace yiiunit\framework\validators\ExistValidatorDriverTests;
use yiiunit\framework\validators\ExistValidatorTest;
/**
* @group validators
*/
class ExistValidatorPostgresTest extends ExistValidatorTest
{
protected $driverName = 'pgsql';

3
tests/unit/framework/validators/ExistValidatorDriverTests/ExistValidatorSQliteTest.php
View File

@@ -3,6 +3,9 @@ namespace yiiunit\framework\validators\ExistValidatorDriverTests;
use yiiunit\framework\validators\ExistValidatorTest;
/**
* @group validators
*/
class ExistValidatorSQliteTest extends ExistValidatorTest
{
protected $driverName = 'sqlite';

3
tests/unit/framework/validators/ExistValidatorTest.php
View File

@@ -12,6 +12,9 @@ use yiiunit\data\validators\models\ValidatorTestMainModel;
use yiiunit\data\validators\models\ValidatorTestRefModel;
use yiiunit\framework\db\DatabaseTestCase;
/**
* @group validators
*/
class ExistValidatorTest extends DatabaseTestCase
{
protected $driverName = 'mysql';

3
tests/unit/framework/validators/FileValidatorTest.php
View File

@@ -8,6 +8,9 @@ use Yii;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class FileValidatorTest extends TestCase
{
public function setUp()

3
tests/unit/framework/validators/FilterValidatorTest.php
View File

@@ -6,6 +6,9 @@ use yii\validators\FilterValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class FilterValidatorTest extends TestCase
{
protected function setUp()

46
tests/unit/framework/validators/NumberValidatorTest.php
View File

@@ -3,9 +3,13 @@
namespace yiiunit\framework\validators;
use yii\validators\NumberValidator;
use yii\web\View;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class NumberValidatorTest extends TestCase
{
protected function setUp()
@@ -162,4 +166,46 @@ class NumberValidatorTest extends TestCase
$msgs = $model->getErrors('attr_number');
$this->assertSame('attr_number is to small.', $msgs[0]);
}
/**
* https://github.com/yiisoft/yii2/issues/3118
*/
public function testClientValidateComparison()
{
$val = new NumberValidator([
'min' => 5,
'max' => 10,
]);
$model = new FakedValidationModel();
$js = $val->clientValidateAttribute($model, 'attr_number', new View(['assetBundles' => ['yii\validators\ValidationAsset' => true]]));
$this->assertContains('"min":5', $js);
$this->assertContains('"max":10', $js);
$val = new NumberValidator([
'min' => '5',
'max' => '10',
]);
$model = new FakedValidationModel();
$js = $val->clientValidateAttribute($model, 'attr_number', new View(['assetBundles' => ['yii\validators\ValidationAsset' => true]]));
$this->assertContains('"min":5', $js);
$this->assertContains('"max":10', $js);
$val = new NumberValidator([
'min' => 5.65,
'max' => 13.37,
]);
$model = new FakedValidationModel();
$js = $val->clientValidateAttribute($model, 'attr_number', new View(['assetBundles' => ['yii\validators\ValidationAsset' => true]]));
$this->assertContains('"min":5.65', $js);
$this->assertContains('"max":13.37', $js);
$val = new NumberValidator([
'min' => '5.65',
'max' => '13.37',
]);
$model = new FakedValidationModel();
$js = $val->clientValidateAttribute($model, 'attr_number', new View(['assetBundles' => ['yii\validators\ValidationAsset' => true]]));
$this->assertContains('"min":5.65', $js);
$this->assertContains('"max":13.37', $js);
}
}

3
tests/unit/framework/validators/RangeValidatorTest.php
View File

@@ -6,6 +6,9 @@ use yii\validators\RangeValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class RangeValidatorTest extends TestCase
{
protected function setUp()

3
tests/unit/framework/validators/RegularExpressionValidatorTest.php
View File

@@ -6,6 +6,9 @@ use yii\validators\RegularExpressionValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class RegularExpressionValidatorTest extends TestCase
{
protected function setUp()

3
tests/unit/framework/validators/RequiredValidatorTest.php
View File

@@ -5,6 +5,9 @@ use yii\validators\RequiredValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class RequiredValidatorTest extends TestCase
{
protected function setUp()

3
tests/unit/framework/validators/StringValidatorTest.php
View File

@@ -6,6 +6,9 @@ use yii\validators\StringValidator;
use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\TestCase;
/**
* @group validators
*/
class StringValidatorTest extends TestCase
{
public function setUp()

3
tests/unit/framework/validators/UniqueValidatorDriverTests/UniqueValidatorPostgresTest.php
View File

@@ -4,6 +4,9 @@ namespace yiiunit\framework\validators\UniqueValidatorDriverTests;
use yiiunit\framework\validators\UniqueValidatorTest;
/**
* @group validators
*/
class UniqueValidatorPostgresTest extends UniqueValidatorTest
{
protected $driverName = 'pgsql';

3
tests/unit/framework/validators/UniqueValidatorDriverTests/UniqueValidatorSQliteTest.php
View File

@@ -4,6 +4,9 @@ namespace yiiunit\framework\validators\UniqueValidatorDriverTests;
use yiiunit\framework\validators\UniqueValidatorTest;
/**
* @group validators
*/
class UniqueValidatorSQliteTest extends UniqueValidatorTest
{
protected $driverName = 'sqlite';

3
tests/unit/framework/validators/UniqueValidatorTest.php
View File

@@ -12,6 +12,9 @@ use yiiunit\data\validators\models\ValidatorTestMainModel;
use yiiunit\data\validators\models\ValidatorTestRefModel;
use yiiunit\framework\db\DatabaseTestCase;
/**
* @group validators
*/
class UniqueValidatorTest extends DatabaseTestCase
{
protected $driverName = 'mysql';

2
tests/unit/framework/validators/UrlValidatorTest.php
View File

@@ -7,7 +7,7 @@ use yii\validators\UrlValidator;
use yiiunit\TestCase;
/**
* UrlValidatorTest
* @group validators
*/
class UrlValidatorTest extends TestCase
{

3
tests/unit/framework/validators/ValidatorTest.php
View File

@@ -9,6 +9,9 @@ use yiiunit\data\validators\models\FakedValidationModel;
use yiiunit\data\validators\TestValidator;
use yiiunit\TestCase;
/**
* @group validators
*/
class ValidatorTest extends TestCase
{
protected function setUp()