diff --git a/framework/validators/CDateValidator.php b/framework/validators/CDateValidator.php index eac6b7884..2a875d9cc 100644 --- a/framework/validators/CDateValidator.php +++ b/framework/validators/CDateValidator.php @@ -55,7 +55,7 @@ class CDateValidator extends CValidator $valid=false; // reason of array checking is explained here: https://github.com/yiisoft/yii/issues/1955 - // checking for `null` as passing `null` to CDateTimeParser::parse will throw a deprecation error in PHP >= 8.1 + // checking for `null` as passing `null` to CDateTimeParser::parse will throw a deprecation error in PHP >= 8.1 if(!is_array($value) && $value !== null) { $formats=is_string($this->format) ? array($this->format) : $this->format; diff --git a/tests/framework/web/helpers/CHtmlTest.php b/tests/framework/web/helpers/CHtmlTest.php index 048ba2d04..5b9f45500 100644 --- a/tests/framework/web/helpers/CHtmlTest.php +++ b/tests/framework/web/helpers/CHtmlTest.php @@ -178,7 +178,7 @@ class CHtmlTest extends CTestCase ); } - /** + /** * @dataProvider providerCloseTag * * @param string $tag @@ -402,11 +402,11 @@ class CHtmlTest extends CTestCase array('async'=>true), "" ), - array( - 'var a = 10;', - array('async'=>false), - "" - ), + array( + 'var a = 10;', + array('async'=>false), + "" + ), ); } @@ -644,12 +644,12 @@ class CHtmlTest extends CTestCase array(array('v1'),0,'defaultValue','v1'), array(array('v1'),0.0,'defaultValue','v1'), - // Test $model as an array, with null as a key, see: https://github.com/yiisoft/yii/pull/4503#discussion_r1054516859 - array(array(null=>'v1','k2'=>'v2'),null,'defaultValue','v1'), - array(array(null=>'v1','k2'=>'v2'),'','defaultValue','v1'), - array(array(''=>'v1','k2'=>'v2'),null,'defaultValue','v1'), - array(array(''=>'v1','k2'=>'v2'),'','defaultValue','v1'), - array(array(null=>'v1','k2'=>'v2'),'k2','defaultValue','v2'), + // Test $model as an array, with null as a key, see: https://github.com/yiisoft/yii/pull/4503#discussion_r1054516859 + array(array(null=>'v1','k2'=>'v2'),null,'defaultValue','v1'), + array(array(null=>'v1','k2'=>'v2'),'','defaultValue','v1'), + array(array(''=>'v1','k2'=>'v2'),null,'defaultValue','v1'), + array(array(''=>'v1','k2'=>'v2'),'','defaultValue','v1'), + array(array(null=>'v1','k2'=>'v2'),'k2','defaultValue','v2'), ); // create_function is not supported by CHtml::value(), we're just testing this feature/property @@ -1175,7 +1175,7 @@ class CHtmlTestModel extends CModel */ public $attr4; - /** + /** * Returns the list of attribute names. * @return array list of attribute names. Defaults to all public properties of the class. */