Merge pull request #106 from hamstar/assorted-fixes

Assorted fixes

CHANGELOG.md

@@ -6,16 +6,17 @@ Since v0.10.0 this project adheres to [Semantic Versioning](http://semver.org/)
 
 #### Added
 
-* Added more debug logging of MediaWiki requests and responses ([#101])
+* Added more debug logging of MediaWiki requests and responses ([#101], [#106])
 * New GOVERNANCE.md file to explicitly codify the project management principles and provide guidelines for maintenance tasks ([#83], [#105])
 
 #### Changed
 
-* Modernize token handling for login and data-modifying actions ([#100])
+* Modernize token handling for login and data-modifying actions ([#100], [#106])
 
 #### Fixed
 
 * Prevented PHP notice in `WikiFile::getInfo()` for moved or deleted file ([#85])
+* Fixed capitalization of a built-in PHP class in a comment ([#106])
 
 ### Version 0.12.0 - 2017-02-03
 
@@ -107,3 +108,4 @@ Since v0.10.0 this project adheres to [Semantic Versioning](http://semver.org/)
 [#100]: https://github.com/hamstar/Wikimate/pull/100
 [#101]: https://github.com/hamstar/Wikimate/pull/101
 [#105]: https://github.com/hamstar/Wikimate/pull/105
+[#106]: https://github.com/hamstar/Wikimate/pull/106

USAGE.md

@@ -300,6 +300,7 @@ print_r($page->getError());
 
 For MediaWiki API errors, the array contains the 'code' and 'info' key/value pairs [defined by the API](https://www.mediawiki.org/wiki/API:Errors_and_warnings#Errors).  For other errors, the following key/value pairs are returned:
 * 'login' for Wikimate authentication problems
+* 'token' for Wikimate token problems
 * 'page' for WikiPage errors
 * 'file' for WikiFile errors
 
@@ -309,7 +310,6 @@ You can use the edit and query commands in Wikimate:
 ```php
 $data = array(
 	'prop' => 'info|revisions',
-	'intoken' => 'edit',
 	'titles' => 'this|that|other'
 );
 
@@ -318,7 +318,6 @@ $array_result = $wiki->query($data);
 
 $data = array(
 	'title' => 'this',
-	'token' => '+\\', // this is urlencoded automatically
 	'etc' => 'stuff'
 );
 

Wikimate.php

@@ -66,6 +66,8 @@ protected function initRequests()
 	 * For now this method, in Wikimate tradition, is kept simple and supports
 	 * only the two token types needed elsewhere in the library.  It also
 	 * doesn't support the option to request multiple tokens at once.
+	 * See https://www.mediawiki.org/wiki/Special:MyLanguage/API:Tokens
+	 * for more information.
 	 *
 	 * @param   string  $type  The token type
 	 * @return  string         The requested token
@@ -75,7 +77,7 @@ protected function token($type = self::TOKEN_DEFAULT)
 		// Check for supported token types
 		if ($type != self::TOKEN_DEFAULT && $type != self::TOKEN_LOGIN) {
 			$this->error = array();
-			$this->error['login'] = 'The API does not support the token type';
+			$this->error['token'] = 'The API does not support the token type';
 			return false;
 		}
 
@@ -91,15 +93,15 @@ protected function token($type = self::TOKEN_DEFAULT)
 		// Check if we got an API result or the API doc page (invalid request)
 		if (strpos($response->body, "This is an auto-generated MediaWiki API documentation page") !== false) {
 			$this->error = array();
-			$this->error['login'] = 'The API could not understand the token request';
+			$this->error['token'] = 'The API could not understand the token request';
 			return false;
 		}
 
 		$tokenResult = json_decode($response->body);
 		// Check if we got a JSON result
 		if ($tokenResult === null) {
 			$this->error = array();
-			$this->error['login'] = 'The API did not return the token response';
+			$this->error['token'] = 'The API did not return the token response';
 			return false;
 		}
 
@@ -299,7 +301,7 @@ public function parse($array)
 
 		if ($this->debugMode) {
 			echo "parse GET response:\n";
-			print_r(json_decode($apiResult->body));
+			print_r(unserialize($apiResult->body));
 		}
 		return unserialize($apiResult->body);
 	}
@@ -608,7 +610,7 @@ public function getNumSections()
 	/**
 	 * Returns the sections offsets and lengths.
 	 *
-	 * @return  StdClass  Section class
+	 * @return  stdClass  Section class
 	 */
 	public function getSectionOffsets()
 	{