From: Daniel Rudolf <daniel.rudolf@eifel-online.com>
Date: Thu, 21 Feb 2013 15:43:13 +0000 (+0100)
Subject: Adding wcf\system\Callback type hint
X-Git-Tag: 2.0.0_Beta_1~460^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f40ecf7a5d7926a780d3b4134a391e6b0fbc3860;p=GitHub%2FWoltLab%2FWCF.git

Adding wcf\system\Callback type hint
---

diff --git a/wcfsetup/install/files/lib/util/ArrayUtil.class.php b/wcfsetup/install/files/lib/util/ArrayUtil.class.php
index 2693019f8d..431c4fc82f 100644
--- a/wcfsetup/install/files/lib/util/ArrayUtil.class.php
+++ b/wcfsetup/install/files/lib/util/ArrayUtil.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\util;
+use wcf\system\Callback;
 use wcf\system\exception\SystemException;
 
 /**
@@ -165,7 +166,7 @@ final class ArrayUtil {
 	 * @param	callable	$callback
 	 * @return	boolean
 	 */
-	public static function compare(array $array1, array $array2, $callback = null) {
+	public static function compare(array $array1, array $array2, Callback $callback = null) {
 		return static::compareHelper('value', $array1, $array2, $callback);
 	}
 
@@ -177,7 +178,7 @@ final class ArrayUtil {
 	 * @param	callable	$callback
 	 * @return	boolean
 	 */
-	public static function compareKey(array $array1, array $array2, $callback = null) {
+	public static function compareKey(array $array1, array $array2, Callback $callback = null) {
 		return static::compareHelper('key', $array1, $array2, $callback);
 	}
 
@@ -189,7 +190,7 @@ final class ArrayUtil {
 	 * @param	callable	$callback
 	 * @return	boolean
 	 */
-	public static function compareAssoc(array $array1, array $array2, $callback = null) {
+	public static function compareAssoc(array $array1, array $array2, Callback $callback = null) {
 		return static::compareHelper('assoc', $array1, $array2, $callback);
 	}
 
@@ -202,7 +203,7 @@ final class ArrayUtil {
 	 * @param	callable	$callback
 	 * @return	boolean
 	 */
-	protected static function compareHelper($method, array $array1, array $array2, $callback) {
+	protected static function compareHelper($method, array $array1, array $array2, Callback $callback) {
 		// get function name
 		$function = null;
 		if ($method === 'value') {
@@ -215,6 +216,11 @@ final class ArrayUtil {
 			$function = ($callback === null) ? 'array_diff_assoc' : 'array_diff_uassoc';
 		}
 		
+		// check function name
+		if ($function === null) {
+			throw new SystemException('Unknown comparison method '.$method);
+		}
+		
 		// get parameters
 		$params1 = array($array1, $array2);
 		$params2 = array($array2, $array1);
@@ -223,16 +229,6 @@ final class ArrayUtil {
 			$params2[] = $callback;
 		}
 		
-		// check function name
-		if ($function === null) {
-			throw new SystemException('Unknown comparison method '.$method);
-		}
-		
-		// check callback
-		if (($callback !== null) && !is_callable($callback)) {
-			throw new SystemException('Invalid callback specified');
-		}
-		
 		// compare the arrays
 		return ((count(call_user_func_array($function, $params1)) === 0) && (count(call_user_func_array($function, $params2)) === 0));
 	}