TPCStorage: Throw a more useful error when trying to merge invalid JSON.

nmlgc · nmlgc · commit 2a248e533626 · 2023-01-22T21:45:38.000+01:00
Since some files are built from multiple wiki pages, this is better
than silently overwriting the file.
diff --git a/TPCStorage.php b/TPCStorage.php
@@ -68,6 +68,11 @@ protected static function mergeOldFile( &$server, &$array, &$fn, &$changed ) {
 			return $array;
 		}
 		$oldArray = json_decode( $oldJson, true );
+		if ( $oldArray === null ) {
+			throw new MWException(
+				"`$fn` is invalid JSON. Ask an admin to fix the error on the server."
+			);
+		}
 		return self::arrayMergeRecursiveDistinct( $oldArray, $array, $changed );
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,11 @@ protected static function mergeOldFile( &$server, &$array, &$fn, &$changed ) {`
`68`	`68`	`return $array;`
`69`	`69`	`}`
`70`	`70`	`$oldArray = json_decode( $oldJson, true );`
	`71`	`+ if ( $oldArray === null ) {`
	`72`	`+ throw new MWException(`
	`73`	+ "`$fn` is invalid JSON. Ask an admin to fix the error on the server."
	`74`	`+ );`
	`75`	`+ }`
`71`	`76`	`return self::arrayMergeRecursiveDistinct( $oldArray, $array, $changed );`
`72`	`77`	`}`
`73`	`78`