used PHP 8 features

nette · Jan 13, 2023 · bb1c7d9 · bb1c7d9
1 parent 61d9122
commit bb1c7d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/Neon/Encoder.php b/src/Neon/Encoder.php
@@ -49,7 +49,7 @@ public function valueToNode(mixed $val, bool $blockMode = false): Node
 		} elseif ($val instanceof Entity) {
 			return new Node\EntityNode(
 				$this->valueToNode($val->value),
-				$this->arrayToNodes((array) $val->attributes),
+				$this->arrayToNodes($val->attributes),
 			);
 
 		} elseif (is_object($val) || is_array($val)) {

diff --git a/src/Neon/Lexer.php b/src/Neon/Lexer.php
@@ -50,7 +50,7 @@ public function tokenize(string $input): TokenStream
 	{
 		$input = str_replace("\r", '', $input);
 		$pattern = '~(' . implode(')|(', self::Patterns) . ')~Amixu';
-		$res = preg_match_all($pattern, $input, $tokens, PREG_SET_ORDER);
+		$res = preg_match_all($pattern, $input, $tokens, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL);
 		if ($res === false) {
 			throw new Exception('Invalid UTF-8 sequence.');
 		}
@@ -60,9 +60,7 @@ public function tokenize(string $input): TokenStream
 		foreach ($tokens as &$token) {
 			$type = null;
 			for ($i = 1; $i <= count($types); $i++) {
-				if (!isset($token[$i])) {
-					break;
-				} elseif ($token[$i] !== '') {
+				if (isset($token[$i])) {
 					$type = $types[$i - 1];
 					if ($type === Token::Char) {
 						$type = $token[0];

diff --git a/src/Neon/Node/LiteralNode.php b/src/Neon/Node/LiteralNode.php
@@ -81,7 +81,7 @@ public function toString(): string
 
 		} elseif (is_float($this->value)) {
 			$res = json_encode($this->value);
-			return strpos($res, '.') === false ? $res . '.0' : $res;
+			return str_contains($res, '.') ? $res : $res . '.0';
 
 		} elseif (is_int($this->value) || is_bool($this->value) || $this->value === null) {
 			return json_encode($this->value);

diff --git a/src/Neon/Node/StringNode.php b/src/Neon/Node/StringNode.php
@@ -57,11 +57,7 @@ function (array $m): string {
 				if (isset(self::EscapeSequences[$sq[1]])) {
 					return self::EscapeSequences[$sq[1]];
 				} elseif ($sq[1] === 'u' && strlen($sq) >= 6) {
-					if (($res = json_decode('"' . $sq . '"')) !== null) {
-						return $res;
-					}
-
-					throw new Nette\Neon\Exception("Invalid UTF-8 sequence $sq");
+					return json_decode('"' . $sq . '"') ?? throw new Nette\Neon\Exception("Invalid UTF-8 sequence $sq");
 				} elseif ($sq[1] === 'x' && strlen($sq) === 4) {
 					trigger_error("Neon: '$sq' is deprecated, use '\\uXXXX' instead.", E_USER_DEPRECATED);
 					return chr(hexdec(substr($sq, 2)));
@@ -76,7 +72,7 @@ function (array $m): string {
 
 	public function toString(): string
 	{
-		if (strpos($this->value, "\n") === false) {
+		if (!str_contains($this->value, "\n")) {
 			return "'" . str_replace("'", "''", $this->value) . "'";
 
 		} elseif (preg_match('~\n[\t ]+\'{3}~', $this->value)) {