Add typehints.

Lib/DiffLib.php

@@ -122,7 +122,7 @@ class DiffLib {
 	 * - escape: defaults to true
 	 * @return string output
 	 */
-	public function compare($original, $changed, $options = array()) {
+	public function compare($original, $changed, array $options = array()) {
 		if (!is_array($original)) {
 			$original = $this->_explode($original);
 		}
@@ -143,7 +143,7 @@ class DiffLib {
 	 * @param array $options
 	 * - mode (autodetect, context, unified)
 	 */
-	public function reverse($string, $options = array()) {
+	public function reverse($string, array $options = array()) {
 		$defaults = array(
 			'mode' => 'autodetect',
 		);

Lib/GeocodeLib.php

@@ -109,7 +109,7 @@ class GeocodeLib {
 		self::ACC_STREET => 'street_address',
 	);
 
-	public function __construct($options = array()) {
+	public function __construct(array $options = array()) {
 		$this->defaultParams = $this->params;
 		$this->defaultOptions = $this->options;
 		if (Configure::read('debug') > 0) {
@@ -126,7 +126,7 @@ class GeocodeLib {
 	 * @param array $params
 	 * @return void
 	 */
-	public function setParams($params) {
+	public function setParams(array $params) {
 		foreach ($params as $key => $value) {
 			if ($key === 'sensor' && $value !== 'false' && $value !== 'true') {
 				$value = !empty($value) ? 'true' : 'false';
@@ -139,7 +139,7 @@ class GeocodeLib {
 	 * @param array $options
 	 * @return void
 	 */
-	public function setOptions($options) {
+	public function setOptions(array $options) {
 		foreach ($options as $key => $value) {
 			$this->options[$key] = $value;
 		}
@@ -234,7 +234,7 @@ class GeocodeLib {
 	 * @param array $params
 	 * @return bool Success
 	 */
-	public function geocode($address, $params = array()) {
+	public function geocode($address, array $params = array()) {
 		if ($this->reachedQueryLimit) {
 			$this->setError('Over Query Limit - abort');
 			return false;
@@ -321,7 +321,7 @@ class GeocodeLib {
 	 * @param array $params
 	 * @return bool Success
 	 */
-	public function reverseGeocode($lat, $lng, $params = array()) {
+	public function reverseGeocode($lat, $lng, array $params = array()) {
 		if ($this->reachedQueryLimit) {
 			$this->setError('Over Query Limit - abort');
 			return false;

Lib/Utility/Utility.php

@@ -38,7 +38,7 @@ class Utility {
 	 * @param array $options
 	 * @return void
 	 */
-	public static function tokenize($data, $separator = ',', $options = array()) {
+	public static function tokenize($data, $separator = ',', array $options = array()) {
 		$defaults = array(
 			'clean' => true
 		);

Lib/WeatherLib.php

@@ -49,8 +49,8 @@ class WeatherLib {
 	 *
 	 * @return array Data or false on failure
 	 */
-	public function get($q, $options = array()) {
-		$options = array_merge($this->settings, $options);
+	public function get($q, array $options = array()) {
+		$options += $this->settings;
 		$options['q'] = urlencode($q);
 		$data = $this->_get('weather.ashx', $options);
 		if (empty($data) || empty($data['data'])) {