optional parameters should be the last parameter

Author: JBlond

lib/Diff.php

@@ -175,7 +175,7 @@ public function getGroupedOpcodes()
 		}
 
 		require_once dirname(__FILE__).'/Diff/SequenceMatcher.php';
-		$sequenceMatcher = new Diff_SequenceMatcher($this->a, $this->b, null, $this->options);
+		$sequenceMatcher = new Diff_SequenceMatcher($this->a, $this->b, $this->options, null);
 		$this->groupedCodes = $sequenceMatcher->getGroupedOpcodes($this->options['context']);
 		return $this->groupedCodes;
 	}

lib/Diff/Renderer/Html/Array.php

@@ -62,7 +62,7 @@ class Diff_Renderer_Html_Array extends Diff_Renderer_Abstract
 	* @param mixed $replacement The replacement string.
 	* @param mixed $start If start is positive, the replacing will begin at the start'th offset into string.  If start is negative, the replacing will begin at the start'th character from the end of string.
 	* @param mixed $length If given and is positive, it represents the length of the portion of string which is to be replaced. If it is negative, it represents the number of characters from the end of string at which to stop replacing. If it is not given, then it will default to strlen( string ); i.e. end the replacing at the end of string. Of course, if length is zero then this function will have the effect of inserting replacement into string at the given start offset.
-	* @return string The result string is returned. If string is an array then array is returned.
+	* @return string|array The result string is returned. If string is an array then array is returned.
 	*/
 	public function mb_substr_replace($string, $replacement, $start, $length=NULL) {
 		if (is_array($string)) {

lib/Diff/SequenceMatcher.php

@@ -103,10 +103,10 @@ class Diff_SequenceMatcher
 	 *
 	 * @param string|array $a A string or array containing the lines to compare against.
 	 * @param string|array $b A string or array containing the lines to compare.
-	 * @param string|array $junkCallback Either an array or string that references a callback function (if there is one) to determine 'junk' characters.
 	 * @param array $options
+	 * @param string|array $junkCallback Either an array or string that references a callback function (if there is one) to determine 'junk' characters.
 	 */
-	public function __construct($a, $b, $junkCallback=null, $options)
+	public function __construct($a, $b, $options, $junkCallback=null)
 	{
 		$this->a = null;
 		$this->b = null;