zend test upgrades

* change warnings from `%a` to `%s`. This way, we don't eroneously match more than one line for an error message
* import all the 5.5 tests since it is now official

I checked through all the tests that went from good to bad, and each one is correctly failing. Most of them are from us doing the extension calling-convention wrong.

The only thing to review is the change to `tools/import_zend_test.py`

hphp/test/zend/bad/ext-bz2/003.php.expectf

@@ -1,9 +1,9 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(0) ""
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(1) "R"
 string(2) "is"

hphp/test/zend/bad/ext-bz2/005.php.expectf

@@ -1,13 +1,13 @@
-HipHop Warning: %a
+HipHop Warning: %s
 NULL
 string(%d) "BZ%a"
 int(-2)
 int(-2)
 int(-2)
 int(-2)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 int(-5)
 int(-5)

hphp/test/zend/bad/ext-curl/bug48203.php.expectf

@@ -1,3 +1,3 @@
-HipHop Warning: %a
+HipHop Warning: %s
 %A
 Ok

hphp/test/zend/bad/ext-curl/bug48203_multi.php.expectf

@@ -1,15 +1,15 @@
-HipHop Warning: %a
-HipHop Warning: %a
+HipHop Warning: %s
+HipHop Warning: %s
 %A
 Ok for CURLOPT_STDERR
 %A
-HipHop Warning: %a
-HipHop Warning: %a
+HipHop Warning: %s
+HipHop Warning: %s
 Ok for CURLOPT_WRITEHEADER
-HipHop Warning: %a
-HipHop Warning: %a
+HipHop Warning: %s
+HipHop Warning: %s
 %A
 Ok for CURLOPT_FILE
-HipHop Warning: %a
-HipHop Warning: %a
+HipHop Warning: %s
+HipHop Warning: %s
 Ok for CURLOPT_INFILE

hphp/test/zend/bad/ext-curl/bug48207.php.expectf

@@ -1,3 +1,3 @@
-HipHop Warning: %a
+HipHop Warning: %s
 Hello World!
 Hello World!

hphp/test/zend/bad/ext-curl/bug54798.php.expectf

@@ -1,11 +1,11 @@
-HipHop Warning: %a
+HipHop Warning: %s
 * About to connect() %a
 * Closing connection #%d
 Ok for CURLOPT_STDERR
-HipHop Warning: %a
+HipHop Warning: %s
 Ok for CURLOPT_WRITEHEADER
-HipHop Warning: %a
+HipHop Warning: %s
 %a
 Ok for CURLOPT_FILE
-HipHop Warning: %a
+HipHop Warning: %s
 Ok for CURLOPT_INFILE

hphp/test/zend/bad/ext-curl/bug54995.php

@@ -0,0 +1,13 @@
+<?php
+
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "{$host}/get.php");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+var_dump(curl_getinfo($ch, CURLINFO_HTTP_CODE) == curl_getinfo($ch, CURLINFO_RESPONSE_CODE));
+
+curl_exec($ch);
+curl_close($ch);
+
+?>

hphp/test/zend/bad/ext-curl/bug54995.php.expectf

@@ -0,0 +1 @@
+bool(true)

hphp/test/zend/bad/ext-curl/bug63363.php.expectf

@@ -1,7 +1,7 @@
 bool(true)
-HipHop Notice: %a
+HipHop Notice: %s
 bool(true)
 bool(true)
-HipHop Notice: %a
+HipHop Notice: %s
 bool(true)
 bool(true)

hphp/test/zend/bad/ext-curl/bug63795.php.expectf

@@ -1,7 +1,7 @@
 bool(true)
-HipHop Notice: %a
+HipHop Notice: %s
 bool(true)
 bool(true)
-HipHop Notice: %a
+HipHop Notice: %s
 bool(true)
 bool(true)

hphp/test/zend/bad/ext-curl/check_win_config.php

@@ -0,0 +1,11 @@
+<?php
+	ob_start();
+	phpinfo();
+	$s = ob_get_contents();
+	ob_end_clean();
+	preg_match('/curl\n\n(.+)\n\n/siU', $s, $m);
+
+	echo $m[1], "\n";
+
+?>
+DONE

hphp/test/zend/bad/ext-curl/check_win_config.php.expectf

@@ -0,0 +1,25 @@
+cURL support => enabled
+cURL Information => %s
+Age => %d
+Features
+AsynchDNS => Yes
+CharConv => No
+Debug => No
+GSS-Negotiate => Yes
+IDN => Yes
+IPv6 => Yes
+krb4 => No
+Largefile => Yes
+libz => Yes
+NTLM => Yes
+NTLMWB => No
+SPNEGO => Yes
+SSL => Yes
+SSPI => Yes
+TLS-SRP => No
+Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp
+Host => %s-pc-win32
+SSL Version => OpenSSL/%s
+ZLib Version => %s
+libSSH Version => libssh2/%s
+DONE

