correct type hint warnings

Author: JBlond

lib/jblond/Diff/Renderer/Html/HtmlArray.php

@@ -98,7 +98,7 @@ public function mb_substr_replace($string, $replacement, $start, $length=NULL) {
 				$length = array_pad(array($length), $num, $length);
 			}
 			// Recursive call
-			return array_map(__FUNCTION__, $string, $replacement, $start, $length);
+			return array_map(array($this, 'mb_substr_replace'), $string, $replacement, $start, $length);
 		}
 		preg_match_all('/./us', (string)$string, $smatches);
 		preg_match_all('/./us', (string)$replacement, $rmatches);
@@ -112,7 +112,7 @@ public function mb_substr_replace($string, $replacement, $start, $length=NULL) {
 	 * based differences. Generally called by subclasses that generate a
 	 * HTML based diff and return an array of the changes to show in the diff.
 	 *
-	 * @return array An array of the generated changes, suitable for presentation in HTML.
+	 * @return array|string An array of the generated changes, suitable for presentation in HTML.
 	 */
 	public function render()
 	{
@@ -250,12 +250,12 @@ protected function fixSpaces($matches)
 			if($count == 0) {
 				continue;
 			}
-			$div = floor($count / 2);
+			$div = (int) floor($count / 2);
 			$mod = $count % 2;
 			$buffer	.= str_repeat('  ', $div).str_repeat(' ', $mod);
 		}
 
-		$div = floor($count / 2);
+		$div = (int) floor($count / 2);
 		$mod = $count % 2;
 		return str_repeat('  ', $div).str_repeat(' ', $mod);
 	}

lib/jblond/Diff/SequenceMatcher.php

@@ -74,17 +74,17 @@ class SequenceMatcher
 	private $options = array();
 
 	/**
-	 * @var
+	 * @var null|array
 	 */
 	private $opCodes;
 
 	/**
-	 * @var
+	 * @var null|array
 	 */
 	private $matchingBlocks;
 
 	/**
-	 * @var
+	 * @var null|array
 	 */
 	private $fullBCount;
 
@@ -105,7 +105,7 @@ class 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 array $options
-	 * @param string|array $junkCallback Either an array or string that references a callback function (if there is one) to determine 'junk' characters.
+	 * @param string|array|null $junkCallback Either an array or string that references a callback function (if there is one) to determine 'junk' characters.
 	 */
 	public function __construct($a, $b, $options, $junkCallback=null)
 	{
@@ -670,7 +670,7 @@ private function calculateRatio($matches, $length=0)
 	 * Essentially cleaner than doing a series of if(isset()) {} else {} calls.
 	 *
 	 * @param array $array The array to search.
-	 * @param string $key The key to check that exists.
+	 * @param string|int $key The key to check that exists.
 	 * @param mixed $default The value to return as the default value if the key doesn't exist.
 	 * @return mixed The value from the array if the key exists or otherwise the default.
 	 */