Updates for some whitespace and other minor issues.

Author: jlesueur

Authentication/JWT.php

@@ -65,10 +65,12 @@ public static function decode($jwt, $key = null, $verify = true)
             if (empty($header->alg)) {
                 throw new DomainException('Empty algorithm');
             }
-            if (is_array($key) && !isset($header->kid)) {
-		throw new DomainException('"kid" empty, unable to lookup correct key');
-	    } elseif(is_array($key) && isset($header->kid)) {
-		$key = $key[$header->kid];
+            if (is_array($key)) {
+                if(isset($header->kid)) {
+                    $key = $key[$header->kid];
+                } else {
+                    throw new DomainException('"kid" empty, unable to lookup correct key');
+                }
 	    }
             if (!JWT::verify("$headb64.$bodyb64", $sig, $key, $header->alg)) {
                 throw new UnexpectedValueException('Signature verification failed');
@@ -116,7 +118,7 @@ public static function encode($payload, $key, $algo = 'HS256', $keyId = null)
      * @param string $msg    The message to sign
      * @param string|resource $key    The secret key
      * @param string $method The signing algorithm. Supported
-     *                       algorithms are 'HS256', 'HS384' and 'HS512'
+     *                       algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
      *
      * @return string          An encrypted message
      * @throws DomainException Unsupported algorithm was specified

tests/JWTTest.php

@@ -47,8 +47,8 @@ function testValidToken(){
 		$this->assertEquals($decoded->message, 'abc');
 	}
 
-	function testRSEncodeDecode() {
-		$privKey = openssl_pkey_new(array('digest_alg' => 'sha256', 
+	function testRSEncodeDecode(){
+		$privKey = openssl_pkey_new(array('digest_alg' => 'sha256',
 			'private_key_bits' => 1024,
 			'private_key_type' => OPENSSL_KEYTYPE_RSA));
 		$msg = JWT::encode('abc',$privKey, 'RS256');
@@ -58,7 +58,7 @@ function testRSEncodeDecode() {
 		$this->assertEquals($decoded, 'abc');
 	}
 
-	function testKIDChooser() {
+	function testKIDChooser(){
 		$keys = array('1' => 'my_key', '2' => 'my_key2');
 		$msg = JWT::encode('abc', $keys['1'], 'HS256', '1');
 		$decoded = JWT::decode($msg, $keys, true);