hphp/test/zend/bad/ext-curl/curl_basic_022.php

@@ -0,0 +1,8 @@
+<?php
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_COOKIELIST, 'Set-Cookie: C1=v1; expires=Thu, 31-Dec-2037 23:59:59 GMT; path=/; domain=.php.net');
+curl_setopt($ch, CURLOPT_COOKIELIST, 'Set-Cookie: C2=v2; expires=Thu, 31-Dec-2037 23:59:59 GMT; path=/; domain=.php.net');
+var_dump(curl_getinfo($ch, CURLINFO_COOKIELIST));
+
+?>

hphp/test/zend/bad/ext-curl/curl_basic_022.php.expectf

@@ -0,0 +1,6 @@
+array(2) {
+  [0]=>
+  string(38) ".php.net	TRUE	/	FALSE	2145916799	C1	v1"
+  [1]=>
+  string(38) ".php.net	TRUE	/	FALSE	2145916799	C2	v2"
+}

hphp/test/zend/bad/ext-curl/curl_escape.php

@@ -0,0 +1,9 @@
+<?php
+$str = "http://www.php.net/ ?!";
+
+$a = curl_init();
+$escaped = curl_escape($a, $str);
+$original = curl_unescape($a, $escaped);
+var_dump($escaped, $original);
+var_dump(curl_unescape($a, 'a%00b'));
+?>

hphp/test/zend/bad/ext-curl/curl_file_serialize.php

@@ -0,0 +1,4 @@
+<?php
+$data = 'a:2:{s:4:"file";O:8:"CURLFile":3:{s:4:"name";s:13:"testdata1.txt";s:4:"mime";s:0:"";s:8:"postname";s:0:"";}s:4:"data";s:3:"foo";}';
+var_dump(unserialize($data));
+?>

hphp/test/zend/bad/ext-curl/curl_file_serialize.php.expectf

@@ -0,0 +1,6 @@
+HipHop Fatal error: %s
+Stack trace:
+#0 [internal function]: CURLFile->__wakeup()
+#1 %s
+#2 {main}
+  thrown in hphp/test/zend/bad/ext-curl/curl_file_serialize.phpt on line %d

hphp/test/zend/bad/ext-curl/curl_file_upload.php

@@ -0,0 +1,54 @@
+<?php
+
+function testcurl($ch, $name, $mime = '', $postname = '')
+{
+	if(!empty($postname)) {
+		$file = new CurlFile($name, $mime, $postname);
+	} else if(!empty($mime)) {
+		$file = new CurlFile($name, $mime);
+	} else {
+		$file = new CurlFile($name);
+	}
+	curl_setopt($ch, CURLOPT_POSTFIELDS, array("file" => $file));
+	var_dump(curl_exec($ch));
+}
+
+$host = getenv('PHP_CURL_HTTP_REMOTE_SERVER');
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=file");
+curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+testcurl($ch, __DIR__ . '/curl_testdata1.txt');
+testcurl($ch, __DIR__ . '/curl_testdata1.txt', 'text/plain');
+testcurl($ch, __DIR__ . '/curl_testdata1.txt', '', 'foo.txt');
+testcurl($ch, __DIR__ . '/curl_testdata1.txt', 'text/plain', 'foo.txt');
+
+$file = new CurlFile(__DIR__ . '/curl_testdata1.txt');
+$file->setMimeType('text/plain');
+var_dump($file->getMimeType());
+var_dump($file->getFilename());
+curl_setopt($ch, CURLOPT_POSTFIELDS, array("file" => $file));
+var_dump(curl_exec($ch));
+
+$file = curl_file_create(__DIR__ . '/curl_testdata1.txt');
+$file->setPostFilename('foo.txt');
+var_dump($file->getPostFilename());
+curl_setopt($ch, CURLOPT_POSTFIELDS, array("file" => $file));
+var_dump(curl_exec($ch));
+
+$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt');
+curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+var_dump(curl_exec($ch));
+
+curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);
+$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt');
+curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+var_dump(curl_exec($ch));
+
+curl_setopt($ch, CURLOPT_URL, "{$host}/get.php?test=post");
+$params = array('file' => '@' . __DIR__ . '/curl_testdata1.txt');
+curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+var_dump(curl_exec($ch));
+
+curl_close($ch);
+?>

hphp/test/zend/bad/ext-curl/curl_file_upload.php.expectf

