fixing notice when passing empty array to encode

vinkla · Jan 21, 2015 · 4412483 · 4412483
1 parent be7411f
commit 4412483
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/Hashids/Hashids.php b/lib/Hashids/Hashids.php
@@ -15,7 +15,7 @@
 
 class Hashids implements HashGenerator {
 
-	const VERSION = '1.0.4';
+	const VERSION = '1.0.5';
 
 	/* internal settings */
 
@@ -120,14 +120,14 @@ public function encode() {
 		$ret = '';
 		$numbers = func_get_args();
 
-		if (!$numbers) {
-			return $ret;
-		}
-
 		if (func_num_args() == 1 && is_array(func_get_arg(0))) {
 			$numbers = $numbers[0];
 		}
 
+		if (!$numbers) {
+			return $ret;
+		}
+
 		foreach ($numbers as $number) {
 
 			$is_number = ctype_digit((string)$number);

diff --git a/tests/HashidsTest.php b/tests/HashidsTest.php
@@ -87,7 +87,7 @@ public function testMinHashLength() {
 
 	}
 
-	public function testRandomHashesdecodeion() {
+	public function testRandomHashesDecoding() {
 
 		$corrupt = $hashes = array();
 
@@ -170,6 +170,16 @@ public function testNegativeValue() {
 		$this->assertEquals('', $hash);
 	}
 
+	public function testEncodingEmptyArray() {
+		$hash = $this->hashids->encode(array());
+		$this->assertEquals('', $hash);
+	}
+
+	public function testEncodingWithoutParams() {
+		$hash = $this->hashids->encode();
+		$this->assertEquals('', $hash);
+	}
+
 	public function testEncodingDecodingHex() {
 
 		$testValue = '3ade68b1000fff';