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

Simplified code, enhanced PHPDocs

Browse Source
This commit is contained in:
SilverFire - Dmitry Naumenko
2018-03-10 10:19:07 +02:00
parent e72c31dc0b
commit b3f54d1065
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@ -4,7 +4,7 @@ Yii Framework 2 Change Log
2.0.14.2 under development 2.0.14.2 under development
------------------------ ------------------------
- Bug #15858: Fixed array undefined offset error calling Html::errorSummary with same error messages from different model attributes (FabrizioCaldarelli) - Bug #15858: Fixed `Undefined offset` error calling `yii\helpers\Html::errorSummary()` with the same error messages for different model attributes (FabrizioCaldarelli, silverfire)
- Bug #15783: Regenerate CSRF token only when logging in directly (samdark) - Bug #15783: Regenerate CSRF token only when logging in directly (samdark)
- Bug #15801: Fixed `has-error` CSS class assignment in `yii\widgets\ActiveField` when attribute name is prefixed with tabular index (FabrizioCaldarelli) - Bug #15801: Fixed `has-error` CSS class assignment in `yii\widgets\ActiveField` when attribute name is prefixed with tabular index (FabrizioCaldarelli)
- Bug #15792: Added missing `yii\db\QueryBuilder::conditionClasses` setter (silverfire) - Bug #15792: Added missing `yii\db\QueryBuilder::conditionClasses` setter (silverfire)

9
framework/helpers/BaseHtml.php
View File

@ -1255,14 +1255,13 @@ class BaseHtml
$lines = array_unique(array_merge($lines, $model->getErrorSummary($showAllErrors))); $lines = array_unique(array_merge($lines, $model->getErrorSummary($showAllErrors)));
} }
// Fix #15858 (FlorinRo) - If there are same message errors for different attributes, array_unique could skip some array key, // If there are the same error messages for different attributes, array_unique will leave gaps
// so the next for cycle could fail because key missing. // between sequential keys. Applying array_values to reorder array keys.
// Applying array_values reorder array keys.
$lines = array_values($lines); $lines = array_values($lines);
if ($encode) { if ($encode) {
for ($i = 0, $linesCount = count($lines); $i < $linesCount; $i++) { foreach ($lines as &$line) {
$lines[$i] = Html::encode($lines[$i]); $line = Html::encode($line);
} }
} }

3
tests/framework/helpers/HtmlTest.php
View File

@ -1321,6 +1321,7 @@ EOD;
/** /**
* Test that attributes that output same errors, return unique message error * Test that attributes that output same errors, return unique message error
* @see https://github.com/yiisoft/yii2/pull/15859
*/ */
public function testCollectError() public function testCollectError()
{ {
@ -1333,7 +1334,7 @@ EOD;
$this->assertEquals( $this->assertEquals(
'<div><p>Please fix the following errors:</p><ul><li>error1</li> '<div><p>Please fix the following errors:</p><ul><li>error1</li>
<li>error2</li></ul></div>', <li>error2</li></ul></div>',
Html::errorSummary($model,['showAllErrors'=>true]) Html::errorSummary($model, ['showAllErrors' => true])
); );
} }