[+]: ".gitattributes" <- prevent installing special files via composer

Lars Moelleken · Lars Moelleken · commit f2758c8ebdc8 · 2016-02-01T13:26:42.000+01:00
[*]: add missing phpdoc
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
@@ -130,6 +130,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
`@@ -130,6 +130,7 @@ public static function decode($jwt, $key, $allowed_algs = array())`
`130`	`130`	`* If the algorithm used is asymmetric, this is the private key`
`131`	`131`	`* @param string $alg The signing algorithm.`
`132`	`132`	`* Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'`
	`133`	`+ * @param mixed $keyId`
`133`	`134`	`* @param array $head An array with header elements to attach`
`134`	`135`	`*`
`135`	`136`	`* @return string A signed JWT`