unserialize() takes a 2nd optional arg and it can't be a bool

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1d5e1dd7b2e2000a5fe0ddd7f5890e67e433f8f1..488b71b900e4b2f6de73dc8edd195123aa31893c 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2653,8 +2653,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_serialize, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_unserialize, 0, 0, 1)
        ZEND_ARG_INFO(0, variable_representation)
+       ZEND_ARG_INFO(0, allowed_classes)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)

diff --git a/ext/standard/var.c b/ext/standard/var.c
index 055110382bf5fe1d8b0e1df1da316b5a7863c4f8..b1f368f0c322bc857aa93e9c2c1c8e3abfebfe59 100644 (file)
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -994,7 +994,7 @@ PHP_FUNCTION(serialize)
 }
 /* }}} */
 
-/* {{{ proto mixed unserialize(string variable_representation[, bool|array allowed_classes])
+/* {{{ proto mixed unserialize(string variable_representation[, array allowed_classes])
    Takes a string representation of variable and recreates it */
 PHP_FUNCTION(unserialize)
 {