used PHP 7.0 features

dg · dg · commit 67158e47edcc · 2017-01-30T03:14:10.000+01:00
diff --git a/src/Utils/Callback.php b/src/Utils/Callback.php
@@ -177,7 +177,7 @@ public static function unwrap(\Closure $closure)
 		$r = new \ReflectionFunction($closure);
 		if (substr($r->getName(), -1) === '}') {
 			$vars = $r->getStaticVariables();
-			return isset($vars['_callable_']) ? $vars['_callable_'] : $closure;
+			return $vars['_callable_'] ?? $closure;
 
 		} elseif ($obj = $r->getClosureThis()) {
 			return [$obj, $r->getName()];
diff --git a/src/Utils/Html.php b/src/Utils/Html.php
@@ -70,7 +70,7 @@ public static function el($name = NULL, $attrs = NULL)
 
 		if (isset($parts[1])) {
 			foreach (Strings::matchAll($parts[1] . ' ', '#([a-z0-9:-]+)(?:=(["\'])?(.*?)(?(2)\\2|\s))?#i') as $m) {
-				$el->attrs[$m[1]] = isset($m[3]) ? $m[3] : TRUE;
+				$el->attrs[$m[1]] = $m[3] ?? TRUE;
 			}
 		}
 
@@ -175,7 +175,7 @@ public function setAttribute($name, $value)
 	 */
 	public function getAttribute($name)
 	{
-		return isset($this->attrs[$name]) ? $this->attrs[$name] : NULL;
+		return $this->attrs[$name] ?? NULL;
 	}
 
 
@@ -249,7 +249,7 @@ public function __call($m, $args)
 			$m = substr($m, 3);
 			$m[0] = $m[0] | "\x20";
 			if ($p === 'get') {
-				return isset($this->attrs[$m]) ? $this->attrs[$m] : NULL;
+				return $this->attrs[$m] ?? NULL;
 
 			} elseif ($p === 'add') {
 				$args[] = TRUE;
diff --git a/src/Utils/Json.php b/src/Utils/Json.php
@@ -39,7 +39,7 @@ public static function encode($value, $options = 0)
 		}
 
 		if (PHP_VERSION_ID < 70100) {
-			$json = str_replace(["\xe2\x80\xa8", "\xe2\x80\xa9"], ['\u2028', '\u2029'], $json);
+			$json = str_replace(["\u{2028}", "\u{2029}"], ['\u2028', '\u2029'], $json);
 		}
 
 		return $json;
diff --git a/src/Utils/Strings.php b/src/Utils/Strings.php
@@ -18,7 +18,7 @@ class Strings
 {
 	use Nette\StaticClass;
 
-	const TRIM_CHARACTERS = " \t\n\r\0\x0B\xC2\xA0";
+	const TRIM_CHARACTERS = " \t\n\r\0\x0B\u{A0}";
 
 
 	/**
@@ -163,15 +163,15 @@ public static function toAscii($s)
 		$s = preg_replace('#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{2FF}\x{370}-\x{10FFFF}]#u', '', $s);
 		$s = strtr($s, '`\'"^~?', "\x01\x02\x03\x04\x05\x06");
 		$s = str_replace(
-			["\xE2\x80\x9E", "\xE2\x80\x9C", "\xE2\x80\x9D", "\xE2\x80\x9A", "\xE2\x80\x98", "\xE2\x80\x99", "\xC2\xB0"],
+			["\u{201E}", "\u{201C}", "\u{201D}", "\u{201A}", "\u{2018}", "\u{2019}", "\u{B0}"],
 			["\x03", "\x03", "\x03", "\x02", "\x02", "\x02", "\x04"], $s
 		);
 		if ($transliterator !== NULL) {
 			$s = $transliterator->transliterate($s);
 		}
 		if (ICONV_IMPL === 'glibc') {
 			$s = str_replace(
-				["\xC2\xBB", "\xC2\xAB", "\xE2\x80\xA6", "\xE2\x84\xA2", "\xC2\xA9", "\xC2\xAE"],
+				["\u{BB}", "\u{AB}", "\u{2026}", "\u{2122}", "\u{A9}", "\u{AE}"],
 				['>>', '<<', '...', 'TM', '(c)', '(R)'], $s
 			);
 			$s = iconv('UTF-8', 'WINDOWS-1250//TRANSLIT//IGNORE', $s);
@@ -216,7 +216,7 @@ public static function webalize($s, $charlist = NULL, $lower = TRUE)
 	 * @param  string  UTF-8 encoding
 	 * @return string
 	 */
-	public static function truncate($s, $maxLen, $append = "\xE2\x80\xA6")
+	public static function truncate(string $s, int $maxLen, string $append = "\u{2026}")
 	{
 		if (self::length($s) > $maxLen) {
 			$maxLen = $maxLen - self::length($append);
@@ -592,7 +592,7 @@ public static function pcre($func, $args)
 		if (($code = preg_last_error()) // run-time error, but preg_last_error & return code are liars
 			&& ($res === NULL || !in_array($func, ['preg_filter', 'preg_replace_callback', 'preg_replace']))
 		) {
-			throw new RegexpException((isset($messages[$code]) ? $messages[$code] : 'Unknown error')
+			throw new RegexpException(($messages[$code] ?? 'Unknown error')
 				. ' (pattern: ' . implode(' or ', (array) $args[0]) . ')', $code);
 		}
 		return $res;
diff --git a/src/Utils/Validators.php b/src/Utils/Validators.php
@@ -134,7 +134,7 @@ public static function is($value, $expected)
 					continue;
 				}
 			} elseif ($type === 'pattern') {
-				if (preg_match('|^' . (isset($item[1]) ? $item[1] : '') . '\z|', $value)) {
+				if (preg_match('|^' . ($item[1] ?? '') . '\z|', $value)) {
 					return TRUE;
 				}
 				continue;
diff --git a/tests/Utils/Json.encode().phpt b/tests/Utils/Json.encode().phpt
@@ -27,8 +27,8 @@ Assert::exception(function () {
 
 
 // default JSON_UNESCAPED_UNICODE + JSON_UNESCAPED_SLASHES
-Assert::same("\"/I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n\"", Json::encode("/I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n"));
-Assert::same('"\u2028\u2029"', Json::encode("\xe2\x80\xa8\xe2\x80\xa9"));
+Assert::same("\"/I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n\"", Json::encode("/I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n"));
+Assert::same('"\u2028\u2029"', Json::encode("\u{2028}\u{2029}"));
 
 // JSON_PRETTY_PRINT
 Assert::same("[\n    1,\n    2,\n    3\n]", Json::encode([1, 2, 3], Json::PRETTY));
diff --git a/tests/Utils/Strings.after().phpt b/tests/Utils/Strings.after().phpt
@@ -33,7 +33,7 @@ test(function () {
 
 
 test(function () {
-	$foo = "I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n"; // Iñtërnâtiônàlizætiøn
-	Assert::same("\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n", Strings::after($foo, 'ti', 1));
-	Assert::same("\xc3\xb8n", Strings::after($foo, 'ti', 2));
+	$foo = "I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n"; // Iñtërnâtiônàlizætiøn
+	Assert::same("\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n", Strings::after($foo, 'ti', 1));
+	Assert::same("\u{F8}n", Strings::after($foo, 'ti', 2));
 });
diff --git a/tests/Utils/Strings.before().phpt b/tests/Utils/Strings.before().phpt
@@ -32,7 +32,7 @@ test(function () {
 
 
 test(function () {
-	$foo = "I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n"; // Iñtërnâtiônàlizætiøn
-	Assert::same("I\xc3\xb1t\xc3\xabrn\xc3\xa2", Strings::before($foo, 'ti', 1));
-	Assert::same("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6", Strings::before($foo, 'ti', 2));
+	$foo = "I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n"; // Iñtërnâtiônàlizætiøn
+	Assert::same("I\u{F1}t\u{EB}rn\u{E2}", Strings::before($foo, 'ti', 1));
+	Assert::same("I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}", Strings::before($foo, 'ti', 2));
 });
diff --git a/tests/Utils/Strings.checkEncoding().phpt b/tests/Utils/Strings.checkEncoding().phpt
@@ -11,7 +11,7 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::true(Strings::checkEncoding("\xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd")); // UTF-8   žluťoučký
+Assert::true(Strings::checkEncoding("\u{17E}lu\u{165}ou\u{10D}k\u{FD}")); // UTF-8   žluťoučký
 Assert::true(Strings::checkEncoding("\x01")); // C0
 Assert::false(Strings::checkEncoding("\xed\xa0\x80")); // surrogate pairs   xD800
 Assert::false(Strings::checkEncoding("\xf4\x90\x80\x80")); // out of range   x110000
diff --git a/tests/Utils/Strings.chr().phpt b/tests/Utils/Strings.chr().phpt
@@ -13,14 +13,14 @@ require __DIR__ . '/../bootstrap.php';
 
 Assert::same("\x00", Strings::chr(0x000000));
 Assert::same("\x7F", Strings::chr(0x00007F));
-Assert::same("\xC2\x80", Strings::chr(0x000080));
-Assert::same("\xDF\xBF", Strings::chr(0x0007FF));
-Assert::same("\xE0\xA0\x80", Strings::chr(0x000800));
-Assert::same("\xED\x9F\xBF", Strings::chr(0x00D7FF));
-Assert::same("\xEE\x80\x80", Strings::chr(0x00E000));
-Assert::same("\xEF\xBF\xBF", Strings::chr(0x00FFFF));
-Assert::same("\xF0\x90\x80\x80", Strings::chr(0x010000));
-Assert::same("\xF4\x8F\xBF\xBF", Strings::chr(0x10FFFF));
+Assert::same("\u{80}", Strings::chr(0x000080));
+Assert::same("\u{7FF}", Strings::chr(0x0007FF));
+Assert::same("\u{800}", Strings::chr(0x000800));
+Assert::same("\u{D7FF}", Strings::chr(0x00D7FF));
+Assert::same("\u{E000}", Strings::chr(0x00E000));
+Assert::same("\u{FFFF}", Strings::chr(0x00FFFF));
+Assert::same("\u{10000}", Strings::chr(0x010000));
+Assert::same("\u{10FFFF}", Strings::chr(0x10FFFF));
 
 foreach ([-1, 0xD800, 0xDFFF, 0x110000] as $code) {
 	Assert::exception(function () use ($code) {
diff --git a/tests/Utils/Strings.compare().phpt b/tests/Utils/Strings.compare().phpt
@@ -20,5 +20,5 @@ Assert::true(Strings::compare('xy', 'xx', 1));
 Assert::false(Strings::compare('xy', 'yy', 1));
 Assert::true(Strings::compare('xy', 'yy', -1));
 Assert::true(Strings::compare('xy', 'yy', -1));
-Assert::true(Strings::compare("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n", "I\xc3\x91T\xc3\x8bRN\xc3\x82TI\xc3\x94N\xc3\x80LIZ\xc3\x86TI\xc3\x98N")); // Iñtërnâtiônàlizætiøn
-Assert::true(Strings::compare("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n", "I\xc3\x91T\xc3\x8bRN\xc3\x82TI\xc3\x94N\xc3\x80LIZ\xc3\x86TI\xc3\x98N", 10));
+Assert::true(Strings::compare("I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n", "I\u{D1}T\u{CB}RN\u{C2}TI\u{D4}N\u{C0}LIZ\u{C6}TI\u{D8}N")); // Iñtërnâtiônàlizætiøn
+Assert::true(Strings::compare("I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n", "I\u{D1}T\u{CB}RN\u{C2}TI\u{D4}N\u{C0}LIZ\u{C6}TI\u{D8}N", 10));
diff --git a/tests/Utils/Strings.findPrefix().phpt b/tests/Utils/Strings.findPrefix().phpt
@@ -25,10 +25,10 @@ Assert::same('a', Strings::findPrefix('a', 'ab'));
 Assert::same('a', Strings::findPrefix('aa', 'ab'));
 Assert::same('ab', Strings::findPrefix('ab', 'ab'));
 
-Assert::same("I\xc3\xb1e", Strings::findPrefix("I\xc3\xb1e", "I\xc3\xb1e"));
-Assert::same("I\xc3\xb1", Strings::findPrefix("I\xc3\xb1", "I\xc3\xb1"));
-Assert::same('I', Strings::findPrefix("I\xc3\xb2", "I\xc3\xb1"));
-Assert::same('I', Strings::findPrefix("I\xc4\xb1", "I\xc3\xb1"));
+Assert::same("I\u{F1}e", Strings::findPrefix("I\u{F1}e", "I\u{F1}e"));
+Assert::same("I\u{F1}", Strings::findPrefix("I\u{F1}", "I\u{F1}"));
+Assert::same('I', Strings::findPrefix("I\u{F2}", "I\u{F1}"));
+Assert::same('I', Strings::findPrefix("I\u{131}", "I\u{F1}"));
 
 Assert::same('', Strings::findPrefix(['', '']));
 Assert::same('', Strings::findPrefix(['', '', '']));
diff --git a/tests/Utils/Strings.fixEncoding().phpt b/tests/Utils/Strings.fixEncoding().phpt
@@ -14,8 +14,8 @@ require __DIR__ . '/../bootstrap.php';
 // http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
 $tests = [
 	'1  Some correct UTF-8 text' => [
-		"\xCE\xBA\xE1\xBD\xB9\xCF\x83\xCE\xBC\xCE\xB5",
-		"\xCE\xBA\xE1\xBD\xB9\xCF\x83\xCE\xBC\xCE\xB5",
+		"\u{3BA}\u{1F79}\u{3C3}\u{3BC}\u{3B5}",
+		"\u{3BA}\u{1F79}\u{3C3}\u{3BC}\u{3B5}",
 	],
 	'2  Boundary condition test cases' => [
 		'2.1  First possible sequence of a certain length' => [
@@ -24,16 +24,16 @@ $tests = [
 				"\x00",
 			],
 			'2.1.2  2 bytes (U-00000080)' => [
-				"\xC2\x80",
-				"\xC2\x80",
+				"\u{80}",
+				"\u{80}",
 			],
 			'2.1.3  3 bytes (U-00000800)' => [
-				"\xE0\xA0\x80",
-				"\xE0\xA0\x80",
+				"\u{800}",
+				"\u{800}",
 			],
 			'2.1.4  4 bytes (U-00010000)' => [
-				"\xF0\x90\x80\x80",
-				"\xF0\x90\x80\x80",
+				"\u{10000}",
+				"\u{10000}",
 			],
 			'2.1.5  5 bytes (U-00200000)' => [
 				"\xF8\x88\x80\x80\x80",
@@ -50,12 +50,12 @@ $tests = [
 				"\x7F",
 			],
 			'2.2.2  2 bytes (U-000007FF)' => [
-				"\xDF\xBF",
-				"\xDF\xBF",
+				"\u{7FF}",
+				"\u{7FF}",
 			],
 			'2.2.3  3 bytes (U-0000FFFF)' => [
-				"\xEF\xBF\xBF",
-				"\xEF\xBF\xBF",
+				"\u{FFFF}",
+				"\u{FFFF}",
 			],
 			'2.2.4  4 bytes (U-001FFFFF)' => [
 				"\xF7\xBF\xBF\xBF",
@@ -72,20 +72,20 @@ $tests = [
 		],
 		'2.3  Other boundary conditions' => [
 			'2.3.1  U-0000D7FF' => [
-				"\xED\x9F\xBF",
-				"\xED\x9F\xBF",
+				"\u{D7FF}",
+				"\u{D7FF}",
 			],
 			'2.3.2  U-0000E000' => [
-				"\xEE\x80\x80",
-				"\xEE\x80\x80",
+				"\u{E000}",
+				"\u{E000}",
 			],
 			'2.3.3  U-0000FFFD' => [
-				"\xEF\xBF\xBD",
-				"\xEF\xBF\xBD",
+				"\u{FFFD}",
+				"\u{FFFD}",
 			],
 			'2.3.4  U-0010FFFF' => [
-				"\xF4\x8F\xBF\xBF",
-				"\xF4\x8F\xBF\xBF",
+				"\u{10FFFF}",
+				"\u{10FFFF}",
 			],
 			'2.3.5  U-00110000' => [
 				"\xF4\x90\x80\x80",
@@ -351,12 +351,12 @@ $tests = [
 		// noncharacters are allowed according to http://www.unicode.org/versions/corrigendum9.html
 		'5.3 Other illegal code positions' => [
 			'5.3.1  U+FFFE = ef bf be' => [
-				"\xEF\xBF\xBE",
-				"\xEF\xBF\xBE",
+				"\u{FFFE}",
+				"\u{FFFE}",
 			],
 			'5.3.2  U+FFFF = ef bf bf' => [
-				"\xEF\xBF\xBF",
-				"\xEF\xBF\xBF",
+				"\u{FFFF}",
+				"\u{FFFF}",
 			],
 		],
 	],
diff --git a/tests/Utils/Strings.indexOf().phpt b/tests/Utils/Strings.indexOf().phpt
@@ -33,8 +33,8 @@ test(function () {
 
 
 test(function () {
-	$foo = "I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n"; // Iñtërnâtiônàlizætiøn
+	$foo = "I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n"; // Iñtërnâtiônàlizætiøn
 	Assert::same(7, Strings::indexOf($foo, 'ti', 1));
 	Assert::same(16, Strings::indexOf($foo, 'ti', 2));
-	Assert::same(3, Strings::indexOf($foo, "\xc3\xab"));
+	Assert::same(3, Strings::indexOf($foo, "\u{EB}"));
 });
diff --git a/tests/Utils/Strings.length().phpt b/tests/Utils/Strings.length().phpt
@@ -12,7 +12,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 Assert::same(0, Strings::length(''));
-Assert::same(20, Strings::length("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n")); // Iñtërnâtiônàlizætiøn
-Assert::same(1, Strings::length("\xF0\x90\x80\x80")); // U+010000
-Assert::same(6, Strings::length("ma\xC3\xB1ana"));   // mañana, U+00F1
-Assert::same(7, Strings::length("man\xCC\x83ana"));  // mañana, U+006E + U+0303 (combining character)
+Assert::same(20, Strings::length("I\u{F1}t\u{EB}rn\u{E2}ti\u{F4}n\u{E0}liz\u{E6}ti\u{F8}n")); // Iñtërnâtiônàlizætiøn
+Assert::same(1, Strings::length("\u{10000}")); // U+010000
+Assert::same(6, Strings::length("ma\u{F1}ana"));   // mañana, U+00F1
+Assert::same(7, Strings::length("man\u{303}ana"));  // mañana, U+006E + U+0303 (combining character)
diff --git a/tests/Utils/Strings.normalize().phpt b/tests/Utils/Strings.normalize().phpt
@@ -18,6 +18,6 @@ Assert::same('Hello  World',  Strings::normalize("Hello \x0B World"));
 Assert::same('Hello  World',  Strings::normalize("Hello \x1F World"));
 Assert::same("Hello \x7E World",  Strings::normalize("Hello \x7E World"));
 Assert::same('Hello  World',  Strings::normalize("Hello \x7F World"));
-Assert::same('Hello  World',  Strings::normalize("Hello \xC2\x80 World"));
-Assert::same('Hello  World',  Strings::normalize("Hello \xC2\x9F World"));
-Assert::same("Hello \xC2\xA0 World",  Strings::normalize("Hello \xC2\xA0 World"));
+Assert::same('Hello  World',  Strings::normalize("Hello \u{80} World"));
+Assert::same('Hello  World',  Strings::normalize("Hello \u{9F} World"));
+Assert::same("Hello \u{A0} World",  Strings::normalize("Hello \u{A0} World"));
diff --git a/tests/Utils/Strings.pad.phpt b/tests/Utils/Strings.pad.phpt
@@ -11,21 +11,21 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::same('ŤOUŤOUŤŽLU', Strings::padLeft("\xc5\xbdLU", 10, "\xc5\xa4OU"));
-Assert::same('ŤOUŤOUŽLU', Strings::padLeft("\xc5\xbdLU", 9, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padLeft("\xc5\xbdLU", 3, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padLeft("\xc5\xbdLU", 0, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padLeft("\xc5\xbdLU", -1, "\xc5\xa4OU"));
-Assert::same('ŤŤŤŤŤŤŤŽLU', Strings::padLeft("\xc5\xbdLU", 10, "\xc5\xa4"));
-Assert::same('ŽLU', Strings::padLeft("\xc5\xbdLU", 3, "\xc5\xa4"));
-Assert::same('       ŽLU', Strings::padLeft("\xc5\xbdLU", 10));
-
-
-Assert::same('ŽLUŤOUŤOUŤ', Strings::padRight("\xc5\xbdLU", 10, "\xc5\xa4OU"));
-Assert::same('ŽLUŤOUŤOU', Strings::padRight("\xc5\xbdLU", 9, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padRight("\xc5\xbdLU", 3, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padRight("\xc5\xbdLU", 0, "\xc5\xa4OU"));
-Assert::same('ŽLU', Strings::padRight("\xc5\xbdLU", -1, "\xc5\xa4OU"));
-Assert::same('ŽLUŤŤŤŤŤŤŤ', Strings::padRight("\xc5\xbdLU", 10, "\xc5\xa4"));
-Assert::same('ŽLU', Strings::padRight("\xc5\xbdLU", 3, "\xc5\xa4"));
-Assert::same('ŽLU       ', Strings::padRight("\xc5\xbdLU", 10));
+Assert::same('ŤOUŤOUŤŽLU', Strings::padLeft("\u{17D}LU", 10, "\u{164}OU"));
+Assert::same('ŤOUŤOUŽLU', Strings::padLeft("\u{17D}LU", 9, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padLeft("\u{17D}LU", 3, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padLeft("\u{17D}LU", 0, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padLeft("\u{17D}LU", -1, "\u{164}OU"));
+Assert::same('ŤŤŤŤŤŤŤŽLU', Strings::padLeft("\u{17D}LU", 10, "\u{164}"));
+Assert::same('ŽLU', Strings::padLeft("\u{17D}LU", 3, "\u{164}"));
+Assert::same('       ŽLU', Strings::padLeft("\u{17D}LU", 10));
+
+
+Assert::same('ŽLUŤOUŤOUŤ', Strings::padRight("\u{17D}LU", 10, "\u{164}OU"));
+Assert::same('ŽLUŤOUŤOU', Strings::padRight("\u{17D}LU", 9, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padRight("\u{17D}LU", 3, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padRight("\u{17D}LU", 0, "\u{164}OU"));
+Assert::same('ŽLU', Strings::padRight("\u{17D}LU", -1, "\u{164}OU"));
+Assert::same('ŽLUŤŤŤŤŤŤŤ', Strings::padRight("\u{17D}LU", 10, "\u{164}"));
+Assert::same('ŽLU', Strings::padRight("\u{17D}LU", 3, "\u{164}"));
+Assert::same('ŽLU       ', Strings::padRight("\u{17D}LU", 10));
diff --git a/tests/Utils/Strings.reverse().phpt b/tests/Utils/Strings.reverse().phpt
@@ -11,13 +11,13 @@ use Tester\Assert;
 require __DIR__ . '/../bootstrap.php';
 
 
-$t1 = "\x60,\xc8\xb6,\xe0\xb8\xa2,\xf0\xa0\x81\xa2";
-$t2 = "\xf0\xa0\x81\xa2,\xe0\xb8\xa2,\xc8\xb6,\x60";
+$t1 = "\x60,\u{236},\u{E22},\u{20062}";
+$t2 = "\u{20062},\u{E22},\u{236},\x60";
 $r1 = Strings::reverse($t1);
 $r2 = Strings::reverse($t2);
 
 Assert::same($t1, $r2);
 Assert::same($t2, $r1);
 
-Assert::same("ana\xC3\xB1am", Strings::reverse("ma\xC3\xB1ana"));   // mañana -> anañam, U+00F1
-Assert::same("ana\xCC\x83nam", Strings::reverse("man\xCC\x83ana")); // mañana -> anãnam, U+006E + U+0303 (combining character)
+Assert::same("ana\u{F1}am", Strings::reverse("ma\u{F1}ana"));   // mañana -> anañam, U+00F1
+Assert::same("ana\u{303}nam", Strings::reverse("man\u{303}ana")); // mañana -> anãnam, U+006E + U+0303 (combining character)
diff --git a/tests/Utils/Strings.substring().phpt b/tests/Utils/Strings.substring().phpt
diff --git a/tests/Utils/Strings.toAscii().phpt b/tests/Utils/Strings.toAscii().phpt
diff --git a/tests/Utils/Strings.trim().phpt b/tests/Utils/Strings.trim().phpt
diff --git a/tests/Utils/Strings.truncate().phpt b/tests/Utils/Strings.truncate().phpt
diff --git a/tests/Utils/Strings.webalize().phpt b/tests/Utils/Strings.webalize().phpt

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function el($name = NULL, $attrs = NULL)`
`70`	`70`
`71`	`71`	`if (isset($parts[1])) {`
`72`	`72`	`foreach (Strings::matchAll($parts[1] . ' ', '#([a-z0-9:-]+)(?:=(["\'])?(.*?)(?(2)\\2\|\s))?#i') as $m) {`
`73`		`- $el->attrs[$m[1]] = isset($m[3]) ? $m[3] : TRUE;`
	`73`	`+ $el->attrs[$m[1]] = $m[3] ?? TRUE;`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`@@ -175,7 +175,7 @@ public function setAttribute($name, $value)`
`175`	`175`	`*/`
`176`	`176`	`public function getAttribute($name)`
`177`	`177`	`{`
`178`		`- return isset($this->attrs[$name]) ? $this->attrs[$name] : NULL;`
	`178`	`+ return $this->attrs[$name] ?? NULL;`
`179`	`179`	`}`
`180`	`180`
`181`	`181`
`@@ -249,7 +249,7 @@ public function __call($m, $args)`
`249`	`249`	`$m = substr($m, 3);`
`250`	`250`	`$m[0] = $m[0] \| "\x20";`
`251`	`251`	`if ($p === 'get') {`
`252`		`- return isset($this->attrs[$m]) ? $this->attrs[$m] : NULL;`
	`252`	`+ return $this->attrs[$m] ?? NULL;`
`253`	`253`
`254`	`254`	`} elseif ($p === 'add') {`
`255`	`255`	`$args[] = TRUE;`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static function encode($value, $options = 0)`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (PHP_VERSION_ID < 70100) {`
`42`		`- $json = str_replace(["\xe2\x80\xa8", "\xe2\x80\xa9"], ['\u2028', '\u2029'], $json);`
	`42`	`+ $json = str_replace(["\u{2028}", "\u{2029}"], ['\u2028', '\u2029'], $json);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`return $json;`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public static function is($value, $expected)`
`134`	`134`	`continue;`
`135`	`135`	`}`
`136`	`136`	`} elseif ($type === 'pattern') {`
`137`		`- if (preg_match('\|^' . (isset($item[1]) ? $item[1] : '') . '\z\|', $value)) {`
	`137`	`+ if (preg_match('\|^' . ($item[1] ?? '') . '\z\|', $value)) {`
`138`	`138`	`return TRUE;`
`139`	`139`	`}`
`140`	`140`	`continue;`