Introduce JsonCodec to help with serialization/deserialization

Change-Id: I5433090ae8e2b3f2a4590cc404baf838025546ce

1 files changed, 13 insertions, 30 deletions

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index ab04497e3f4c..f7da83d432fd 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -23,7 +23,7 @@
 
 use MediaWiki\HookContainer\HookContainer;
 use MediaWiki\HookContainer\HookRunner;
-use MediaWiki\Json\JsonUnserializer;
+use MediaWiki\Json\JsonCodec;
 use MediaWiki\Parser\ParserCacheMetadata;
 use Psr\Log\LoggerInterface;
 
@@ -96,8 +96,8 @@ class ParserCache {
 	/** @var HookRunner */
 	private $hookRunner;
 
-	/** @var JsonUnserializer */
-	private $jsonUnserializer;
+	/** @var JsonCodec */
+	private $jsonCodec;
 
 	/** @var IBufferingStatsdDataFactory */
 	private $stats;
@@ -127,7 +127,7 @@ class ParserCache {
 	 * @param BagOStuff $cache
 	 * @param string $cacheEpoch Anything before this timestamp is invalidated
 	 * @param HookContainer $hookContainer
-	 * @param JsonUnserializer $jsonUnserializer
+	 * @param JsonCodec $jsonCodec
 	 * @param IBufferingStatsdDataFactory $stats
 	 * @param LoggerInterface $logger
 	 * @param bool $useJson Temporary feature flag, remove before 1.36 is released.
@@ -137,7 +137,7 @@ class ParserCache {
 		BagOStuff $cache,
 		string $cacheEpoch,
 		HookContainer $hookContainer,
-		JsonUnserializer $jsonUnserializer,
+		JsonCodec $jsonCodec,
 		IBufferingStatsdDataFactory $stats,
 		LoggerInterface $logger,
 		$useJson = false
@@ -146,7 +146,7 @@ class ParserCache {
 		$this->cache = $cache;
 		$this->cacheEpoch = $cacheEpoch;
 		$this->hookRunner = new HookRunner( $hookContainer );
-		$this->jsonUnserializer = $jsonUnserializer;
+		$this->jsonCodec = $jsonCodec;
 		$this->stats = $stats;
 		$this->logger = $logger;
 		$this->readJson = $useJson;
@@ -597,10 +597,11 @@ class ParserCache {
 	private function restoreFromJson( string $jsonData, string $key, string $expectedClass ) {
 		try {
 			/** @var CacheTime $obj */
-			$obj = $this->jsonUnserializer->unserialize( $jsonData, $expectedClass );
+			$obj = $this->jsonCodec->unserialize( $jsonData, $expectedClass );
 			return $obj;
 		} catch ( InvalidArgumentException $e ) {
 			$this->logger->error( "Unable to unserialize JSON", [
+				'name' => $this->name,
 				'cache_key' => $key,
 				'message' => $e->getMessage()
 			] );
@@ -611,36 +612,18 @@ class ParserCache {
 	/**
 	 * @param CacheTime $obj
 	 * @param string $key
-	 *
 	 * @return string|null
 	 */
 	private function encodeAsJson( CacheTime $obj, string $key ) {
-		$data = $obj->jsonSerialize();
-		$json = FormatJson::encode( $data, false, FormatJson::ALL_OK );
-		if ( !$json ) {
-			$this->logger->error( "JSON encoding failed", [
-				'name' => $this->name,
-				'cache_key' => $key,
-				'json_error' => json_last_error(),
-			] );
-			return null;
-		}
-
-		// Detect if the array contained any properties non-serializable
-		// to json. We will not be able to deserialize the value correctly
-		// anyway, so return null. This is done after calling FormatJson::encode
-		// to avoid walking over circular structures.
-		$unserializablePath = FormatJson::detectNonSerializableData( $data, true );
-		if ( $unserializablePath ) {
-			$this->logger->error( 'Non-serializable {class} property set', [
-				'class' => get_class( $obj ),
+		try {
+			return $this->jsonCodec->serialize( $obj );
+		} catch ( InvalidArgumentException $e ) {
+			$this->logger->error( "Unable to serialize JSON", [
 				'name' => $this->name,
 				'cache_key' => $key,
-				'path' => $unserializablePath,
+				'message' => $e->getMessage(),
 			] );
 			return null;
 		}
-
-		return $json;
 	}
 }