Merge branch 'master' of git://github.com/yiisoft/yii2 into 2524-formatter-format-file-size

framework/CHANGELOG.md

@@ -115,6 +115,7 @@ Yii Framework 2 Change Log
 - Enh #2325: Adding support for the `X-HTTP-Method-Override` header in `yii\web\Request::getMethod()` (pawzar)
 - Enh #2364: Take into account current error reporting level in error handler (gureedo)
 - Enh #2387: Added support for fetching data from database in batches (nineinchnick, qiangxue)
+- Enh #2392: Added `addCssStyle()`, `removeCssStyle()`, `cssStyleFromArray()` and `cssStyleToArray()` to `Html` (qiangxue, kartik-v, Alex-Code)
 - Enh #2417: Added possibility to set `dataType` for `$.ajax` call in yii.activeForm.js (Borales)
 - Enh #2436: Label of the attribute, which looks like `relatedModel.attribute`, will be received from the related model if it available (djagya)
 - Enh #2415: Added support for inverse relations (qiangxue)

framework/helpers/BaseHtml.php

@@ -1608,6 +1608,122 @@ class BaseHtml
 	}
 
 	/**
+	 * Adds the specified CSS style to the HTML options.
+	 *
+	 * If the options already contain a `style` element, the new style will be merged
+	 * with the existing one. If a CSS property exists in both the new and the old styles,
+	 * the old one may be overwritten if `$overwrite` is true.
+	 *
+	 * For example,
+	 *
+	 * ```php
+	 * Html::addCssStyle($options, 'width: 100px; height: 200px');
+	 * ```
+	 *
+	 * @param array $options the HTML options to be modified.
+	 * @param string|array $style the new style string (e.g. `'width: 100px; height: 200px'`) or
+	 * array (e.g. `['width' => '100px', 'height' => '200px']`).
+	 * @param boolean $overwrite whether to overwrite existing CSS properties if the new style
+	 * contain them too.
+	 * @see removeCssStyle()
+	 * @see cssStyleFromArray()
+	 * @see cssStyleToArray()
+	 */
+	public static function addCssStyle(&$options, $style, $overwrite = true)
+	{
+		if (!empty($options['style'])) {
+			$oldStyle = static::cssStyleToArray($options['style']);
+			$newStyle = is_array($style) ? $style : static::cssStyleToArray($style);
+			if (!$overwrite) {
+				foreach ($newStyle as $property => $value) {
+					if (isset($oldStyle[$property])) {
+						unset($newStyle[$property]);
+					}
+				}
+			}
+			$style = static::cssStyleFromArray(array_merge($oldStyle, $newStyle));
+		}
+		$options['style'] = $style;
+	}
+
+	/**
+	 * Removes the specified CSS style from the HTML options.
+	 *
+	 * For example,
+	 *
+	 * ```php
+	 * Html::removeCssStyle($options, ['width', 'height']);
+	 * ```
+	 *
+	 * @param array $options the HTML options to be modified.
+	 * @param string|array $properties the CSS properties to be removed. You may use a string
+	 * if you are removing a single property.
+	 * @see addCssStyle()
+	 */
+	public static function removeCssStyle(&$options, $properties)
+	{
+		if (!empty($options['style'])) {
+			$style = static::cssStyleToArray($options['style']);
+			foreach ((array)$properties as $property) {
+				unset($style[$property]);
+			}
+			$options['style'] = static::cssStyleFromArray($style);
+		}
+	}
+
+	/**
+	 * Converts a CSS style array into a string representation.
+	 *
+	 * For example,
+	 *
+	 * ```php
+	 * print_r(Html::cssStyleFromArray(['width' => '100px', 'height' => '200px']));
+	 * // will display: 'width: 100px; height: 200px;'
+	 * ```
+	 *
+	 * @param array $style the CSS style array. The array keys are the CSS property names,
+	 * and the array values are the corresponding CSS property values.
+	 * @return string the CSS style string. If the CSS style is empty, a null will be returned.
+	 */
+	public static function cssStyleFromArray(array $style)
+	{
+		$result = '';
+		foreach ($style as $name => $value) {
+			$result .= "$name: $value; ";
+		}
+		// return null if empty to avoid rendering the "style" attribute
+		return $result === '' ? null : rtrim($result);
+	}
+
+	/**
+	 * Converts a CSS style string into an array representation.
+	 *
+	 * The array keys are the CSS property names, and the array values
+	 * are the corresponding CSS property values.
+	 *
+	 * For example,
+	 *
+	 * ```php
+	 * print_r(Html::cssStyleToArray('width: 100px; height: 200px;'));
+	 * // will display: ['width' => '100px', 'height' => '200px']
+	 * ```
+	 *
+	 * @param string $style the CSS style string
+	 * @return array the array representation of the CSS style
+	 */
+	public static function cssStyleToArray($style)
+	{
+		$result = [];
+		foreach (explode(';', $style) as $property) {
+			$property = explode(':', $property);
+			if (count($property) > 1) {
+				$result[trim($property[0])] = trim($property[1]);
+			}
+		}
+		return $result;
+	}
+
+	/**
 	 * Returns the real attribute name from the given attribute expression.
 	 *
 	 * An attribute expression is an attribute name prefixed and/or suffixed with array indexes.

tests/unit/framework/helpers/HtmlTest.php

@@ -536,6 +536,62 @@ EOD;
 		$this->assertEquals([], $options);
 	}
 
+	public function testCssStyleFromArray()
+	{
+		$this->assertEquals('width: 100px; height: 200px;', Html::cssStyleFromArray([
+			'width' => '100px',
+			'height' => '200px',
+		]));
+		$this->assertNull(Html::cssStyleFromArray([]));
+	}
+
+	public function testCssStyleToArray()
+	{
+		$this->assertEquals([
+			'width' => '100px',
+			'height' => '200px',
+		], Html::cssStyleToArray('width: 100px; height: 200px;'));
+		$this->assertEquals([], Html::cssStyleToArray('  '));
+	}
+
+	public function testAddCssStyle()
+	{
+		$options = ['style' => 'width: 100px; height: 200px;'];
+		Html::addCssStyle($options, 'width: 110px; color: red;');
+		$this->assertEquals('width: 110px; height: 200px; color: red;', $options['style']);
+
+		$options = ['style' => 'width: 100px; height: 200px;'];
+		Html::addCssStyle($options, ['width' => '110px', 'color' => 'red']);
+		$this->assertEquals('width: 110px; height: 200px; color: red;', $options['style']);
+
+		$options = ['style' => 'width: 100px; height: 200px;'];
+		Html::addCssStyle($options, 'width: 110px; color: red;', false);
+		$this->assertEquals('width: 100px; height: 200px; color: red;', $options['style']);
+
+		$options = [];
+		Html::addCssStyle($options, 'width: 110px; color: red;');
+		$this->assertEquals('width: 110px; color: red;', $options['style']);
+
+		$options = [];
+		Html::addCssStyle($options, 'width: 110px; color: red;', false);
+		$this->assertEquals('width: 110px; color: red;', $options['style']);
+	}
+
+	public function testRemoveCssStyle()
+	{
+		$options = ['style' => 'width: 110px; height: 200px; color: red;'];
+		Html::removeCssStyle($options, 'width');
+		$this->assertEquals('height: 200px; color: red;', $options['style']);
+		Html::removeCssStyle($options, ['height']);
+		$this->assertEquals('color: red;', $options['style']);
+		Html::removeCssStyle($options, ['color', 'background']);
+		$this->assertNull($options['style']);
+
+		$options = [];
+		Html::removeCssStyle($options, ['color', 'background']);
+		$this->assertTrue(!array_key_exists('style', $options));
+	}
+
 	protected function getDataItems()
 	{
 		return [