1 files changed, 11 insertions, 13 deletions

diff --git a/tests/JWTTest.php b/tests/JWTTest.php
index c7ed6c1..1ace7f5 100644
--- a/tests/JWTTest.php
+++ b/tests/JWTTest.php
@@ -5,14 +5,14 @@ class JWTTest extends PHPUnit_Framework_TestCase
     public function testEncodeDecode()
     {
         $msg = JWT::encode('abc', 'my_key');
-        $this->assertEquals(JWT::decode($msg, 'my_key'), 'abc');
+        $this->assertEquals(JWT::decode($msg, 'my_key', array('HS256')), 'abc');
     }
 
     public function testDecodeFromPython()
     {
         $msg = 'eyJhbGciOiAiSFMyNTYiLCAidHlwIjogIkpXVCJ9.Iio6aHR0cDovL2FwcGxpY2F0aW9uL2NsaWNreT9ibGFoPTEuMjMmZi5vbz00NTYgQUMwMDAgMTIzIg.E_U8X2YpMT5K1cEiT_3-IvBYfrdIFIeVYeOqre_Z5Cg';
         $this->assertEquals(
-            JWT::decode($msg, 'my_key'),
+            JWT::decode($msg, 'my_key', array('HS256')),
             '*:http://application/clicky?blah=1.23&f.oo=456 AC000 123'
         );
     }
@@ -20,7 +20,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
     public function testUrlSafeCharacters()
     {
         $encoded = JWT::encode('f?', 'a');
-        $this->assertEquals('f?', JWT::decode($encoded, 'a'));
+        $this->assertEquals('f?', JWT::decode($encoded, 'a', array('HS256')));
     }
 
     public function testMalformedUtf8StringsFail()
@@ -42,7 +42,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "message" => "abc",
             "exp" => time() - 20); // time in the past
         $encoded = JWT::encode($payload, 'my_key');
-        JWT::decode($encoded, 'my_key');
+        JWT::decode($encoded, 'my_key', array('HS256'));
     }
 
     public function testBeforeValidTokenWithNbf()
@@ -52,7 +52,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "message" => "abc",
             "nbf" => time() + 20); // time in the future
         $encoded = JWT::encode($payload, 'my_key');
-        JWT::decode($encoded, 'my_key');
+        JWT::decode($encoded, 'my_key', array('HS256'));
     }
 
     public function testBeforeValidTokenWithIat()
@@ -62,7 +62,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "message" => "abc",
             "iat" => time() + 20); // time in the future
         $encoded = JWT::encode($payload, 'my_key');
-        JWT::decode($encoded, 'my_key');
+        JWT::decode($encoded, 'my_key', array('HS256'));
     }
 
     public function testValidToken()
@@ -71,7 +71,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "message" => "abc",
             "exp" => time() + 20); // time in the future
         $encoded = JWT::encode($payload, 'my_key');
-        $decoded = JWT::decode($encoded, 'my_key');
+        $decoded = JWT::decode($encoded, 'my_key', array('HS256'));
         $this->assertEquals($decoded->message, 'abc');
     }
 
@@ -83,7 +83,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "exp" => time() + 20, // time in the future
             "nbf" => time() - 20);
         $encoded = JWT::encode($payload, 'my_key');
-        $decoded = JWT::decode($encoded, 'my_key');
+        $decoded = JWT::decode($encoded, 'my_key', array('HS256'));
         $this->assertEquals($decoded->message, 'abc');
     }
 
@@ -94,7 +94,7 @@ class JWTTest extends PHPUnit_Framework_TestCase
             "exp" => time() + 20); // time in the future
         $encoded = JWT::encode($payload, 'my_key');
         $this->setExpectedException('SignatureInvalidException');
-        $decoded = JWT::decode($encoded, 'my_key2');
+        $decoded = JWT::decode($encoded, 'my_key2', array('HS256'));
     }
 
     public function testRSEncodeDecode()
@@ -102,20 +102,18 @@ class JWTTest extends PHPUnit_Framework_TestCase
         $privKey = openssl_pkey_new(array('digest_alg' => 'sha256',
             'private_key_bits' => 1024,
             'private_key_type' => OPENSSL_KEYTYPE_RSA));
-        //JWT::setOnlyAllowedMethod('RS256');
         $msg = JWT::encode('abc', $privKey, 'RS256');
         $pubKey = openssl_pkey_get_details($privKey);
         $pubKey = $pubKey['key'];
-        $decoded = JWT::decode($msg, $pubKey, true);
+        $decoded = JWT::decode($msg, $pubKey, array('RS256'));
         $this->assertEquals($decoded, 'abc');
     }
 
     public function testKIDChooser()
     {
         $keys = array('1' => 'my_key', '2' => 'my_key2');
-        //JWT::setOnlyAllowedMethod('HS256');
         $msg = JWT::encode('abc', $keys['1'], 'HS256', '1');
-        $decoded = JWT::decode($msg, $keys, true);
+        $decoded = JWT::decode($msg, $keys, array('HS256'));
         $this->assertEquals($decoded, 'abc');
     }
 }