Update to MediaWiki 1.24.1

1 files changed, 120 insertions, 0 deletions

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
new file mode 100644
index 00000000..b36827c5
--- /dev/null
+++ b/includes/content/JsonContent.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * JSON Content Model
+ *
+ * @file
+ *
+ * @author Ori Livneh <ori@wikimedia.org>
+ * @author Kunal Mehta <legoktm@gmail.com>
+ */
+
+/**
+ * Represents the content of a JSON content.
+ * @since 1.24
+ */
+class JsonContent extends TextContent {
+
+	public function __construct( $text, $modelId = CONTENT_MODEL_JSON ) {
+		parent::__construct( $text, $modelId );
+	}
+
+	/**
+	 * Decodes the JSON into a PHP associative array.
+	 * @return array
+	 */
+	public function getJsonData() {
+		return FormatJson::decode( $this->getNativeData(), true );
+	}
+
+	/**
+	 * @return bool Whether content is valid JSON.
+	 */
+	public function isValid() {
+		return $this->getJsonData() !== null;
+	}
+
+	/**
+	 * Pretty-print JSON
+	 *
+	 * @return bool|null|string
+	 */
+	public function beautifyJSON() {
+		$decoded = FormatJson::decode( $this->getNativeData(), true );
+		if ( !is_array( $decoded ) ) {
+			return null;
+		}
+		return FormatJson::encode( $decoded, true );
+
+	}
+
+	/**
+	 * Beautifies JSON prior to save.
+	 * @param Title $title Title
+	 * @param User $user User
+	 * @param ParserOptions $popts
+	 * @return JsonContent
+	 */
+	public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) {
+		return new static( $this->beautifyJSON() );
+	}
+
+	/**
+	 * Set the HTML and add the appropriate styles
+	 *
+	 *
+	 * @param Title $title
+	 * @param int $revId
+	 * @param ParserOptions $options
+	 * @param bool $generateHtml
+	 * @param ParserOutput $output
+	 */
+	protected function fillParserOutput( Title $title, $revId,
+		ParserOptions $options, $generateHtml, ParserOutput &$output
+	) {
+		if ( $generateHtml ) {
+			$output->setText( $this->objectTable( $this->getJsonData() ) );
+			$output->addModuleStyles( 'mediawiki.content.json' );
+		} else {
+			$output->setText( '' );
+		}
+	}
+	/**
+	 * Constructs an HTML representation of a JSON object.
+	 * @param array $mapping
+	 * @return string HTML
+	 */
+	protected function objectTable( $mapping ) {
+		$rows = array();
+
+		foreach ( $mapping as $key => $val ) {
+			$rows[] = $this->objectRow( $key, $val );
+		}
+		return Xml::tags( 'table', array( 'class' => 'mw-json' ),
+			Xml::tags( 'tbody', array(), join( "\n", $rows ) )
+		);
+	}
+
+	/**
+	 * Constructs HTML representation of a single key-value pair.
+	 * @param string $key
+	 * @param mixed $val
+	 * @return string HTML.
+	 */
+	protected function objectRow( $key, $val ) {
+		$th = Xml::elementClean( 'th', array(), $key );
+		if ( is_array( $val ) ) {
+			$td = Xml::tags( 'td', array(), self::objectTable( $val ) );
+		} else {
+			if ( is_string( $val ) ) {
+				$val = '"' . $val . '"';
+			} else {
+				$val = FormatJson::encode( $val );
+			}
+
+			$td = Xml::elementClean( 'td', array( 'class' => 'value' ), $val );
+		}
+
+		return Xml::tags( 'tr', array(), $th . $td );
+	}
+
+}