@@ -0,0 +1,18 @@
+string(%d) "curl_testdata1.txt|application/octet-stream"
+string(%d) "curl_testdata1.txt|text/plain"
+string(%d) "foo.txt|application/octet-stream"
+string(%d) "foo.txt|text/plain"
+string(%d) "text/plain"
+string(%d) "%s/curl_testdata1.txt"
+string(%d) "curl_testdata1.txt|text/plain"
+string(%d) "foo.txt"
+string(%d) "foo.txt|application/octet-stream"
+
+Deprecated: curl_setopt(): The usage of the @filename API for file uploading is deprecated. Please use the CURLFile class instead in hphp/test/zend/bad/ext-curl/curl_file_upload.phpt on line %d
+string(%d) "curl_testdata1.txt|application/octet-stream"
+string(0) ""
+string(%d) "array(1) {
+  ["file"]=>
+  string(%d) "@%s/curl_testdata1.txt"
+}
+"

hphp/test/zend/bad/ext-curl/curl_multi_getcontent_error4.php.expectf

@@ -1,9 +1,9 @@
-HipHop Notice: %a
-HipHop Warning: %a
-HipHop Notice: %a
-HipHop Warning: %a
-HipHop Notice: %a
-HipHop Warning: %a
-HipHop Notice: %a
-HipHop Warning: %a
+HipHop Notice: %s
+HipHop Warning: %s
+HipHop Notice: %s
+HipHop Warning: %s
+HipHop Notice: %s
+HipHop Warning: %s
+HipHop Notice: %s
+HipHop Warning: %s
 CURL2

hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php

@@ -0,0 +1,7 @@
+<?php
+
+$mh = curl_multi_init();
+var_dump(curl_multi_setopt($mh, CURLMOPT_PIPELINING, 0));
+var_dump(curl_multi_setopt($mh, -1, 0));
+
+?>

hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php.expectf

@@ -0,0 +1,3 @@
+bool(true)
+HipHop Warning: %s
+bool(false)

hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php

@@ -0,0 +1,6 @@
+<?php
+
+var_dump(strtolower(curl_multi_strerror(CURLM_OK)));
+var_dump(strtolower(curl_multi_strerror(CURLM_BAD_HANDLE)));
+
+?>

hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php.expectf

@@ -0,0 +1,2 @@
+string(8) "no error"
+string(20) "invalid multi handle"

hphp/test/zend/bad/ext-curl/curl_reset.php

@@ -0,0 +1,31 @@
+<?php
+
+$test_file = tempnam(sys_get_temp_dir(), 'php-curl-test');
+$log_file = tempnam(sys_get_temp_dir(), 'php-curl-test');
+
+$fp = fopen($log_file, 'w+');
+fwrite($fp, "test");
+fclose($fp);
+
+$testfile_fp = fopen($test_file, 'w+');
+
+$ch = curl_init();
+curl_setopt($ch, CURLOPT_FILE, $testfile_fp);
+curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
+curl_exec($ch);
+
+curl_reset($ch);
+curl_setopt($ch, CURLOPT_URL, 'file://' . $log_file);
+curl_exec($ch);
+
+curl_close($ch);
+
+fclose($testfile_fp);
+
+echo file_get_contents($test_file);
+
+// cleanup
+unlink($test_file);
+unlink($log_file);
+
+?>

hphp/test/zend/bad/ext-curl/curl_reset.php.expectf

@@ -0,0 +1 @@
+testtest

hphp/test/zend/bad/ext-curl/curl_setopt_CURLOPT_READFUNCTION.php

@@ -30,7 +30,8 @@ fclose ($hReadHandle);
 $sOutput = file_get_contents($sWriteFile); 
 var_dump($sOutput);
 ?>
-===DONE===<?php
+===DONE===?>
+<?php
 $sFileBase  = dirname(__FILE__).DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION';
 $sReadFile  = $sFileBase.'_in.tmp';
 $sWriteFile = $sFileBase.'_out.tmp';

hphp/test/zend/bad/ext-curl/curl_setopt_basic003.php.expectf

@@ -1,4 +1,4 @@
 *** curl_setopt() call with CURLOPT_HTTPHEADER
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(true)

hphp/test/zend/bad/ext-curl/curl_setopt_error.php

@@ -6,12 +6,12 @@ curl_setopt(false);
 
 curl_setopt($ch);
 curl_setopt($ch, false);
-curl_setopt($ch, -1);
+curl_setopt($ch, -10);
 curl_setopt($ch, '');
 curl_setopt($ch, 1, false);
 
 curl_setopt(false, false, false);
 curl_setopt($ch, '', false);
 curl_setopt($ch, 1, '');
-curl_setopt($ch, -1, 0);
+curl_setopt($ch, -10, 0);
 ?>

