From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Mon, 12 Aug 2013 09:28:15 +0200
Subject: Update to MediaWiki 1.21.1

---
 includes/json/FormatJson.php    | 19 +++++++------------
 includes/json/Services_JSON.php | 24 ++++++++++++------------
 2 files changed, 19 insertions(+), 24 deletions(-)

(limited to 'includes/json')

diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index f67700c9..eececcba 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Simple wrapper for json_econde and json_decode that falls back on Services_JSON class.
+ * Simple wrapper for json_encode and json_decode that falls back on Services_JSON class.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,28 +31,23 @@ class FormatJson {
 	 * Returns the JSON representation of a value.
 	 *
 	 * @param $value Mixed: the value being encoded. Can be any type except a resource.
-	 * @param $isHtml Boolean
-	 *
-	 * @todo FIXME: "$isHtml" parameter's purpose is not documented. It appears to
-	 *        map to a parameter labeled "pretty-print output with indents and
-	 *        newlines" in Services_JSON::encode(), which has no string relation
-	 *        to HTML output.
+	 * @param $pretty Boolean: If true, adds non-significant whitespace to improve readability.
 	 *
 	 * @return string
 	 */
-	public static function encode( $value, $isHtml = false ) {
-		if ( !function_exists( 'json_encode' ) || ( $isHtml && version_compare( PHP_VERSION, '5.4.0', '<' ) ) ) {
+	public static function encode( $value, $pretty = false ) {
+		if ( !function_exists( 'json_encode' ) || ( $pretty && version_compare( PHP_VERSION, '5.4.0', '<' ) ) ) {
 			$json = new Services_JSON();
-			return $json->encode( $value, $isHtml );
+			return $json->encode( $value, $pretty );
 		} else {
-			return json_encode( $value, $isHtml ? JSON_PRETTY_PRINT : 0 );
+			return json_encode( $value, $pretty ? JSON_PRETTY_PRINT : 0 );
 		}
 	}
 
 	/**
 	 * Decodes a JSON string.
 	 *
-	 * @param $value String: the json string being decoded.
+	 * @param string $value the json string being decoded.
 	 * @param $assoc Boolean: when true, returned objects will be converted into associative arrays.
 	 *
 	 * @return Mixed: the value encoded in json in appropriate PHP type.
diff --git a/includes/json/Services_JSON.php b/includes/json/Services_JSON.php
index 398ed6a2..b7c101a1 100644
--- a/includes/json/Services_JSON.php
+++ b/includes/json/Services_JSON.php
@@ -100,7 +100,7 @@ define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
  * // create a new instance of Services_JSON
  * $json = new Services_JSON();
  *
- * // convert a complexe value to JSON notation, and send it to the browser
+ * // convert a complex value to JSON notation, and send it to the browser
  * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
  * $output = $json->encode($value);
  *
@@ -155,9 +155,9 @@ class Services_JSON
 	 *
 	 * Normally should be handled by mb_convert_encoding, but
 	 * provides a slower PHP-only method for installations
-	 * that lack the multibye string extension.
+	 * that lack the multibyte string extension.
 	 *
-	 * @param $utf16 String: UTF-16 character
+	 * @param string $utf16 UTF-16 character
 	 * @return String: UTF-8 character
 	 * @access private
 	 */
@@ -210,9 +210,9 @@ class Services_JSON
 	 *
 	 * Normally should be handled by mb_convert_encoding, but
 	 * provides a slower PHP-only method for installations
-	 * that lack the multibye string extension.
+	 * that lack the multibyte string extension.
 	 *
-	 * @param $utf8 String: UTF-8 character
+	 * @param string $utf8 UTF-8 character
 	 * @return String: UTF-16 character
 	 * @access private
 	 */
@@ -268,7 +268,7 @@ class Services_JSON
 	 *
 	 * @param $var Mixed: any number, boolean, string, array, or object to be encoded.
 	 *			see argument 1 to Services_JSON() above for array-parsing behavior.
-	 *			if var is a strng, note that encode() always expects it
+	 *			if var is a string, note that encode() always expects it
 	 *			to be in ASCII or UTF-8 format!
 	 * @param $pretty Boolean: pretty-print output with indents and newlines
 	 *
@@ -283,12 +283,12 @@ class Services_JSON
 		return $this->encode2($var);
 	}
 
-   	/**
+	/**
 	 * encodes an arbitrary variable into JSON format
 	 *
 	 * @param $var Mixed: any number, boolean, string, array, or object to be encoded.
 	 *			see argument 1 to Services_JSON() above for array-parsing behavior.
-	 *			if var is a strng, note that encode() always expects it
+	 *			if var is a string, note that encode() always expects it
 	 *			to be in ASCII or UTF-8 format!
 	 *
 	 * @return mixed JSON string representation of input var or an error if a problem occurs
@@ -424,7 +424,7 @@ class Services_JSON
 				*/
 
 				// treat as a JSON object
-				if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
 					$this->indent++;
 					$properties = array_map(array($this, 'name_value'),
 								array_keys($var),
@@ -480,7 +480,7 @@ class Services_JSON
 	/**
 	 * array-walking function for use in generating JSON-formatted name-value pairs
 	 *
-	 * @param $name String: name of key to use
+	 * @param string $name name of key to use
 	 * @param $value Mixed: reference to an array element to be encoded
 	 *
 	 * @return String: JSON-formatted name-value pair, like '"name":value'
@@ -500,7 +500,7 @@ class Services_JSON
 	/**
 	 * reduce a string by removing leading and trailing comments and whitespace
 	 *
-	 * @param $str String: string value to strip of comments and whitespace
+	 * @param string $str string value to strip of comments and whitespace
 	 *
 	 * @return String: string value stripped of comments and whitespace
 	 * @access private
@@ -527,7 +527,7 @@ class Services_JSON
 	/**
 	 * decodes a JSON string into appropriate variable
 	 *
-	 * @param $str String: JSON-formatted string
+	 * @param string $str JSON-formatted string
 	 *
 	 * @return mixed number, boolean, string, array, or object
 	 *		   corresponding to given JSON input string.
-- 
cgit v1.2.3-54-g00ecf