From 73773c2175c88a3171236fc0ffce85b0efcd65fa Mon Sep 17 00:00:00 2001 From: Rasmus Lerdorf Date: Wed, 15 Jul 2015 09:59:31 -0700 Subject: [PATCH] unserialize() takes a 2nd optional arg and it can't be a bool --- ext/standard/basic_functions.c | 3 ++- ext/standard/var.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 1d5e1dd7b2e..488b71b900e 100644 --- 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 055110382bf..b1f368f0c32 100644 --- 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) {