hphp/test/zend/bad/ext-curl/curl_setopt_error.php.expectf

@@ -1,10 +1,10 @@
 *** curl_setopt() call with incorrect parameters
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
-HipHop Warning: %a
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s
+HipHop Warning: %s

hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php

@@ -0,0 +1,8 @@
+<?php
+
+$sh = curl_share_init();
+var_dump(curl_share_setopt($sh, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE));
+var_dump(curl_share_setopt($sh, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_DNS));
+var_dump(curl_share_setopt($sh, -1, 0));
+
+?>

hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php.expectf

@@ -0,0 +1,4 @@
+bool(true)
+bool(true)
+HipHop Warning: %s
+bool(false)

hphp/test/zend/bad/ext-curl/curl_strerror_001.php

@@ -0,0 +1,7 @@
+<?php
+
+var_dump(strtolower(curl_strerror(CURLE_OK)));
+var_dump(strtolower(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL)));
+var_dump(strtolower(curl_strerror(-1)));
+
+?>

hphp/test/zend/bad/ext-curl/curl_strerror_001.php.expectf

@@ -0,0 +1,3 @@
+string(8) "no error"
+string(20) "unsupported protocol"
+string(13) "unknown error"

hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf

@@ -1,6 +1,6 @@
 *** Testing curl_version() : error conditions ***
 
 -- Testing curl_version() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 NULL
 ===Done===

hphp/test/zend/bad/ext-curl/curl_version_variation1.php.expectf

@@ -18,22 +18,22 @@ bool(true)
 -- Iteration 9 --
 bool(true)
 -- Iteration 10 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 11 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 12 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 13 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 14 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 15 --
-HipHop Notice: %a
+HipHop Notice: %s
 bool(true)
 -- Iteration 16 --
 bool(true)
@@ -48,10 +48,10 @@ bool(true)
 -- Iteration 21 --
 bool(true)
 -- Iteration 22 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 23 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 -- Iteration 24 --
 bool(true)

hphp/test/zend/bad/ext-date/005.php.expectf

@@ -1,16 +1,16 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 int(41)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 Done

hphp/test/zend/bad/ext-date/006.php.expectf

@@ -1,4 +1,4 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(true)
 bool(false)

hphp/test/zend/bad/ext-date/007.php.expectf

@@ -1,4 +1,4 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 array(9) {
   [0]=>

hphp/test/zend/bad/ext-date/008.php.expectf

@@ -1,4 +1,4 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 array(11) {
   ["seconds"]=>

hphp/test/zend/bad/ext-date/009.php.expectf

@@ -1,4 +1,4 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(false)
 %unicode|string%(%d) "Tue Tuesday Jun June Tue Jun 27 00:00:00 2006 %s
@@ -6,7 +6,7 @@ bool(false)
 %unicode|string%(5) "%q %a"
 %unicode|string%(%d) "%s"
 %unicode|string%(4) "blah"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(false)
 %unicode|string%(%d) "Mon Monday Jun June Mon Jun 26 21:00:00 2006 %s

hphp/test/zend/bad/ext-date/009_win32.php.expectf

@@ -1,10 +1,10 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(false)
 string(%d) "Tue Tuesday Jun June 06/27/06 00:00:00 27 00 12 178 06 00 AM 00 26 26 2 06/27/06 00:00:00 06 2006 %s"
 string(5) "%q %a"
 string(4) "blah"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 bool(false)
 string(%d) "Mon Monday Jun June 06/26/06 21:00:00 26 21 09 177 06 00 PM 00 26 26 1 06/26/06 21:00:00 06 2006 %s"

hphp/test/zend/bad/ext-date/011.php.expectf

@@ -1,4 +1,4 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(13) "Europe/Berlin"
 bool(false)

hphp/test/zend/bad/ext-date/012.php.expectf

@@ -7,7 +7,7 @@ object(DateTime)#1 (3) {
   string(3) "UTC"
 }
 string(19) "2006/01/23 00:00:00"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(19) "2006/01/23 00:00:00"
 object(DateTime)#1 (3) {
@@ -28,7 +28,7 @@ object(DateTime)#1 (3) {
   string(3) "UTC"
 }
 string(19) "2007/12/10 00:00:00"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(19) "2007/12/10 00:00:00"
 Done

hphp/test/zend/bad/ext-date/013.php.expectf

@@ -7,10 +7,10 @@ object(DateTime)#%d (3) {
   string(3) "UTC"
 }
 string(19) "2006.12.12 00:00:00"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(19) "2006.12.12 00:00:00"
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 string(19) "2006.12.12 00:00:00"
 object(DateTime)#1 (3) {

