From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 8 Sep 2016 06:18:47 +0000 (-0700)
Subject: JsonContentHandler: Make sure makeEmptyContent() is valid JSON
X-Git-Tag: 1.31.0-rc.0~5680^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=bb8fff662a1745c88c68beac45749bfd25755187;p=lhc%2Fweb%2Fwiklou.git

JsonContentHandler: Make sure makeEmptyContent() is valid JSON

The default TextContentHandler::makeEmptyContent() implementation
is an empty string, which is not valid JSON.

Change-Id: I8bc6ec647c5e8cd01c5cd63031525619c4ef44d0
---

diff --git a/includes/content/JsonContentHandler.php b/includes/content/JsonContentHandler.php
index eb1c67d5d2..edb21f682c 100644
--- a/includes/content/JsonContentHandler.php
+++ b/includes/content/JsonContentHandler.php
@@ -39,4 +39,9 @@ class JsonContentHandler extends CodeContentHandler {
 	protected function getContentClass() {
 		return JsonContent::class;
 	}
+
+	public function makeEmptyContent() {
+		$class = $this->getContentClass();
+		return new $class( '{}' );
+	}
 }
diff --git a/tests/phpunit/includes/content/JsonContentHandlerTest.php b/tests/phpunit/includes/content/JsonContentHandlerTest.php
new file mode 100644
index 0000000000..abfb6733a5
--- /dev/null
+++ b/tests/phpunit/includes/content/JsonContentHandlerTest.php
@@ -0,0 +1,14 @@
+<?php
+
+class JsonContentHandlerTest extends MediaWikiTestCase {
+
+	/**
+	 * @covers JsonContentHandler::makeEmptyContent
+	 */
+	public function testMakeEmptyContent() {
+		$handler = new JsonContentHandler();
+		$content = $handler->makeEmptyContent();
+		$this->assertInstanceOf( JsonContent::class, $content );
+		$this->assertTrue( $content->isValid() );
+	}
+}