Browse Source

Fix #18269: Fix integer safe attribute to work properly in `yii\base\Model`

tags/2.0.38
Vladislav Pototskiy 4 years ago committed by GitHub
parent
commit
e348c0f460
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      framework/CHANGELOG.md
  2. 2
      framework/base/Model.php
  3. 12
      tests/framework/base/ModelTest.php

1
framework/CHANGELOG.md

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.38 under development
------------------------
- Bug #18269: Fix integer safe attribute to work properly in `yii\base\Model` (Ladone)
- Enh #18236: Allow `yii\filters\RateLimiter` to accept a closure function for the `$user` property in order to assign values on runtime (nadar)
- Bug #18233: Add PHP 8 support (samdark)
- Bug #18239: Fix support of no-extension files for `FileValidator::validateExtension()` (darkdef)

2
framework/base/Model.php

@ -798,7 +798,7 @@ class Model extends Component implements StaticInstanceInterface, IteratorAggreg
}
$attributes = [];
foreach ($scenarios[$scenario] as $attribute) {
if ($attribute[0] !== '!' && !in_array('!' . $attribute, $scenarios[$scenario])) {
if (strncmp($attribute, '!', 1) !== 0 && !in_array('!' . $attribute, $scenarios[$scenario])) {
$attributes[] = $attribute;
}
}

12
tests/framework/base/ModelTest.php

@ -175,6 +175,18 @@ class ModelTest extends TestCase
$this->assertTrue($speaker->isAttributeSafe('firstName'));
}
public function testIsAttributeSafeForIntegerAttribute()
{
$model = new RulesModel();
$model->rules = [
[
[123456], 'safe',
]
];
$this->assertTrue($model->isAttributeSafe(123456));
}
public function testSafeScenarios()
{
$model = new RulesModel();

Loading…
Cancel
Save