uses mb_string when iconv is not available

nette · Feb 28, 2021 · e4ca6f4 · e4ca6f4
1 parent f6d8ff8
commit e4ca6f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,6 @@
  ],
  "require": {
  "php": ">=7.1",
- "ext-iconv": "*",
  "ext-json": "*"
  },
  "require-dev": {

diff --git a/src/Neon/Decoder.php b/src/Neon/Decoder.php
@@ -367,10 +367,14 @@ private function cbString(array $m): string
  if ($code >= 0xD800 && $code <= 0xDFFF) {
  $this->error("Invalid UTF-8 (lone surrogate) $sq");
  }
- return iconv('UTF-32BE', 'UTF-8//IGNORE', pack('N', $code));
+ return function_exists('iconv')
+ ? iconv('UTF-32BE', 'UTF-8//IGNORE', pack('N', $code))
+ : mb_convert_encoding(pack('N', $code), 'UTF-8', 'UTF-32BE');
+
  } 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)));
+
  } else {
  $this->error("Invalid escaping sequence $sq");
  }