drop old PHP workarounds

Author: milo

src/Github/Helpers.php

@@ -15,15 +15,6 @@
  */
 class Helpers
 {
-	private static $jsonMessages = [
-		JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded',
-		JSON_ERROR_STATE_MISMATCH => 'Syntax error, malformed JSON',
-		JSON_ERROR_CTRL_CHAR => 'Unexpected control character found',
-		JSON_ERROR_SYNTAX => 'Syntax error, malformed JSON',
-		JSON_ERROR_UTF8 => 'Invalid UTF-8 sequence',
-	];
-
-
 	/** @var Http\IClient */
 	private static $client;
 
@@ -36,28 +27,10 @@ class Helpers
 	 */
 	public static function jsonEncode($value)
 	{
-		if (PHP_VERSION_ID < 50500) {
-			set_error_handler(function($severity, $message) { // needed to receive 'recursion detected' error
-				restore_error_handler();
-				throw new JsonException($message);
-			});
-		}
-
 		$json = json_encode($value, JSON_UNESCAPED_UNICODE);
-
-		if (PHP_VERSION_ID < 50500) {
-			restore_error_handler();
-		}
-
 		if ($error = json_last_error()) {
-			$message = isset(static::$jsonMessages[$error])
-				? static::$jsonMessages[$error]
-				: (PHP_VERSION_ID >= 50500 ? json_last_error_msg() : 'Unknown error');
-
-			throw new JsonException($message, $error);
+			throw new JsonException(json_last_error_msg(), $error);
 		}
-
-		$json = str_replace(array("\xe2\x80\xa8", "\xe2\x80\xa9"), array('\u2028', '\u2029'), $json);
 		return $json;
 	}
 
@@ -70,16 +43,9 @@ public static function jsonEncode($value)
 	 */
 	public static function jsonDecode($json)
 	{
-		$json = (string) $json;
-		if (!preg_match('##u', $json)) {
-			throw new JsonException('Invalid UTF-8 sequence', 5); // PECL JSON-C
-		}
-
-		$value = json_decode($json, false, 512, (defined('JSON_C_VERSION') && PHP_INT_SIZE > 4) ? 0 : JSON_BIGINT_AS_STRING);
-
-		if ($value === null && $json !== '' && strcasecmp($json, 'null')) { // '' does not clear json_last_error()
-			$error = json_last_error();
-			throw new JsonException(isset(static::$jsonMessages[$error]) ? static::$jsonMessages[$error] : 'Unknown error', $error);
+		$value = json_decode((string) $json, false, 512, JSON_BIGINT_AS_STRING);
+		if ($error = json_last_error()) {
+			throw new JsonException(json_last_error_msg(), $error);
 		}
 		return $value;
 	}

tests/Github/OAuth/Login.phpt

@@ -141,7 +141,7 @@ class LoginTestCase extends Tester\TestCase
 		}, Milo\Github\OAuth\LoginException::class, 'Bad JSON in response.');
 		$e = Assert::exception(function() use ($e) {
 			throw $e->getPrevious();
-		}, Milo\Github\JsonException::class, 'Syntax error, malformed JSON');
+		}, Milo\Github\JsonException::class, 'Syntax error');
 		Assert::null($e->getPrevious());
 	}