hphp/test/zend/bad/ext-date/014.php.expectf

@@ -6,11 +6,15 @@ object(DateTime)#%d (3) {
   ["timezone"]=>
   string(3) "UTC"
 }
-object(DateTimeZone)#%d (0) {
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
 }
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 int(0)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 Done

hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic1.php.expectf

@@ -0,0 +1,15 @@
+*** Testing clone on DateTime objects ***
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}
+TEST PASSED : Objects equal but not indetical
+===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic2.php.expectf

@@ -1,17 +1,25 @@
 *** Testing clone on objects whoose class derived from DateTimeZone class ***
-object(DateTimeZoneExt1)#%d (2) {
+object(DateTimeZoneExt1)#%d (4) {
   ["property1"]=>
   int(99)
   ["property2"]=>
   string(5) "Hello"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
 }
-object(DateTimeZoneExt1)#%d (2) {
+object(DateTimeZoneExt1)#%d (4) {
   ["property1"]=>
   int(99)
   ["property2"]=>
   string(5) "Hello"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
 }
-object(DateTimeZoneExt2)#%d (4) {
+object(DateTimeZoneExt2)#%d (6) {
   ["property3"]=>
   bool(true)
   ["property4"]=>
@@ -20,8 +28,12 @@ object(DateTimeZoneExt2)#%d (4) {
   int(99)
   ["property2"]=>
   string(5) "Hello"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
 }
-object(DateTimeZoneExt2)#%d (4) {
+object(DateTimeZoneExt2)#%d (6) {
   ["property3"]=>
   bool(true)
   ["property4"]=>
@@ -30,5 +42,9 @@ object(DateTimeZoneExt2)#%d (4) {
   int(99)
   ["property2"]=>
   string(5) "Hello"
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
 }
 ===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic3.php.expectf

@@ -1,11 +1,19 @@
 *** Testing clone on DateTime objects ***
 
 -- Create a DateTimeZone object --
-object(DateTimeZone)#%d (0) {
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
 }
 
 -- Add some properties --
-object(DateTimeZone)#%d (2) {
+object(DateTimeZone)#%d (4) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
   ["property1"]=>
   int(99)
   ["property2"]=>
@@ -13,7 +21,11 @@ object(DateTimeZone)#%d (2) {
 }
 
 -- clone it --
-object(DateTimeZone)#%d (2) {
+object(DateTimeZone)#%d (4) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
   ["property1"]=>
   int(99)
   ["property2"]=>
@@ -21,7 +33,11 @@ object(DateTimeZone)#%d (2) {
 }
 
 -- Add some more properties --
-object(DateTimeZone)#%d (4) {
+object(DateTimeZone)#%d (6) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
   ["property1"]=>
   int(99)
   ["property2"]=>
@@ -33,7 +49,11 @@ object(DateTimeZone)#%d (4) {
 }
 
 -- clone it --
-object(DateTimeZone)#%d (4) {
+object(DateTimeZone)#%d (6) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
   ["property1"]=>
   int(99)
   ["property2"]=>

hphp/test/zend/bad/ext-date/DateTimeZone_construct_basic.php.expectf

@@ -0,0 +1,20 @@
+*** Testing new DateTimeZone() : basic functionality ***
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(3) "UTC"
+}
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(13) "Europe/London"
+}
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(19) "America/Los_Angeles"
+}
+===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.php.expectf

@@ -1,7 +1,7 @@
 *** Testing DateTimeZone() : error conditions ***
 
 -- Testing new DateTimeZone() with more than expected no. of arguments --
-HipHop Fatal error: %a
+HipHop Fatal error: %s
 Stack trace:
 #0 %s(%d): DateTimeZone->__construct('GMT', 99)
 #1 {main}

hphp/test/zend/bad/ext-date/DateTimeZone_getName_error.php.expectf

@@ -1,6 +1,6 @@
 *** Testing DateTimeZone::getName() : error conditions ***
 
 -- Testing DateTimeZone::getName() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_error.php.expectf

@@ -1,10 +1,10 @@
 *** Testing DateTimeZone::getOffset() : error conditions ***
 
 -- Testing DateTimeZone::getOffset() function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTimeZone::getOffset() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_variation1.php.expectf

@@ -1,114 +1,114 @@
 *** Testing DateTimeZone::getOffset() : usage variation -  unexpected values to first argument $datetime***
 
 -- int 0 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 1 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int -12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float 10.5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float -10.5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float .5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase null --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase true --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase false --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase TRUE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase FALSE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- unset var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_getTransitions_error.php.expectf

@@ -1,6 +1,6 @@
 *** Testing DateTimeZone::getTransitions() : error conditions ***
 
 -- Testing DateTimeZone::getTransitions() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php

