used native PHP 8 functions

nette · Jul 28, 2021 · ced9636 · ced9636
1 parent b4098dc
commit ced9636
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Neon/Decoder.php b/src/Neon/Decoder.php
@@ -86,7 +86,7 @@ final class Decoder
 	 */
 	public function decode(string $input): mixed
 	{
-		if (substr($input, 0, 3) === "\u{FEFF}") { // BOM
+		if (str_starts_with($input, "\u{FEFF}")) { // BOM
 			$input = substr($input, 3);
 		}
 		$this->input = "\n" . str_replace("\r", '', $input); // \n forces indent detection

diff --git a/src/Neon/Encoder.php b/src/Neon/Encoder.php
@@ -53,9 +53,9 @@ public function encode($var, int $flags = 0): string
 				foreach ($var as $k => $v) {
 					$v = $this->encode($v, self::BLOCK);
 					$s .= ($isList ? '-' : $this->encode($k) . ':')
-						. (strpos($v, "\n") === false
-							? ' ' . $v . "\n"
-							: "\n" . preg_replace('#^(?=.)#m', "\t", $v) . (substr($v, -2, 1) === "\n" ? '' : "\n"));
+						. (str_contains($v, "\n")
+							? "\n" . preg_replace('#^(?=.)#m', "\t", $v) . (substr($v, -2, 1) === "\n" ? '' : "\n")
+							: ' ' . $v . "\n");
 				}
 				return $s;
 
@@ -77,7 +77,7 @@ public function encode($var, int $flags = 0): string
 			if ($res === false) {
 				throw new Exception('Invalid UTF-8 sequence: ' . $var);
 			}
-			if (strpos($var, "\n") !== false) {
+			if (str_contains($var, "\n")) {
 				$res = preg_replace_callback(
 					'#[^\\\\]|\\\\(.)#s',
 					fn($m) => ['n' => "\n\t", 't' => "\t", '"' => '"'][$m[1] ?? ''] ?? $m[0],
@@ -89,7 +89,7 @@ public function encode($var, int $flags = 0): string
 
 		} elseif (is_float($var)) {
 			$var = json_encode($var);
-			return strpos($var, '.') === false ? $var . '.0' : $var;
+			return str_contains($var, '.') ? $var : $var . '.0';
 
 		} else {
 			return json_encode($var);