Removed the type hint mixed as it is not compatible with PHP 7.4.

Added #[\ReturnTypeWillChange] to methods that return mixed for PHP 8.1 compatibility.
Fixed some docblock issues.
Updated usage of `str...` functions to be `mb_str...`.
Fixed issue in `value::minify()` where if the `decimalplaces` setting was false it would be treated as `0`.
Added tests.

Author: hexydec

src/cssdoc.php

@@ -227,6 +227,7 @@ public function __construct(array $config = []) {
 	 * @param string $var The name of the property to retrieve, currently 'length' and output
 	 * @return mixed The number of children in the object for length, the output config, or null if the parameter doesn't exist
 	 */
+	#[\ReturnTypeWillChange]
 	public function __get(string $var) {
 		if ($var === 'length') {
 			return \count($this->children);
@@ -284,7 +285,8 @@ public function offsetUnset($i) : void {
 	 * @param string|integer $i The key to be accessed, can be a string or integer
 	 * @return mixed The requested value or null if the key doesn't exist
 	 */
-	public function offsetGet($i) : mixed { // return reference so you can set it like an array
+	#[\ReturnTypeWillChange]
+	public function offsetGet($i) { // return reference so you can set it like an array
 		return $this->document->rules[$i] ?? null;
 	}
 
@@ -293,7 +295,8 @@ public function offsetGet($i) : mixed { // return reference so you can set it li
 	 *
 	 * @return document|rule The child node at the current pointer position
 	 */
-	public function current() : mixed {
+	#[\ReturnTypeWillChange]
+	public function current() {
 		return $this->document->rules[$this->pointer] ?? null;
 	}
 
@@ -459,7 +462,7 @@ public function minify(array $minify = []) : void {
 	 * Compile the document to a string
 	 *
 	 * @param array $options An array indicating output options, this is merged with cssdoc::$output
-	 * @return void
+	 * @return string The document as a string
 	 */
 	public function compile(array $options = []) : string {
 		$options = \array_merge($this->config['output'], $options);
@@ -471,7 +474,7 @@ public function compile(array $options = []) : string {
 	 *
 	 * @param string|null $file The file location to save the document to, or null to just return the compiled code
 	 * @param array $options An array indicating output options, this is merged with cssdoc::$output
-	 * @return string|bool The compiled CSS, or false if the file could not be saved
+	 * @return string|false The compiled CSS, or false if the file could not be saved
 	 */
 	public function save(string $file = null, array $options = []) {
 		$css = $this->compile($options);

src/tokens/document.php

@@ -80,7 +80,7 @@ public function minify(array $minify) : void {
 	 * Compile the property to a string
 	 *
 	 * @param array $options An array of compilation options
-	 * @return void
+	 * @return string The compiled document
 	 */
 	public function compile(array $options) : string {
 		$b = $options['style'] !== 'minify';
@@ -102,7 +102,7 @@ public function compile(array $options) : string {
 	 * @param array|string $hasProp A string or array specifying the properties that any rules must contain
 	 * @param array $media An array specifying how any media queries should be match, where the key is the property and the key the value. 'max-width' will match any rules where the value is lower that that specified, 'min-width' the value must be higher. Use 'media' to specify the media type
 	 * @param bool $exact Denotes whether to match selectors exactly, if false, selectors will be matched from the left
-	 * @return cssdoc A CSSdoc object
+	 * @return array A CSSdoc object
 	 */
 	public function find(?array $selectors, $hasProp = null, array $media = [], bool $exact = true) {
 		$rules = [];

src/tokens/rule.php

@@ -147,7 +147,7 @@ public function matches(?array $selectors, array $hasProp = [], bool $exact = tr
 				}
 			} else {
 				foreach ($selectors AS $item) {
-					if (\mb_stripos($compiled, $item)) {
+					if (\mb_stripos($compiled, $item) !== false) {
 						$matches = true;
 						break;
 					}

src/tokens/selector.php

@@ -129,12 +129,12 @@ public function minify(array $minify) : void {
 		foreach ($this->selectors AS &$item) {
 
 			// minify sub-selector
-			if (is_object($item)) {
+			if (\is_object($item)) {
 				$item->minify($minify);
 
 			// change double colon to single colon
-			} elseif ($minify['selectors'] && (\strpos($item['selector'], '::before') === 0 || \strpos($item['selector'], '::after') === 0)) {
-				$item['selector'] = substr($item['selector'], 1);
+			} elseif ($minify['selectors'] && (\mb_strpos($item['selector'], '::before') === 0 || \mb_strpos($item['selector'], '::after') === 0)) {
+				$item['selector'] = mb_substr($item['selector'], 1);
 
 			// quoted attributes
 			} elseif (\strpbrk($item['selector'], '\'"') !== false && \preg_match('/^((?U).*)([\'"])((?:\\\\.|[^\\2])*)(\\2)(.*)$/i', $item['selector'], $match)) {
@@ -146,12 +146,12 @@ public function minify(array $minify) : void {
 				// convert quotes
 				} elseif ($minify['convertquotes'] && $match[2] === "'") {
 					$match[2] = $match[4] = '"';
-					$match[3] = str_replace(["\\'", '"'], ["'", '\\"'], $match[3]);
+					$match[3] = \str_replace(["\\'", '"'], ["'", '\\"'], $match[3]);
 				}
 
 				// recompile
 				unset($match[0]);
-				$item['selector'] = implode('', $match);
+				$item['selector'] = \implode('', $match);
 			}
 		}
 		unset($item);
@@ -167,7 +167,7 @@ public function compile(array $options) : string {
 		$space = $options['style'] !== 'minify' ? ' ' : '';
 		$css = '';
 		foreach ($this->selectors AS $item) {
-			if (is_object($item)) {
+			if (\is_object($item)) {
 				$css .= '('.$item->compile($options).')';
 			} else {
 				if ($item['join']) {

src/tokens/value.php

@@ -47,7 +47,6 @@ public function __construct(cssdoc $root, ?string $name = null, bool $brackets =
 	 * @return bool Whether anything was parsed
 	 */
 	public function parse(tokenise $tokens) : bool {
-		$comment = null;
 		while (($token = $tokens->next()) !== null) {
 			switch ($token['type']) {
 				case 'string':
@@ -105,7 +104,7 @@ public function minify(array $minify) : void {
 		foreach ($this->properties AS &$item) {
 
 			// value in brackets
-			if (is_object($item)) {
+			if (\is_object($item)) {
 				$item->minify($minify);
 			} else {
 
@@ -155,11 +154,11 @@ public function minify(array $minify) : void {
 					$unit = \strtolower($match[6]);
 
 					// shorten time values
-					if ($minify['time'] && $unit === 'ms' && ($len = \strlen($match[3])) >= 3 && $match[3][$len-1] === '0') {
-						if (($match[4] = rtrim(\substr($match[3], -3), '0')) !== '') {
+					if ($minify['time'] && $unit === 'ms' && ($len = \mb_strlen($match[3])) >= 3 && $match[3][$len-1] === '0') {
+						if (($match[4] = \rtrim(\mb_substr($match[3], -3), '0')) !== '') {
 							$match[4] = '.'.$match[4];
 						}
-						$match[3] = $len > 3 ? \substr($match[3], 0, -3) : '';
+						$match[3] = $len > 3 ? \mb_substr($match[3], 0, -3) : '';
 						$match[6] = 's';
 
 					// remove unit on 0 values, not inside brackets where they must remain
@@ -168,25 +167,25 @@ public function minify(array $minify) : void {
 					}
 
 					// reduce decimal places
-					if ($minify['decimalplaces'] !== null && \strlen($match[4]) > $minify['decimalplaces']) {
-						$match[4] = $minify['decimalplaces'] ? \substr($match[4], 0, $minify['decimalplaces'] + 1) : '';
+					if (!\in_array($minify['decimalplaces'], [null, false], true) && \mb_strlen($match[4]) > $minify['decimalplaces']) {
+						$match[4] = $minify['decimalplaces'] ? \mb_substr($match[4], 0, $minify['decimalplaces'] + 1) : '';
 						$match[5] = '';
 					}
 
 					// rebuild value
 					unset($match[0]);
-					$item = implode('', $match);
+					$item = \implode('', $match);
 				}
 
 				// quoted values
 				if (($single = \mb_strpos($item, "'")) === 0 || \mb_strpos($item, '"') === 0) {
 
 					// remove quotes where possible
-					if ($minify['quotes'] && !in_array($name, $config['quoted'], true) && preg_match('/^("|\')((?!-?\\d)[-_a-z0-9.\\/]++)\\1$/i', $item, $match)) {
+					if ($minify['quotes'] && !\in_array($name, $config['quoted'], true) && \preg_match('/^("|\')((?!-?\\d)[-_a-z0-9.\\/]++)\\1$/i', $item, $match)) {
 						$item = $match[2];
 
 					// or convert to double quotes
-					} elseif ($minify['convertquotes'] && $single === 0 && mb_strpos($item, '"') === false) {
+					} elseif ($minify['convertquotes'] && $single === 0 && \mb_strpos($item, '"') === false) {
 						$item = '"'.\str_replace("\\'", "'", \trim($item, "'")).'"';
 					}
 
@@ -211,7 +210,7 @@ public function minify(array $minify) : void {
 			$i = 0;
 			$options = ['style' => 'minify', 'prefix' => ''];
 			foreach ($this->properties AS $key => $item) {
-				if (is_object($item)) {
+				if (\is_object($item)) {
 					$props[$i-1]['value'] .= '('.$item->compile($options).')';
 					$props[$i-1]['keys'][] = $key;
 				} else {
@@ -260,7 +259,7 @@ public function compile(array $options) : string {
 				}
 				$css .= '('.$item->compile($options).')';
 				$join = ' ';
-			} elseif (\in_array($item, ['-', '+'], true) && !\in_array(mb_strtolower($this->name), $this->root->config['spaced'], true)) {
+			} elseif (\in_array($item, ['-', '+'], true) && !\in_array(\mb_strtolower($this->name), $this->root->config['spaced'], true)) {
 				$css .= $item;
 				$join = '';
 			} elseif (\in_array($item, [':', ',', '*', '/'], true)) {

tests/cssdocTest.php

@@ -464,6 +464,12 @@ public function testCanRemoveLeadingZeros() {
 					bottom: -0.5px;
 				}',
 				'output' => '#id{top:calc(-.1% + 1em);bottom:-.5px;}'
+			],
+			[
+				'input' => '#id {
+					animation: 0.5s 0.3s both lines;
+				}',
+				'output' => '#id{animation:.5s .3s both lines;}'
 			]
 		];
 		$config = $this->config;
@@ -479,8 +485,9 @@ public function testCanRemoveTrailingZeros() {
 					transition: all 500ms;
 					transition-delay: 3.2000s;
 					padding: 32.5000px;
+					animation-delay: .5000s;
 				}',
-				'output' => '#id{font-size:14em;transition:all 500ms;transition-delay:3.2s;padding:32.5px;}'
+				'output' => '#id{font-size:14em;transition:all 500ms;transition-delay:3.2s;padding:32.5px;animation-delay:.5s;}'
 			]
 		];
 		$config = $this->config;
@@ -496,6 +503,18 @@ public function testCanReduceDecimalPlaces() {
 					width: 33.3333333333333333%;
 				}',
 				'output' => '#id{font-size:0.9838em;width:33.3333%;}'
+			],
+			[
+				'input' => '#id {
+					animation: 0.5s 0.4s both lines;
+				}',
+				'output' => '#id{animation:0.5s 0.4s both lines;}'
+			],
+			[
+				'input' => '#id {
+					animation: .5s .4s both lines;
+				}',
+				'output' => '#id{animation:.5s .4s both lines;}'
 			]
 		];
 		$config = $this->config;
@@ -748,6 +767,24 @@ public function testCanShortenTimeValues() {
 					transition: all 00450ms;
 				}',
 				'output' => '#id{transition:all 00.45s;}'
+			],
+			[
+				'input' => '#id {
+					animation: 0.5s 0.4s both lines;
+				}',
+				'output' => '#id{animation:0.5s 0.4s both lines;}'
+			],
+			[
+				'input' => '#id {
+					animation: .5s .4s both lines;
+				}',
+				'output' => '#id{animation:.5s .4s both lines;}'
+			],
+			[
+				'input' => '#id {
+					animation: lines .5s both;
+				}',
+				'output' => '#id{animation:lines .5s both;}'
 			]
 		];
 		$config = $this->config;
@@ -832,6 +869,12 @@ public function testCanShortenNone() {
 				}",
 				'output' => '#id{border:0;outline:0;background:0;background-color:transparent;}'
 			],
+			[
+				'input' => '#id {
+					border: 2px solid transparent;
+				}',
+				'output' => '#id{border:2px solid transparent;}'
+			]
 		];
 		$config = $this->config;
 		$config['none'] = true;