@@ -0,0 +1,16 @@
+<?php
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+$tz1 = date_create("2012-01-01 10:00 +1:00")->getTimezone();
+var_dump( $tz1 );
+$serialized = serialize($tz1);
+var_dump($serialized); 
+
+$tz2 = unserialize($serialized);
+var_dump($tz2);
+// Try to use unserialzied object 
+var_dump( $tz2->getName() ); 
+
+?>
+===DONE=== 

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php.expectf

@@ -0,0 +1,15 @@
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(1)
+  ["timezone"]=>
+  string(6) "+01:00"
+}
+string(77) "O:12:"DateTimeZone":2:{s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+01:00";}"
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(1)
+  ["timezone"]=>
+  string(6) "+01:00"
+}
+string(6) "+01:00"
+===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php

@@ -0,0 +1,16 @@
+<?php
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+$tz1 = new DateTimeZone("EST");
+var_dump( $tz1 );
+$serialized = serialize($tz1);
+var_dump($serialized); 
+
+$tz2 = unserialize($serialized);
+var_dump($tz2);
+// Try to use unserialzied object 
+var_dump( $tz2->getName() ); 
+
+?>
+===DONE=== 

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php.expectf

@@ -0,0 +1,15 @@
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(16) "America/New_York"
+}
+string(88) "O:12:"DateTimeZone":2:{s:13:"timezone_type";i:3;s:8:"timezone";s:16:"America/New_York";}"
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(16) "America/New_York"
+}
+string(16) "America/New_York"
+===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php

@@ -0,0 +1,16 @@
+<?php
+//Set the default time zone 
+date_default_timezone_set("Europe/London");
+
+$tz1 = new DateTimeZone("America/New_York");
+var_dump( $tz1 );
+$serialized = serialize($tz1);
+var_dump($serialized); 
+
+$tz2 = unserialize($serialized);
+var_dump($tz2);
+// Try to use unserialzied object 
+var_dump( $tz2->getName() ); 
+
+?>
+===DONE=== 

hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php.expectf

@@ -0,0 +1,15 @@
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(16) "America/New_York"
+}
+string(88) "O:12:"DateTimeZone":2:{s:13:"timezone_type";i:3;s:8:"timezone";s:16:"America/New_York";}"
+object(DateTimeZone)#%d (2) {
+  ["timezone_type"]=>
+  int(3)
+  ["timezone"]=>
+  string(16) "America/New_York"
+}
+string(16) "America/New_York"
+===DONE===

hphp/test/zend/bad/ext-date/DateTimeZone_verify.php.expectf

@@ -5,7 +5,7 @@ object(ReflectionClass)#%d (1) {
   string(12) "DateTimeZone"
 }
 ..and get names of all its methods
-array(7) {
+array(9) {
   [0]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
@@ -16,39 +16,53 @@ array(7) {
   [1]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
-    string(7) "getName"
+    string(8) "__wakeup"
     ["class"]=>
     string(12) "DateTimeZone"
   }
   [2]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
-    string(9) "getOffset"
+    string(11) "__set_state"
     ["class"]=>
     string(12) "DateTimeZone"
   }
   [3]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
-    string(14) "getTransitions"
+    string(7) "getName"
     ["class"]=>
     string(12) "DateTimeZone"
   }
   [4]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
-    string(11) "getLocation"
+    string(9) "getOffset"
     ["class"]=>
     string(12) "DateTimeZone"
   }
   [5]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
-    string(17) "listAbbreviations"
+    string(14) "getTransitions"
     ["class"]=>
     string(12) "DateTimeZone"
   }
   [6]=>
+  &object(ReflectionMethod)#%d (2) {
+    ["name"]=>
+    string(11) "getLocation"
+    ["class"]=>
+    string(12) "DateTimeZone"
+  }
+  [7]=>
+  &object(ReflectionMethod)#%d (2) {
+    ["name"]=>
+    string(17) "listAbbreviations"
+    ["class"]=>
+    string(12) "DateTimeZone"
+  }
+  [8]=>
   &object(ReflectionMethod)#%d (2) {
     ["name"]=>
     string(15) "listIdentifiers"

hphp/test/zend/bad/ext-date/DateTime_construct_error.php.expectf

@@ -1,7 +1,7 @@
 *** Testing date_create() : error conditions ***
 
 -- Testing new DateTime() with more than expected no. of arguments --
-HipHop Fatal error: %a
+HipHop Fatal error: %s
 Stack trace:
 #0 %s(%d): DateTime->__construct('GMT', Object(DateTimeZone), 99)
 #1 {main}

hphp/test/zend/bad/ext-date/DateTime_format_error.php.expectf

