Merge branch 'master' into develop

Author: cdoco

CREDITS

@@ -1 +1,2 @@
-jwt
+JWT
+ZiHang Gao

README.md

@@ -2,7 +2,10 @@
     <p><a target="_blank" href="https://jwt.io"><img src="https://jwt.io/img/logo-asset.svg" /></a></p>
     <p>A PHP extension for <a target="_blank" href="https://tools.ietf.org/html/rfc7519">RFC 7519 OAuth JSON Web Token (JWT)</a></p>
     <a target="_blank" href="https://travis-ci.org/cdoco/php-jwt" title="Build Status"><img src="https://travis-ci.org/cdoco/php-jwt.svg"></a>
-    <img src="https://img.shields.io/badge/branch-master-brightgreen.svg?style=flat-square">
+    <img src="https://img.shields.io/badge/PHP-%3E%3D7.0.0-blue.svg">
+    <img src="https://img.shields.io/badge/OpenSSL-%3E%3D1.0.1f-blue.svg">
+    <img src="https://img.shields.io/badge/branch-master-brightgreen.svg">
+    <img src="https://img.shields.io/github/repo-size/cdoco/php-jwt.svg">
 </div>
 
 ## Requirement
@@ -318,10 +321,10 @@ try {
 ## Functions
 
 ```php
-//encode
-string jwt_encode(array $claims, string $key [, string $algorithm = 'HS256'])
+// encode
+string jwt_encode(array $payload, string $key [, string $algorithm = 'HS256'])
 
-//decode
+// decode
 array jwt_decode(string $token, string $key [, array $options = ['algorithm' => 'HS256']])
 ```
 

jwt.c

@@ -50,6 +50,18 @@ PHP_JWT_API zend_class_entry *jwt_invalid_sub_cex;
 
 ZEND_DECLARE_MODULE_GLOBALS(jwt)
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_jwt_encode, 0, 0, 2)
+    ZEND_ARG_ARRAY_INFO(0, payload, 1)
+    ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 1)
+    ZEND_ARG_TYPE_INFO(0, alg, IS_STRING, 1)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_jwt_decode, 0, 0, 2)
+    ZEND_ARG_TYPE_INFO(0, token, IS_STRING, 1)
+    ZEND_ARG_TYPE_INFO(0, key, IS_STRING, 1)
+    ZEND_ARG_INFO(0, options)
+ZEND_END_ARG_INFO()
+
 /* string to algorithm */
 jwt_alg_t jwt_str_alg(const char *alg)
 {
@@ -618,8 +630,8 @@ PHP_FUNCTION(jwt_decode)
 }
 
 const zend_function_entry jwt_functions[] = {
-    PHP_FE(jwt_encode,	NULL)
-    PHP_FE(jwt_decode,	NULL)
+    PHP_FE(jwt_encode, arginfo_jwt_encode)
+    PHP_FE(jwt_decode, arginfo_jwt_decode)
     PHP_FE_END
 };
 

php_jwt.h

@@ -24,7 +24,7 @@
 extern zend_module_entry jwt_module_entry;
 #define phpext_jwt_ptr &jwt_module_entry
 
-#define PHP_JWT_VERSION "0.2.1" /* Replace with version number for your extension */
+#define PHP_JWT_VERSION "0.2.2" /* Replace with version number for your extension */
 
 #ifdef PHP_WIN32
 #	define PHP_JWT_API __declspec(dllexport)