Merge branch 'master' into JSON_UNESCAPED_SLASHES

Author: bshaffer

src/JWK.php

@@ -3,6 +3,7 @@
 namespace Firebase\JWT;
 
 use DomainException;
+use InvalidArgumentException;
 use UnexpectedValueException;
 
 /**

src/JWT.php

@@ -2,10 +2,10 @@
 
 namespace Firebase\JWT;
 
-use \DomainException;
-use \InvalidArgumentException;
-use \UnexpectedValueException;
-use \DateTime;
+use DomainException;
+use InvalidArgumentException;
+use UnexpectedValueException;
+use DateTime;
 
 /**
  * JSON Web Token implementation, based on this spec:
@@ -62,6 +62,7 @@ class JWT
      *
      * @return object The JWT's payload as a PHP object
      *
+     * @throws InvalidArgumentException     Provided JWT was empty
      * @throws UnexpectedValueException     Provided JWT was invalid
      * @throws SignatureInvalidException    Provided JWT was invalid because the signature verification failed
      * @throws BeforeValidException         Provided JWT is trying to be used before it's eligible as defined by 'nbf'

tests/JWKTest.php

@@ -43,6 +43,20 @@ public function testParseJwkKeySet()
         self::$keys = $keys;
     }
 
+    public function testParseJwkKey_empty()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'JWK must not be empty');
+
+        JWK::parseKeySet(array('keys' => array(array())));
+    }
+
+    public function testParseJwkKeySet_empty()
+    {
+        $this->setExpectedException('InvalidArgumentException', 'JWK Set did not contain any keys');
+
+        JWK::parseKeySet(array('keys' => array()));
+    }
+
     /**
      * @depends testParseJwkKeySet
      */