diff options
| author | Rob DiMarco <rdimarco@google.com> | 2016-06-16 12:59:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-16 12:59:46 -0700 |
| commit | 19860fa0706f481d405da5db72bfd0d3b12c4f72 (patch) | |
| tree | d55d972b62fa09370ba190bd3c589cb584932a33 | |
| parent | b1816ba9d3c3c6637c081844d7abaf015f99f87a (diff) | |
| parent | f2758c8ebdc88b48dbcdc91aed8b2ad873df688f (diff) | |
| download | php-jwt-19860fa0706f481d405da5db72bfd0d3b12c4f72.zip php-jwt-19860fa0706f481d405da5db72bfd0d3b12c4f72.tar.gz php-jwt-19860fa0706f481d405da5db72bfd0d3b12c4f72.tar.bz2 | |
Merge pull request #82 from voku/master
".gitattributes" <- prevent installing special files via composer
| -rw-r--r-- | .gitattributes | 8 | ||||
| -rw-r--r-- | src/JWT.php | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c682f86 --- /dev/null +++ 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 index 66b2788..7228e96 100644 --- a/src/JWT.php +++ b/src/JWT.php @@ -140,6 +140,7 @@ class JWT * 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 |