From: Ferenc Kovacs <tyrael@php.net>
Date: Sun, 13 Apr 2014 00:49:35 +0000 (+0200)
Subject: Fix bug #66568: the second arg for unserialize is optional.
X-Git-Tag: PRE_PHPNG_MERGE~402^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aefc8f22b35999624f3a579696cf68b389f41ae8;p=php

Fix bug #66568: the second arg for unserialize is optional.
---

diff --git a/NEWS b/NEWS
index b3ed9d9025..48afea4682 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
   . Fixed bug #66015 (Unexpected array indexing in class's static property). (Bob)
   . Added (constant) string/array dereferencing to static scalar expressions
     to complete the set; now possible thanks to bug #66015 being fixed. (Bob)
+  . Fixed bug #66568 (Update reflection information for unserialize() function).
+    (Ferenc)
 
 - mysqlnd:
   . Added a new fetching mode to mysqlnd. (Andrey)
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index be1a7062a1..e525ff2a80 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2646,7 +2646,7 @@ 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(1, consumed)
 ZEND_END_ARG_INFO()