Fixed yii\behaviors\AttributeTypecastBehavior::$attributeTypes auto…

…-detection fails for rule, which specify attribute with '!' prefix
ihipop · Jan 3, 2018 · 2a742ce · 2a742ce
1 parent b44bbd6
commit 2a742ce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -26,6 +26,7 @@ Yii Framework 2 Change Log
 - Bug #15380: `FormatConverter::convertDateIcuToPhp()` now converts `a` ICU symbols to `A` (brandonkelly)
 - Bug #15407: Fixed rendering rows with associative arrays in `yii\console\widgets\Table` (dmrogin)
 - Bug #15432: Fixed wrong value being set in `yii\filters\RateLimiter::checkRateLimit()` resulting in wrong `X-Rate-Limit-Reset` header value (bizley)
+- Bug #15440: Fixed `yii\behaviors\AttributeTypecastBehavior::$attributeTypes` auto-detection fails for rule, which specify attribute with '!' prefix (klimov-paul)
 - Enh #3087: Added `yii\helpers\BaseHtml::error()` "errorSource" option to be able to customize errors display (yanggs07, developeruz, silverfire)
 - Enh #3250: Added support for events partial wildcard matching (klimov-paul)
 - Enh #5515: Added default value for `yii\behaviors\BlameableBehavior` for cases when the user is guest (dmirogin)

diff --git a/framework/behaviors/AttributeTypecastBehavior.php b/framework/behaviors/AttributeTypecastBehavior.php
@@ -285,7 +285,7 @@ protected function detectAttributeTypes()
 
             if ($type !== null) {
                 foreach ((array) $validator->attributes as $attribute) {
-                    $attributeTypes[$attribute] = $type;
+                    $attributeTypes[ltrim($attribute, '!')] = $type;
                 }
             }
         }

diff --git a/tests/framework/behaviors/AttributeTypecastBehaviorTest.php b/tests/framework/behaviors/AttributeTypecastBehaviorTest.php
@@ -141,7 +141,7 @@ public function testAutoDetectAttributeTypes()
             ->addRule('name', 'string')
             ->addRule('amount', 'integer')
             ->addRule('price', 'number')
-            ->addRule('isActive', 'boolean');
+            ->addRule('!isActive', 'boolean');
 
         $behavior = new AttributeTypecastBehavior();