@@ -1,10 +1,10 @@
 *** Testing DateTime::format() : error conditions ***
 
 -- Testing date_date_formatcreate() function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing date_date_formatcreate() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_format_variation1.php.expectf

@@ -22,19 +22,19 @@ string(5) "-10.5"
 string(3) "0.5"
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -77,7 +77,7 @@ string(82) "10Europe/LondonThursdayThursday2005 42005Thu, 14 Jul 2005 22:30:41 +
 string(66) "CThursdaypm4141 PM 2005b14Europe/London2005-07-14T22:30:41+01:0031"
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -87,6 +87,6 @@ string(0) ""
 string(0) ""
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_getOffset_error.php.expectf

@@ -1,6 +1,6 @@
 *** Testing DateTime::getOffset() : error conditions ***
 
 -- Testing DateTime::getOffset() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_modify_error.php.expectf

@@ -1,10 +1,10 @@
 *** Testing DateTime::modify() : error conditions ***
 
 -- Testing DateTime::modify() function with less than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::modify() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_modify_variation1.php.expectf

@@ -1,19 +1,19 @@
 *** Testing DateTime::modify() : usage variation -  unexpected values to first argument $modify***
 
 -- int 0 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 1 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int -12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float 10.5 --
@@ -27,7 +27,7 @@ object(DateTime)#3 (3) {
 }
 
 -- float -10.5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float .5 --
@@ -41,86 +41,86 @@ object(DateTime)#3 (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase null --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase true --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase false --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase TRUE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase FALSE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- unset var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setDate_error.php.expectf

@@ -1,16 +1,16 @@
 *** Testing DateTime::setDate() : error conditions ***
 
 -- Testing DateTime::setDate() function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setDate() function with less than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setDate() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setDate_variation1.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setDate_variation2.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setDate_variation3.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setISODate_error.php.expectf

@@ -1,14 +1,14 @@
 *** Testing DateTime::setISODate () : error conditions ***
 
 -- Testing DateTime::setISODate() function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setISODate() function with less than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing date_isodate_set() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setISODate_variation1.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setISODate_variation2.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setISODate_variation3.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTime_error.php.expectf

@@ -1,14 +1,14 @@
 *** Testing DateTime::setTime() : error conditions ***
 
 -- Testing DateTime::setTime() function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setTime() function with less than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setTime() function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTime_variation1.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTime_variation2.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTime_variation3.php.expectf

@@ -71,19 +71,19 @@ object(DateTime)#%d (3) {
 }
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
@@ -147,35 +147,35 @@ object(DateTime)#%d (3) {
 }
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
@@ -199,6 +199,6 @@ object(DateTime)#%d (3) {
 }
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTimezone_error.php.expectf

@@ -1,10 +1,10 @@
 *** Testing DateTime::setTimezone () : error conditions ***
 
 -- Testing DateTime::setTimezone () function with zero arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- Testing DateTime::setTimezone () function with more than expected no. of arguments --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/DateTime_setTimezone_variation1.php.expectf

@@ -1,114 +1,114 @@
 *** Testing DateTime::setTimezone() : usage variation -  unexpected values to first argument $timezone***
 
 -- int 0 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 1 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int 12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int -12345 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float 10.5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float -10.5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- float .5 --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- int indexed array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- associative array --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- nested arrays --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase NULL --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase null --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase true --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- lowercase false --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase TRUE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- uppercase FALSE --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- empty string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string DQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- string SQ --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- mixed case string --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- heredoc --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- instance of classWithoutToString --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- undefined var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- unset var --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 
 -- resource --
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
 ===DONE===

hphp/test/zend/bad/ext-date/bug48476.php.expectf

@@ -1,6 +1,6 @@
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)
-HipHop Warning: %a
+HipHop Warning: %s
 bool(false)

hphp/test/zend/bad/ext-date/bug48678.php.expectf

@@ -6,8 +6,15 @@ DateInterval Object
     [h] => 12
     [i] => 30
     [s] => 5
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
-    [days] =>%s
+    [days] => 
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )
 DateInterval Object
 (
@@ -17,6 +24,13 @@ DateInterval Object
     [h] => 12
     [i] => 30
     [s] => 5
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
-    [days] =>%s
+    [days] => 0
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )

hphp/test/zend/bad/ext-date/bug49081.php.expectf

@@ -6,6 +6,13 @@ DateInterval Object
     [h] => 4
     [i] => 0
     [s] => 0
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
     [days] => 30
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )

hphp/test/zend/bad/ext-date/bug49778.php.expectf

