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

Fix #19098: Add yii\helper\BaseHtml::$normalizeClassAttribute to fix duplicate classes

Browse Source
This commit is contained in:
Anton
2021-12-27 21:44:48 +03:00
committed by GitHub
parent 02fe7f42c8
commit 6fb16bc30f
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -36,6 +36,7 @@ Yii Framework 2 Change Log
- Bug #19031: Fix displaying console help for parameters with declared types (WinterSilence)
- Bug #19030: Add DI container usage to `yii\base\Widget::end()` (papppeter)
- Bug #19096: Fix `Request::getIsConsoleRequest()` may return erroneously when testing a Web application in Codeception (WinterSilence)
- Enh #19098: Add `yii\helper\BaseHtml::$normalizeClassAttribute` to fix duplicate classes (WinterSilence)
- Enh #19108: Optimize `Component::hasEventHandlers()` and `Component::trigger()` (WinterSilence)

14
framework/helpers/BaseHtml.php
View File

@ -94,6 +94,13 @@ class BaseHtml
* @since 2.0.3
*/
public static $dataAttributes = ['aria', 'data', 'data-ng', 'ng'];
/**
* @var bool whether to removes duplicate class names in tag attribute `class`
* @see mergeCssClasses()
* @see renderTagAttributes()
* @since 2.0.44
*/
public static $normalizeClassAttribute = false;
/**
@ -1981,6 +1988,11 @@ class BaseHtml
if (empty($value)) {
continue;
}
if (static::$normalizeClassAttribute === true && count($value) > 1) {
// removes duplicate classes
$value = explode(' ', implode(' ', $value));
$value = array_unique($value);
}
$html .= " $name=\"" . static::encode(implode(' ', $value)) . '"';
} elseif ($name === 'style') {
if (empty($value)) {
@ -2047,7 +2059,7 @@ class BaseHtml
}
}
return array_unique($existingClasses);
return static::$normalizeClassAttribute ? array_unique($existingClasses) : $existingClasses;
}
/**

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

@ -1082,12 +1082,14 @@ EOD;
$this->assertEqualsWithoutLE($expected, Html::renderSelectOptions(['1.10'], $data, $attributes));
}
public function testRenderAttributes()
public function testRenderTagAttributes()
{
$this->assertEquals('', Html::renderTagAttributes([]));
$this->assertEquals(' name="test" value="1&lt;&gt;"', Html::renderTagAttributes(['name' => 'test', 'empty' => null, 'value' => '1<>']));
$this->assertEquals(' checked disabled', Html::renderTagAttributes(['checked' => true, 'disabled' => true, 'hidden' => false]));
$this->assertEquals(' class="first second"', Html::renderTagAttributes(['class' => ['first', 'second']]));
Html::$normalizeClassAttribute = true;
$this->assertEquals(' class="first second"', Html::renderTagAttributes(['class' => ['first second', 'first']]));
$this->assertEquals('', Html::renderTagAttributes(['class' => []]));
$this->assertEquals(' style="width: 100px; height: 200px;"', Html::renderTagAttributes(['style' => ['width' => '100px', 'height' => '200px']]));
$this->assertEquals('', Html::renderTagAttributes(['style' => []]));