Merge pull request #82 from voku/master

robertdimarco · web-flow · commit 19860fa0706f · 2016-06-16T12:59:46.000-07:00
".gitattributes" &lt;- prevent installing special files via composer
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,8 @@
+* text=auto
+
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
+/run-tests.sh export-ignore
diff --git a/src/JWT.php b/src/JWT.php
@@ -140,6 +140,7 @@ public static function decode($jwt, $key, $allowed_algs = array())
      *                                  If the algorithm used is asymmetric, this is the private key
      * @param string        $alg        The signing algorithm.
      *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+     * @param mixed         $keyId
      * @param array         $head       An array with header elements to attach
      *
      * @return string A signed JWT

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ public static function decode($jwt, $key, $allowed_algs = array())`
`140`	`140`	`* If the algorithm used is asymmetric, this is the private key`
`141`	`141`	`* @param string $alg The signing algorithm.`
`142`	`142`	`* Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'`
	`143`	`+ * @param mixed $keyId`
`143`	`144`	`* @param array $head An array with header elements to attach`
`144`	`145`	`*`
`145`	`146`	`* @return string A signed JWT`