@@ -1,4 +1,4 @@
-object(DateInterval)#1 (8) {
+object(DateInterval)#1 (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -11,10 +11,24 @@ object(DateInterval)#1 (8) {
   int(0)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   bool(false)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
 7
 (unknown)

hphp/test/zend/bad/ext-date/bug52738.php.expectf

@@ -10,6 +10,13 @@ di Object
     [h] => 0
     [i] => 0
     [s] => 0
+    [weekday] => 0
+    [weekday_behavior] => 0
+    [first_last_day_of] => 0
     [invert] => 0
     [days] => 
+    [special_type] => 0
+    [special_amount] => 0
+    [have_weekday_relative] => 0
+    [have_special_relative] => 0
 )

hphp/test/zend/bad/ext-date/bug52808.php.expectf

@@ -1,4 +1,4 @@
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(1)
   ["m"]=>
@@ -11,12 +11,26 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(1)
   ["days"]=>
   int(437)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -29,12 +43,26 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(294)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
-object(DateInterval)#%d (8) {
+object(DateInterval)#%d (15) {
   ["y"]=>
   int(0)
   ["m"]=>
@@ -47,10 +75,24 @@ object(DateInterval)#%d (8) {
   int(30)
   ["s"]=>
   int(0)
+  ["weekday"]=>
+  int(0)
+  ["weekday_behavior"]=>
+  int(0)
+  ["first_last_day_of"]=>
+  int(0)
   ["invert"]=>
   int(0)
   ["days"]=>
   int(294)
+  ["special_type"]=>
+  int(0)
+  ["special_amount"]=>
+  int(0)
+  ["have_weekday_relative"]=>
+  int(0)
+  ["have_special_relative"]=>
+  int(0)
 }
 DateInterval::__construct(): Failed to parse interval (2007-05-11T15:30:00Z/)
 DateInterval::__construct(): Failed to parse interval (2007-05-11T15:30:00Z)

hphp/test/zend/bad/ext-date/bug53437.php

@@ -15,8 +15,8 @@ $dpu = unserialize($ser); // $dpu has invalid values???
 var_dump($dpu);
 
 echo "Unserialized:\r\n";
-// ???which leads to CRASH:
 foreach($dpu as $dt) {
         echo $dt->format('Y-m-d H:i:s')."\r\n";
 }
-?>
+?>
+==DONE==

hphp/test/zend/bad/ext-date/bug53437.php.expectf

@@ -0,0 +1,128 @@
+Original:
+2010-01-01 00:00:00
+2010-01-02 00:00:00
+2010-01-03 00:00:00
+
+object(DatePeriod)#1 (6) {
+  ["start"]=>
+  object(DateTime)#2 (3) {
+    ["date"]=>
+    string(19) "2010-01-01 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  object(DateTime)#4 (3) {
+    ["date"]=>
+    string(19) "2010-01-04 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#5 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(1)
+    ["h"]=>
+    int(0)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    bool(false)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
+}
+object(DatePeriod)#5 (6) {
+  ["start"]=>
+  object(DateTime)#10 (3) {
+    ["date"]=>
+    string(19) "2010-01-01 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["current"]=>
+  object(DateTime)#7 (3) {
+    ["date"]=>
+    string(19) "2010-01-04 00:00:00"
+    ["timezone_type"]=>
+    int(3)
+    ["timezone"]=>
+    string(3) "UTC"
+  }
+  ["end"]=>
+  NULL
+  ["interval"]=>
+  object(DateInterval)#8 (15) {
+    ["y"]=>
+    int(0)
+    ["m"]=>
+    int(0)
+    ["d"]=>
+    int(1)
+    ["h"]=>
+    int(0)
+    ["i"]=>
+    int(0)
+    ["s"]=>
+    int(0)
+    ["weekday"]=>
+    int(0)
+    ["weekday_behavior"]=>
+    int(0)
+    ["first_last_day_of"]=>
+    int(0)
+    ["invert"]=>
+    int(0)
+    ["days"]=>
+    int(0)
+    ["special_type"]=>
+    int(0)
+    ["special_amount"]=>
+    int(0)
+    ["have_weekday_relative"]=>
+    int(0)
+    ["have_special_relative"]=>
+    int(0)
+  }
+  ["recurrences"]=>
+  int(3)
+  ["include_start_date"]=>
+  bool(true)
+}
+Unserialized:
+2010-01-01 00:00:00
+2010-01-02 00:00:00
+2010-01-03 00:00:00
+==DONE==

hphp/test/zend/bad/ext-date/bug53437_var1.php

@@ -0,0 +1,8 @@
+<?php
+$s = 'O:10:"DatePeriod":0:{}';
+
+$dp = unserialize($s);
+
+var_dump($dp);
+?>
+==DONE==