diff --git a/hphp/test/zend/bad/ext-bz2/003.php.expectf b/hphp/test/zend/bad/ext-bz2/003.php.expectf index 3fae11e98..3713c5102 100644 --- a/hphp/test/zend/bad/ext-bz2/003.php.expectf +++ b/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" diff --git a/hphp/test/zend/bad/ext-bz2/005.php.expectf b/hphp/test/zend/bad/ext-bz2/005.php.expectf index c10f6ce93..3210d58e4 100644 --- a/hphp/test/zend/bad/ext-bz2/005.php.expectf +++ b/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) diff --git a/hphp/test/zend/bad/ext-curl/bug48203.php.expectf b/hphp/test/zend/bad/ext-curl/bug48203.php.expectf index bf60dbb6a..b47810c28 100644 --- a/hphp/test/zend/bad/ext-curl/bug48203.php.expectf +++ b/hphp/test/zend/bad/ext-curl/bug48203.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s %A Ok \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug48203_multi.php.expectf b/hphp/test/zend/bad/ext-curl/bug48203_multi.php.expectf index 8b5b7f751..0cf044d69 100644 --- a/hphp/test/zend/bad/ext-curl/bug48203_multi.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug48207.php.expectf b/hphp/test/zend/bad/ext-curl/bug48207.php.expectf index fa8cee1ae..0ee0595ed 100644 --- a/hphp/test/zend/bad/ext-curl/bug48207.php.expectf +++ b/hphp/test/zend/bad/ext-curl/bug48207.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s Hello World! Hello World! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug54798.php.expectf b/hphp/test/zend/bad/ext-curl/bug54798.php.expectf index b850584e8..b63a7625f 100644 --- a/hphp/test/zend/bad/ext-curl/bug54798.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug54995.php b/hphp/test/zend/bad/ext-curl/bug54995.php new file mode 100644 index 000000000..6d7439f9e --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/bug54995.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug54995.php.expectf b/hphp/test/zend/bad/ext-curl/bug54995.php.expectf new file mode 100644 index 000000000..254d25151 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/bug54995.php.expectf @@ -0,0 +1 @@ +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug63363.php.expectf b/hphp/test/zend/bad/ext-curl/bug63363.php.expectf index ffa491400..2dd90557a 100644 --- a/hphp/test/zend/bad/ext-curl/bug63363.php.expectf +++ b/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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/bug63795.php.expectf b/hphp/test/zend/bad/ext-curl/bug63795.php.expectf index ffa491400..2dd90557a 100644 --- a/hphp/test/zend/bad/ext-curl/bug63795.php.expectf +++ b/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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/check_win_config.php b/hphp/test/zend/bad/ext-curl/check_win_config.php new file mode 100644 index 000000000..626209c79 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/check_win_config.php @@ -0,0 +1,11 @@ + +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/check_win_config.php.expectf b/hphp/test/zend/bad/ext-curl/check_win_config.php.expectf new file mode 100644 index 000000000..7ffc3a394 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_basic_022.php b/hphp/test/zend/bad/ext-curl/curl_basic_022.php new file mode 100644 index 000000000..33314d49e --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_basic_022.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_basic_022.php.expectf b/hphp/test/zend/bad/ext-curl/curl_basic_022.php.expectf new file mode 100644 index 000000000..adbac6d6f --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_escape.php b/hphp/test/zend/bad/ext-curl/curl_escape.php new file mode 100644 index 000000000..5bdc5b439 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_escape.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_escape.php.expectf b/hphp/test/zend/bad/ext-curl/curl_escape.php.expectf new file mode 100644 index 000000000..9d5a8ea33 Binary files /dev/null and b/hphp/test/zend/bad/ext-curl/curl_escape.php.expectf differ diff --git a/hphp/test/zend/bad/ext-curl/curl_file_serialize.php b/hphp/test/zend/bad/ext-curl/curl_file_serialize.php new file mode 100644 index 000000000..09a77c613 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_file_serialize.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_file_serialize.php.expectf b/hphp/test/zend/bad/ext-curl/curl_file_serialize.php.expectf new file mode 100644 index 000000000..247bced6c --- /dev/null +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_file_upload.php b/hphp/test/zend/bad/ext-curl/curl_file_upload.php new file mode 100644 index 000000000..7cb1eadfb --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_file_upload.php @@ -0,0 +1,54 @@ + $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); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_file_upload.php.expectf b/hphp/test/zend/bad/ext-curl/curl_file_upload.php.expectf new file mode 100644 index 000000000..bf55c2a44 --- /dev/null +++ b/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" +} +" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_multi_getcontent_error4.php.expectf b/hphp/test/zend/bad/ext-curl/curl_multi_getcontent_error4.php.expectf index 4f2a3d117..1684bb9c5 100644 --- a/hphp/test/zend/bad/ext-curl/curl_multi_getcontent_error4.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php b/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php new file mode 100644 index 000000000..54cf45cd8 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php.expectf b/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php.expectf new file mode 100644 index 000000000..fcf53043d --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_multi_setopt_basic001.php.expectf @@ -0,0 +1,3 @@ +bool(true) +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php b/hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php new file mode 100644 index 000000000..1d2066dc1 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php.expectf b/hphp/test/zend/bad/ext-curl/curl_multi_strerror_001.php.expectf new file mode 100644 index 000000000..b8906e567 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_reset.php b/hphp/test/zend/bad/ext-curl/curl_reset.php new file mode 100644 index 000000000..504d05c68 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_reset.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_reset.php.expectf b/hphp/test/zend/bad/ext-curl/curl_reset.php.expectf new file mode 100644 index 000000000..4b0a21d6f --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_reset.php.expectf @@ -0,0 +1 @@ +testtest \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_setopt_CURLOPT_READFUNCTION.php b/hphp/test/zend/bad/ext-curl/curl_setopt_CURLOPT_READFUNCTION.php index 9187c51b1..e58eb58f7 100644 --- a/hphp/test/zend/bad/ext-curl/curl_setopt_CURLOPT_READFUNCTION.php +++ b/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=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_setopt_error.php.expectf b/hphp/test/zend/bad/ext-curl/curl_setopt_error.php.expectf index f9d12ffa3..8b30f9696 100644 --- a/hphp/test/zend/bad/ext-curl/curl_setopt_error.php.expectf +++ b/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 \ No newline at end of file +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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php b/hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php new file mode 100644 index 000000000..fe45dd47c --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php.expectf b/hphp/test/zend/bad/ext-curl/curl_share_setopt_basic001.php.expectf new file mode 100644 index 000000000..be1343e38 --- /dev/null +++ b/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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_strerror_001.php b/hphp/test/zend/bad/ext-curl/curl_strerror_001.php new file mode 100644 index 000000000..70e2f3be9 --- /dev/null +++ b/hphp/test/zend/bad/ext-curl/curl_strerror_001.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_strerror_001.php.expectf b/hphp/test/zend/bad/ext-curl/curl_strerror_001.php.expectf new file mode 100644 index 000000000..375c7e545 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf b/hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf index f2aa0a9ba..21c8029d4 100644 --- a/hphp/test/zend/bad/ext-curl/curl_version_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-curl/curl_version_variation1.php.expectf b/hphp/test/zend/bad/ext-curl/curl_version_variation1.php.expectf index 7014ad9b1..5459bf66a 100644 --- a/hphp/test/zend/bad/ext-curl/curl_version_variation1.php.expectf +++ b/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) diff --git a/hphp/test/zend/bad/ext-date/005.php.expectf b/hphp/test/zend/bad/ext-date/005.php.expectf index 85ec6c91f..000f4ba3c 100644 --- a/hphp/test/zend/bad/ext-date/005.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/006.php.expectf b/hphp/test/zend/bad/ext-date/006.php.expectf index 7cd6b172e..34353b347 100644 --- a/hphp/test/zend/bad/ext-date/006.php.expectf +++ b/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) diff --git a/hphp/test/zend/bad/ext-date/007.php.expectf b/hphp/test/zend/bad/ext-date/007.php.expectf index c12c8c4dc..378e4f628 100644 --- a/hphp/test/zend/bad/ext-date/007.php.expectf +++ b/hphp/test/zend/bad/ext-date/007.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) array(9) { [0]=> diff --git a/hphp/test/zend/bad/ext-date/008.php.expectf b/hphp/test/zend/bad/ext-date/008.php.expectf index 3621d3c55..19efa2ed1 100644 --- a/hphp/test/zend/bad/ext-date/008.php.expectf +++ b/hphp/test/zend/bad/ext-date/008.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) array(11) { ["seconds"]=> diff --git a/hphp/test/zend/bad/ext-date/009.php.expectf b/hphp/test/zend/bad/ext-date/009.php.expectf index 6e4d0a65d..ccce19720 100644 --- a/hphp/test/zend/bad/ext-date/009.php.expectf +++ b/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 diff --git a/hphp/test/zend/bad/ext-date/009_win32.php.expectf b/hphp/test/zend/bad/ext-date/009_win32.php.expectf index faccb7fa7..e6c85104c 100644 --- a/hphp/test/zend/bad/ext-date/009_win32.php.expectf +++ b/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" diff --git a/hphp/test/zend/bad/ext-date/011.php.expectf b/hphp/test/zend/bad/ext-date/011.php.expectf index a0dc24aa0..19eee2242 100644 --- a/hphp/test/zend/bad/ext-date/011.php.expectf +++ b/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) diff --git a/hphp/test/zend/bad/ext-date/012.php.expectf b/hphp/test/zend/bad/ext-date/012.php.expectf index 562b1c137..2bce3e33c 100644 --- a/hphp/test/zend/bad/ext-date/012.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/013.php.expectf b/hphp/test/zend/bad/ext-date/013.php.expectf index 9cabf3df5..ea086a033 100644 --- a/hphp/test/zend/bad/ext-date/013.php.expectf +++ b/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) { diff --git a/hphp/test/zend/bad/ext-date/014.php.expectf b/hphp/test/zend/bad/ext-date/014.php.expectf index c44095ec5..637d70397 100644 --- a/hphp/test/zend/bad/ext-date/014.php.expectf +++ b/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 \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic1.php b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic1.php similarity index 100% rename from hphp/test/zend/good/ext-date/DateTimeZone_clone_basic1.php rename to hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic1.php diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic1.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic1.php.expectf new file mode 100644 index 000000000..b005f1207 --- /dev/null +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic2.php b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic2.php similarity index 100% rename from hphp/test/zend/good/ext-date/DateTimeZone_clone_basic2.php rename to hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic2.php diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic2.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic2.php.expectf similarity index 52% rename from hphp/test/zend/good/ext-date/DateTimeZone_clone_basic2.php.expectf rename to hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic2.php.expectf index 341e1e83c..a1a077094 100644 --- a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic2.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic3.php b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic3.php similarity index 100% rename from hphp/test/zend/good/ext-date/DateTimeZone_clone_basic3.php rename to hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic3.php diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic3.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic3.php.expectf similarity index 60% rename from hphp/test/zend/good/ext-date/DateTimeZone_clone_basic3.php.expectf rename to hphp/test/zend/bad/ext-date/DateTimeZone_clone_basic3.php.expectf index ebe6b0012..ee9b2e57d 100644 --- a/hphp/test/zend/good/ext-date/DateTimeZone_clone_basic3.php.expectf +++ b/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"]=> diff --git a/hphp/test/zend/good/ext-date/DateTimeZone_construct_basic.php b/hphp/test/zend/bad/ext-date/DateTimeZone_construct_basic.php similarity index 100% rename from hphp/test/zend/good/ext-date/DateTimeZone_construct_basic.php rename to hphp/test/zend/bad/ext-date/DateTimeZone_construct_basic.php diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_construct_basic.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_construct_basic.php.expectf new file mode 100644 index 000000000..e0f51c036 --- /dev/null +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.php.expectf index a266b5ec5..80754b991 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_construct_error.php.expectf +++ b/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} diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_getName_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_getName_error.php.expectf index 3d1a63d27..233e3e0e0 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_getName_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_error.php.expectf index 91334601c..b55fe6a67 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_variation1.php.expectf index 1f6cfbb34..9fe501e21 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_getOffset_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_getTransitions_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_getTransitions_error.php.expectf index 775bbf457..2333ab7d1 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_getTransitions_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php new file mode 100644 index 000000000..ccd0b865c --- /dev/null +++ b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php @@ -0,0 +1,16 @@ +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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_1.php.expectf new file mode 100644 index 000000000..1a5e6cb0e --- /dev/null +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php new file mode 100644 index 000000000..e6474d119 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php @@ -0,0 +1,16 @@ +getName() ); + +?> +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_2.php.expectf new file mode 100644 index 000000000..d4268449a --- /dev/null +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php new file mode 100644 index 000000000..8e8a6630c --- /dev/null +++ b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php @@ -0,0 +1,16 @@ +getName() ); + +?> +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_serialize_type_3.php.expectf new file mode 100644 index 000000000..d4268449a --- /dev/null +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTimeZone_verify.php.expectf b/hphp/test/zend/bad/ext-date/DateTimeZone_verify.php.expectf index 2f6ee006c..5a50c4873 100644 --- a/hphp/test/zend/bad/ext-date/DateTimeZone_verify.php.expectf +++ b/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" diff --git a/hphp/test/zend/bad/ext-date/DateTime_construct_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_construct_error.php.expectf index 237d843d1..a1e39b95e 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_construct_error.php.expectf +++ b/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} diff --git a/hphp/test/zend/bad/ext-date/DateTime_format_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_format_error.php.expectf index 9d71e2330..dd781e663 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_format_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_format_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_format_variation1.php.expectf index 877a8ef43..3399d30cf 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_format_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_getOffset_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_getOffset_error.php.expectf index 53cf4d936..295749bc6 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_getOffset_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_modify_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_modify_error.php.expectf index c4572add6..84d60a189 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_modify_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_modify_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_modify_variation1.php.expectf index 4bab8678a..c6f990883 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_modify_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setDate_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setDate_error.php.expectf index f0af703eb..8594117fe 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setDate_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setDate_variation1.php.expectf index 0b2381611..380760714 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation2.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setDate_variation2.php.expectf index 098730419..c2aeee49b 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation2.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation3.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setDate_variation3.php.expectf index 64d841e0e..ae9fad979 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setDate_variation3.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setISODate_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setISODate_error.php.expectf index 6c8f0660b..20f41183b 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setISODate_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation1.php.expectf index 21c088709..123f5881f 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation2.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation2.php.expectf index 2d7b2f3e3..5672e3cf2 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation2.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation3.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation3.php.expectf index a9297dfbe..a9dc73c59 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setISODate_variation3.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTime_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTime_error.php.expectf index e5cae1ec1..2c42806f0 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTime_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTime_variation1.php.expectf index 3d16233df..10b7df2e0 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation2.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTime_variation2.php.expectf index ca3ec2bee..e472c0c8e 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation2.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation3.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTime_variation3.php.expectf index a76ffe4d2..82b9d30de 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTime_variation3.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTimezone_error.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTimezone_error.php.expectf index a375f6fbb..0975f84bd 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTimezone_error.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/DateTime_setTimezone_variation1.php.expectf b/hphp/test/zend/bad/ext-date/DateTime_setTimezone_variation1.php.expectf index 7470ddeae..527b5e4a5 100644 --- a/hphp/test/zend/bad/ext-date/DateTime_setTimezone_variation1.php.expectf +++ b/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=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/bug35422.php b/hphp/test/zend/bad/ext-date/bug35422.php similarity index 100% rename from hphp/test/zend/good/ext-date/bug35422.php rename to hphp/test/zend/bad/ext-date/bug35422.php diff --git a/hphp/test/zend/good/ext-date/bug35422.php.expectf b/hphp/test/zend/bad/ext-date/bug35422.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-date/bug35422.php.expectf rename to hphp/test/zend/bad/ext-date/bug35422.php.expectf diff --git a/hphp/test/zend/good/ext-date/bug37017.php b/hphp/test/zend/bad/ext-date/bug37017.php similarity index 100% rename from hphp/test/zend/good/ext-date/bug37017.php rename to hphp/test/zend/bad/ext-date/bug37017.php diff --git a/hphp/test/zend/good/ext-date/bug37017.php.expectf b/hphp/test/zend/bad/ext-date/bug37017.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-date/bug37017.php.expectf rename to hphp/test/zend/bad/ext-date/bug37017.php.expectf diff --git a/hphp/test/zend/bad/ext-date/bug48476.php.expectf b/hphp/test/zend/bad/ext-date/bug48476.php.expectf index b9f09a619..f6e30c63f 100644 --- a/hphp/test/zend/bad/ext-date/bug48476.php.expectf +++ b/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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug48678.php.expectf b/hphp/test/zend/bad/ext-date/bug48678.php.expectf index 64315ae5e..f6b7b2878 100644 --- a/hphp/test/zend/bad/ext-date/bug48678.php.expectf +++ b/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 ) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug49081.php.expectf b/hphp/test/zend/bad/ext-date/bug49081.php.expectf index a30d2b82e..a5362c558 100644 --- a/hphp/test/zend/bad/ext-date/bug49081.php.expectf +++ b/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 ) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug49778.php.expectf b/hphp/test/zend/bad/ext-date/bug49778.php.expectf index 5ffc5d7a5..017c819be 100644 --- a/hphp/test/zend/bad/ext-date/bug49778.php.expectf +++ b/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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug52738.php.expectf b/hphp/test/zend/bad/ext-date/bug52738.php.expectf index 719460157..533022945 100644 --- a/hphp/test/zend/bad/ext-date/bug52738.php.expectf +++ b/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 ) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug52808.php.expectf b/hphp/test/zend/bad/ext-date/bug52808.php.expectf index 10156e706..acae606ae 100644 --- a/hphp/test/zend/bad/ext-date/bug52808.php.expectf +++ b/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) diff --git a/hphp/test/zend/bad/ext-date/bug53437.php b/hphp/test/zend/bad/ext-date/bug53437.php index f854a66b9..aef3d94b8 100644 --- a/hphp/test/zend/bad/ext-date/bug53437.php +++ b/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"; } -?> \ No newline at end of file +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437.php.expectf b/hphp/test/zend/bad/ext-date/bug53437.php.expectf index e69de29bb..61cb94fcc 100644 --- a/hphp/test/zend/bad/ext-date/bug53437.php.expectf +++ b/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== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var1.php b/hphp/test/zend/bad/ext-date/bug53437_var1.php new file mode 100644 index 000000000..c73427f51 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var1.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var1.php.expectf b/hphp/test/zend/bad/ext-date/bug53437_var1.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var1.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var2.php b/hphp/test/zend/bad/ext-date/bug53437_var2.php new file mode 100644 index 000000000..dcdd3c0e6 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var2.php @@ -0,0 +1,11 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var2.php.expectf b/hphp/test/zend/bad/ext-date/bug53437_var2.php.expectf new file mode 100644 index 000000000..264541b5f --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var2.php.expectf @@ -0,0 +1,65 @@ +object(DateInterval)#1 (15) { + ["y"]=> + int(2) + ["m"]=> + int(0) + ["d"]=> + int(4) + ["h"]=> + int(6) + ["i"]=> + int(8) + ["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) +} +object(DateInterval)#2 (15) { + ["y"]=> + int(2) + ["m"]=> + int(0) + ["d"]=> + int(4) + ["h"]=> + int(6) + ["i"]=> + int(8) + ["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) +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var3.php b/hphp/test/zend/bad/ext-date/bug53437_var3.php new file mode 100644 index 000000000..04392d480 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var3.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var3.php.expectf b/hphp/test/zend/bad/ext-date/bug53437_var3.php.expectf new file mode 100644 index 000000000..ec650ab0f --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var3.php.expectf @@ -0,0 +1,33 @@ +object(DateInterval)#%d (15) { + ["y"]=> + int(2) + ["m"]=> + int(0) + ["d"]=> + int(0) + ["h"]=> + int(6) + ["i"]=> + int(8) + ["s"]=> + int(0) + ["weekday"]=> + int(10) + ["weekday_behavior"]=> + int(10) + ["first_last_day_of"]=> + int(0) + ["invert"]=> + int(0) + ["days"]=> + int(0) + ["special_type"]=> + int(0) + ["special_amount"]=> + int(-1) + ["have_weekday_relative"]=> + int(9) + ["have_special_relative"]=> + int(0) +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var5.php b/hphp/test/zend/bad/ext-date/bug53437_var5.php new file mode 100644 index 000000000..04392d480 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var5.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug53437_var5.php.expectf b/hphp/test/zend/bad/ext-date/bug53437_var5.php.expectf new file mode 100644 index 000000000..1f54ed7ea --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug53437_var5.php.expectf @@ -0,0 +1,33 @@ +object(DateInterval)#%d (15) { + ["y"]=> + int(2) + ["m"]=> + int(0) + ["d"]=> + int(0) + ["h"]=> + int(6) + ["i"]=> + int(8) + ["s"]=> + int(0) + ["weekday"]=> + int(10) + ["weekday_behavior"]=> + int(10) + ["first_last_day_of"]=> + int(0) + ["invert"]=> + int(0) + ["days"]=> + int(0) + ["special_type"]=> + int(0) + ["special_amount"]=> + int(9223372036854775807) + ["have_weekday_relative"]=> + int(9) + ["have_special_relative"]=> + int(0) +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug60774.php b/hphp/test/zend/bad/ext-date/bug60774.php new file mode 100644 index 000000000..f4b5eaa4c --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug60774.php @@ -0,0 +1,6 @@ +format("%d"), "\n"; +echo $i->format("%a"), "\n"; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/bug60774.php.expectf b/hphp/test/zend/bad/ext-date/bug60774.php.expectf new file mode 100644 index 000000000..7c050acfe --- /dev/null +++ b/hphp/test/zend/bad/ext-date/bug60774.php.expectf @@ -0,0 +1,34 @@ +object(DateInterval)#1 (%d) { + ["y"]=> + int(0) + ["m"]=> + int(0) + ["d"]=> + int(2) + ["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) +} +2 +(unknown) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/checkdate_error.php.expectf b/hphp/test/zend/bad/ext-date/checkdate_error.php.expectf index e428cde55..1085d3d10 100644 --- a/hphp/test/zend/bad/ext-date/checkdate_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/checkdate_error.php.expectf @@ -1,14 +1,14 @@ *** Testing checkdate() : error conditions *** -- Testing checkdate() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing checkdate() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/checkdate_variation1.php.expectf b/hphp/test/zend/bad/ext-date/checkdate_variation1.php.expectf index 41099fe75..139b8cb74 100644 --- a/hphp/test/zend/bad/ext-date/checkdate_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/checkdate_variation1.php.expectf @@ -10,19 +10,19 @@ bool(false) 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 -- @@ -44,35 +44,35 @@ bool(true) 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 -- @@ -82,6 +82,6 @@ bool(false) bool(false) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/checkdate_variation2.php.expectf b/hphp/test/zend/bad/ext-date/checkdate_variation2.php.expectf index 0964d8b00..26c80ea97 100644 --- a/hphp/test/zend/bad/ext-date/checkdate_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/checkdate_variation2.php.expectf @@ -10,19 +10,19 @@ bool(false) 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 -- @@ -44,35 +44,35 @@ bool(true) 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 -- @@ -82,6 +82,6 @@ bool(false) bool(false) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/checkdate_variation3.php.expectf b/hphp/test/zend/bad/ext-date/checkdate_variation3.php.expectf index ca7f09ac9..8eb745bca 100644 --- a/hphp/test/zend/bad/ext-date/checkdate_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/checkdate_variation3.php.expectf @@ -10,19 +10,19 @@ bool(false) 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 -- @@ -44,35 +44,35 @@ bool(true) 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 -- @@ -82,6 +82,6 @@ bool(false) bool(false) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_create_error.php.expectf b/hphp/test/zend/bad/ext-date/date_create_error.php.expectf index 7b4e995f2..017010420 100644 --- a/hphp/test/zend/bad/ext-date/date_create_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_create_error.php.expectf @@ -1,6 +1,6 @@ *** Testing date_create() : error conditions *** -- Testing date_create() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_create_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_create_variation1.php.expectf index 9ff99c4ba..66915117b 100644 --- a/hphp/test/zend/bad/ext-date/date_create_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_create_variation1.php.expectf @@ -57,27 +57,27 @@ object(DateTime)#%d (3) { } -- empty array -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- int indexed array -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- associative array -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- nested arrays -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- uppercase NULL -- @@ -217,9 +217,9 @@ bool(false) bool(false) -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- undefined var -- @@ -259,8 +259,8 @@ object(DateTime)#%d (3) { } -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_create_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_create_variation2.php.expectf index ca5f4fbfc..0a3054a6a 100644 --- a/hphp/test/zend/bad/ext-date/date_create_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_create_variation2.php.expectf @@ -1,47 +1,47 @@ *** Testing date_create() : usage variation - unexpected values to second 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 -- @@ -65,51 +65,51 @@ object(DateTime)#%d (3) { } -- 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 -- @@ -133,6 +133,6 @@ object(DateTime)#%d (3) { } -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_date_set_error.php.expectf b/hphp/test/zend/bad/ext-date/date_date_set_error.php.expectf index 93a244cb4..dd47f9507 100644 --- a/hphp/test/zend/bad/ext-date/date_date_set_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_date_set_error.php.expectf @@ -1,18 +1,18 @@ *** Testing date_date_set() : error conditions *** -- Testing date_date_set() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_date_set() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_date_set() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_date_set_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_date_set_variation1.php.expectf index 43d7387a5..99f4ca8e4 100644 --- a/hphp/test/zend/bad/ext-date/date_date_set_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_date_set_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing date_date_set() : usage variation - unexpected values to first argument $object*** -- 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_date_set_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_date_set_variation2.php.expectf index 9c3562e0f..edd72d150 100644 --- a/hphp/test/zend/bad/ext-date/date_date_set_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_date_set_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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_date_set_variation3.php.expectf b/hphp/test/zend/bad/ext-date/date_date_set_variation3.php.expectf index 624da9f27..96c1357d9 100644 --- a/hphp/test/zend/bad/ext-date/date_date_set_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_date_set_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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_date_set_variation4.php.expectf b/hphp/test/zend/bad/ext-date/date_date_set_variation4.php.expectf index eb491eda9..18948cf17 100644 --- a/hphp/test/zend/bad/ext-date/date_date_set_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_date_set_variation4.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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_default_timezone_set_error.php.expectf b/hphp/test/zend/bad/ext-date/date_default_timezone_set_error.php.expectf index 86a128daf..fbf808326 100644 --- a/hphp/test/zend/bad/ext-date/date_default_timezone_set_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_default_timezone_set_error.php.expectf @@ -1,14 +1,14 @@ *** Testing date_default_timezone_set() : error variations *** -- Testing date_default_timezone_set() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_default_timezone_set() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_default_timezone_set() function with invalid timezone identifier -- -HipHop Notice: %a +HipHop Notice: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.php.expectf index 0c54a8620..cc15ba94c 100644 --- a/hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.php.expectf @@ -1,99 +1,99 @@ *** Testing date_default_timezone_set() : usage variations *** -- Iteration 1 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 2 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 3 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 4 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 5 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 6 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 10 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 11 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 13 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 15 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 16 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 17 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s xyz' is invalid in hphp/test/zend/bad/ext-date/date_default_timezone_set_variation1.phpt on line %d bool(false) -- Iteration 22 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 23 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_error.php.expectf b/hphp/test/zend/bad/ext-date/date_error.php.expectf index 90cc74db3..783eb685e 100644 --- a/hphp/test/zend/bad/ext-date/date_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_error.php.expectf @@ -1,10 +1,10 @@ *** Testing date() : error conditions *** -- Testing date function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_format_error.php.expectf b/hphp/test/zend/bad/ext-date/date_format_error.php.expectf index cb82dd8df..ff2098770 100644 --- a/hphp/test/zend/bad/ext-date/date_format_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_format_error.php.expectf @@ -1,22 +1,22 @@ *** Testing date_format() : error conditions *** -- Testing date_create() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_create() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_create() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_create() function with an invalid values for $object argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_format_variation1.php b/hphp/test/zend/bad/ext-date/date_format_variation1.php index 7dbb35a2a..a58ee78ba 100644 --- a/hphp/test/zend/bad/ext-date/date_format_variation1.php +++ b/hphp/test/zend/bad/ext-date/date_format_variation1.php @@ -1,8 +1,8 @@ bool(false) } -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_parse_error.php.expectf b/hphp/test/zend/bad/ext-date/date_parse_error.php.expectf index 29ab3f285..5e624f772 100644 --- a/hphp/test/zend/bad/ext-date/date_parse_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_parse_error.php.expectf @@ -1,11 +1,11 @@ *** Testing date_parse() : error conditions *** -- Testing date_parse() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_parse() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_parse() function with unexpected characters in $date argument -- diff --git a/hphp/test/zend/bad/ext-date/date_parse_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_parse_variation1.php.expectf index d1d526f10..732aef14b 100644 --- a/hphp/test/zend/bad/ext-date/date_parse_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_parse_variation1.php.expectf @@ -39,19 +39,19 @@ array(0) { } -- 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 -- @@ -135,7 +135,7 @@ array(2) { } -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- undefined var -- @@ -151,6 +151,6 @@ array(1) { } -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_period-immutable.php b/hphp/test/zend/bad/ext-date/date_period-immutable.php new file mode 100644 index 000000000..8f6aee8d4 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/date_period-immutable.php @@ -0,0 +1,23 @@ +format( "l Y-m-d\n" ); + echo $dt->modify( "3 tuesday" )->format( "l Y-m-d\n" ); + echo $dt->format( "l Y-m-d\n\n" ); +} + +foreach ( new DatePeriod( $db2, $di, $de ) as $dt ) +{ + echo get_class( $dt ), "\n"; + echo $dt->format( "l Y-m-d\n" ); + echo $dt->modify( "3 tuesday" )->format( "l Y-m-d\n" ); + echo $dt->format( "l Y-m-d\n\n" ); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_period-immutable.php.expectf b/hphp/test/zend/bad/ext-date/date_period-immutable.php.expectf new file mode 100644 index 000000000..a57fda035 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/date_period-immutable.php.expectf @@ -0,0 +1,29 @@ +DateTimeImmutable +Tuesday 2008-01-01 +Tuesday 2008-01-15 +Tuesday 2008-01-01 + +DateTimeImmutable +Friday 2008-02-01 +Tuesday 2008-02-19 +Friday 2008-02-01 + +DateTimeImmutable +Saturday 2008-03-01 +Tuesday 2008-03-18 +Saturday 2008-03-01 + +DateTime +Tuesday 2008-01-01 +Tuesday 2008-01-15 +Tuesday 2008-01-15 + +DateTime +Friday 2008-02-01 +Tuesday 2008-02-19 +Tuesday 2008-02-19 + +DateTime +Saturday 2008-03-01 +Tuesday 2008-03-18 +Tuesday 2008-03-18 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sun_info_error.php.expectf b/hphp/test/zend/bad/ext-date/date_sun_info_error.php.expectf index 56b9d5dbe..5cff299aa 100644 --- a/hphp/test/zend/bad/ext-date/date_sun_info_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sun_info_error.php.expectf @@ -1,14 +1,14 @@ *** Testing date_sun_info() : usage variations *** -- Testing date_sun_info() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_sun_info() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sun_info_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_sun_info_variation1.php.expectf index f31f91033..c241709d3 100644 --- a/hphp/test/zend/bad/ext-date/date_sun_info_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sun_info_variation1.php.expectf @@ -331,27 +331,27 @@ array(9) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -399,6 +399,6 @@ array(9) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sun_info_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_sun_info_variation2.php.expectf index 2572be358..a9d20c9be 100644 --- a/hphp/test/zend/bad/ext-date/date_sun_info_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sun_info_variation2.php.expectf @@ -331,27 +331,27 @@ array(9) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -399,6 +399,6 @@ array(9) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sun_info_variation3.php.expectf b/hphp/test/zend/bad/ext-date/date_sun_info_variation3.php.expectf index 9ef09389a..7b6e38842 100644 --- a/hphp/test/zend/bad/ext-date/date_sun_info_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sun_info_variation3.php.expectf @@ -331,27 +331,27 @@ array(9) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -399,6 +399,6 @@ array(9) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_error.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_error.php.expectf index fd549b0ff..27e7a55c9 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_error.php.expectf @@ -1,10 +1,10 @@ *** Testing date_sunrise() : error conditions *** -- Testing date_sunrise() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_sunrise() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation1.php.expectf index 2acb11beb..a6ed7f67a 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation1.php.expectf @@ -36,35 +36,35 @@ float(8.944%d) int(28599) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -98,67 +98,67 @@ float(8.944%d) int(28599) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation2.php.expectf index 6811ec720..8c9c87d79 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation2.php.expectf @@ -1,38 +1,38 @@ *** Testing date_sunrise() : usage variation *** --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float .5-- int(1218174483) --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-- @@ -54,35 +54,35 @@ string(5) "06:48" int(1218174483) --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-- diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation3.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation3.php.expectf index 622142412..71caed9d6 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation3.php.expectf @@ -21,35 +21,35 @@ bool(false) bool(false) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(1.174%d) int(1218177627) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation4.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation4.php.expectf index c127a31b7..689b4d4f2 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation4.php.expectf @@ -21,35 +21,35 @@ float(12.698%d) int(1218199315) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(5.200%d) int(1218172321) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation5.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation5.php.expectf index 5c024cf64..3faf83ea1 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation5.php.expectf @@ -21,35 +21,35 @@ float(9.9097820911118) int(1218169475) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ bool(false) bool(false) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunrise_variation6.php.expectf b/hphp/test/zend/bad/ext-date/date_sunrise_variation6.php.expectf index 335e9e877..dc0620dee 100644 --- a/hphp/test/zend/bad/ext-date/date_sunrise_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunrise_variation6.php.expectf @@ -21,35 +21,35 @@ float(12.800%d) int(1218174483) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(5.800%d) int(1218174483) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_error.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_error.php.expectf index f8a2e438a..bee0dad40 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_error.php.expectf @@ -1,14 +1,14 @@ *** Testing date_sunset() : error conditions *** -- Testing date_sunset() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_sunset() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation1.php.expectf index e2f270d8e..397f9da6b 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation1.php.expectf @@ -36,35 +36,35 @@ float(18.377%d) int(62558) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -98,67 +98,67 @@ float(18.377%d) int(62558) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation2.php.expectf index 7da6cf3ae..cc6d19a6c 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation2.php.expectf @@ -1,38 +1,38 @@ *** Testing date_sunset() : usage variation *** --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s bool(false) --float .5-- int(1218199253) --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-- @@ -54,35 +54,35 @@ string(5) "18:10" int(1218199253) --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-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation3.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation3.php.expectf index 27ee504eb..8a96070ac 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation3.php.expectf @@ -21,35 +21,35 @@ float(17.598%d) int(1218197155) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(17.730%d) int(1218197630) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation4.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation4.php.expectf index 0c5bb6e32..745ca47b6 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation4.php.expectf @@ -21,35 +21,35 @@ float(12.316%d) int(1218178138) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(0.059%d) int(1218220414) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation5.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation5.php.expectf index a185a15fd..f8669f3ac 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation5.php.expectf @@ -21,35 +21,35 @@ bool(false) bool(false) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ bool(false) bool(false) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_sunset_variation6.php.expectf b/hphp/test/zend/bad/ext-date/date_sunset_variation6.php.expectf index 439091986..712185cbd 100644 --- a/hphp/test/zend/bad/ext-date/date_sunset_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_sunset_variation6.php.expectf @@ -21,35 +21,35 @@ float(19.681%d) int(1218199253) --empty array-- -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 indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -83,67 +83,67 @@ float(12.681%d) int(1218199253) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string DQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --string SQ-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --heredoc-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/date_time_set_error.php.expectf b/hphp/test/zend/bad/ext-date/date_time_set_error.php.expectf index 47ab50e89..40160edce 100644 --- a/hphp/test/zend/bad/ext-date/date_time_set_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_time_set_error.php.expectf @@ -1,24 +1,24 @@ *** Testing date_time_set() : error conditions *** -- Testing date_time_set() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_time_set() 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 date_time_set() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_time_set() function with an invalid values for $object argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_time_set_variation1.php.expectf b/hphp/test/zend/bad/ext-date/date_time_set_variation1.php.expectf index ed9d6e6cc..4383b2101 100644 --- a/hphp/test/zend/bad/ext-date/date_time_set_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_time_set_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing date_time_set() : usage variation - unexpected values to first argument $object*** -- 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_time_set_variation2.php.expectf b/hphp/test/zend/bad/ext-date/date_time_set_variation2.php.expectf index 363c0bd52..1d521ee8e 100644 --- a/hphp/test/zend/bad/ext-date/date_time_set_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_time_set_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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_time_set_variation3.php.expectf b/hphp/test/zend/bad/ext-date/date_time_set_variation3.php.expectf index ddf5c3f49..9f368b0d1 100644 --- a/hphp/test/zend/bad/ext-date/date_time_set_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_time_set_variation3.php.expectf @@ -71,19 +71,19 @@ 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 -- @@ -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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_time_set_variation4.php.expectf b/hphp/test/zend/bad/ext-date/date_time_set_variation4.php.expectf index 0cbfe9868..7326002b3 100644 --- a/hphp/test/zend/bad/ext-date/date_time_set_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-date/date_time_set_variation4.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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/date_timezone_get_error.php b/hphp/test/zend/bad/ext-date/date_timezone_get_error.php index 2a00e8278..04200d7d1 100644 --- a/hphp/test/zend/bad/ext-date/date_timezone_get_error.php +++ b/hphp/test/zend/bad/ext-date/date_timezone_get_error.php @@ -1,8 +1,8 @@ bad arg: object(stdClass)#%d (0) { } -HipHop Warning: %a +HipHop Warning: %s NULL --> bad arg: int(1) diff --git a/hphp/test/zend/bad/ext-date/mktime_error.php.expectf b/hphp/test/zend/bad/ext-date/mktime_error.php.expectf index e95f92cef..ca056b7e5 100644 --- a/hphp/test/zend/bad/ext-date/mktime_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_error.php.expectf @@ -6,6 +6,6 @@ Strict Standards: mktime(): You should be using the time() function instead in h int(%d) -- Testing mktime() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation1.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation1.php.expectf index b424745db..97112e124 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation1.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation2.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation2.php.expectf index 5442667b6..2dad27e47 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation2.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation3.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation3.php.expectf index 642a40218..42ccd77c9 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation3.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation4.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation4.php.expectf index ce73b1228..1bd0193a5 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation4.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation5.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation5.php.expectf index 3d519d8b7..3d70ee2a8 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation5.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation6.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation6.php.expectf index 6849580df..db85b5f89 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation6.php.expectf @@ -19,19 +19,19 @@ int(%i) int(%i) -- 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 -- @@ -53,35 +53,35 @@ int(%i) int(%i) -- 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 -- @@ -91,6 +91,6 @@ int(%i) int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/mktime_variation7.php.expectf b/hphp/test/zend/bad/ext-date/mktime_variation7.php.expectf index 956392635..c7c351cfb 100644 --- a/hphp/test/zend/bad/ext-date/mktime_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-date/mktime_variation7.php.expectf @@ -29,19 +29,19 @@ Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/e int(-205162155) -- 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 -- @@ -75,35 +75,35 @@ Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/e int(%i) -- 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 -- @@ -117,6 +117,6 @@ Deprecated: mktime(): The is_dst parameter is deprecated in hphp/test/zend/bad/e int(%i) -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/oo_001.php.expectf b/hphp/test/zend/bad/ext-date/oo_001.php.expectf index 9f3ddf9f1..bd039dddd 100644 --- a/hphp/test/zend/bad/ext-date/oo_001.php.expectf +++ b/hphp/test/zend/bad/ext-date/oo_001.php.expectf @@ -1,9 +1,9 @@ string(19) "%d-%d-%d %d:%d:%d" -HipHop Warning: %a +HipHop Warning: %s bool(false) DateTime::__construct(): Failed to parse time string (1am todax) at position 4 (t): The timezone could not be found in the database string(3) "UTC" -HipHop Warning: %a +HipHop Warning: %s bool(false) DateTimeZone::__construct(): Unknown or bad timezone (GottaFindThisOne) DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/strftime_error.php.expectf b/hphp/test/zend/bad/ext-date/strftime_error.php.expectf index e3deda4a1..bf10ce91c 100644 --- a/hphp/test/zend/bad/ext-date/strftime_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/strftime_error.php.expectf @@ -1,6 +1,6 @@ *** Testing strftime() : error conditions *** -- Testing strftime() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/strftime_variation1.php.expectf b/hphp/test/zend/bad/ext-date/strftime_variation1.php.expectf index 181934b57..4ffd7d2f9 100644 --- a/hphp/test/zend/bad/ext-date/strftime_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/strftime_variation1.php.expectf @@ -37,27 +37,27 @@ string(3) "0.5" string(3) "0.5" --empty array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --associative array-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --uppercase NULL-- @@ -97,9 +97,9 @@ string(14) "Class A object" string(14) "Class A object" --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --undefined var-- diff --git a/hphp/test/zend/bad/ext-date/strftime_variation2.php.expectf b/hphp/test/zend/bad/ext-date/strftime_variation2.php.expectf index df4e6e63c..dacc173cd 100644 --- a/hphp/test/zend/bad/ext-date/strftime_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/strftime_variation2.php.expectf @@ -10,19 +10,19 @@ string(20) "Jan 01 1970 05:29:50" string(20) "Jan 01 1970 05:30:00" --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-- @@ -44,35 +44,35 @@ string(20) "Jan 01 1970 05:30:01" string(20) "Jan 01 1970 05:30:00" --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-- diff --git a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_error.php.expectf b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_error.php.expectf index 971fa5114..6063cc719 100644 --- a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_error.php.expectf @@ -1,10 +1,10 @@ *** Testing timezone_name_from_abbr() : error conditions *** -- Testing timezone_name_from_abbr() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_name_from_abbr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation1.php.expectf index 0d6ac18b1..8336d80e3 100644 --- a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation1.php.expectf @@ -19,19 +19,19 @@ string(13) "Europe/London" string(13) "Europe/London" -- 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 -- @@ -74,7 +74,7 @@ string(13) "Europe/London" string(13) "Europe/London" -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- undefined var -- @@ -84,6 +84,6 @@ string(13) "Europe/London" string(13) "Europe/London" -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation2.php.expectf b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation2.php.expectf index 88fe735af..999613d53 100644 --- a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation2.php.expectf @@ -19,19 +19,19 @@ string(3) "UTC" string(3) "UTC" -- 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 -- @@ -53,35 +53,35 @@ string(3) "UTC" string(3) "UTC" -- 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 -- @@ -91,6 +91,6 @@ string(3) "UTC" string(3) "UTC" -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation3.php.expectf b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation3.php.expectf index e40fc9af5..38a9e544b 100644 --- a/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_name_from_abbr_variation3.php.expectf @@ -19,19 +19,19 @@ string(3) "UTC" string(3) "UTC" -- 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 -- @@ -53,35 +53,35 @@ string(3) "UTC" string(3) "UTC" -- 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 -- @@ -91,6 +91,6 @@ string(3) "UTC" string(3) "UTC" -- resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_name_get_error.php.expectf b/hphp/test/zend/bad/ext-date/timezone_name_get_error.php.expectf index 1263ccf4a..0dcf8709a 100644 --- a/hphp/test/zend/bad/ext-date/timezone_name_get_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_name_get_error.php.expectf @@ -1,18 +1,18 @@ *** Testing timezone_name_get() : error conditions *** -- Testing timezone_name_get() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing date_timezone_set() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_name_get() function with an invalid values for $object argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_offset_get_error.php.expectf b/hphp/test/zend/bad/ext-date/timezone_offset_get_error.php.expectf index e1983ac57..502b0648d 100644 --- a/hphp/test/zend/bad/ext-date/timezone_offset_get_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_offset_get_error.php.expectf @@ -1,30 +1,30 @@ *** Testing timezone_offset_get() : error conditions *** -- Testing timezone_offset_get() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_offset_get() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_offset_get() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_offset_get() function with an invalid values for $object argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_offset_get() function with an invalid values for $datetime argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_offset_get_variation1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_offset_get_variation1.php.expectf index 7c3b17e1c..e1523225e 100644 --- a/hphp/test/zend/bad/ext-date/timezone_offset_get_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_offset_get_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing timezone_offset_get() : usage variation - unexpected values to first argument $object*** -- 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_offset_get_variation2.php.expectf b/hphp/test/zend/bad/ext-date/timezone_offset_get_variation2.php.expectf index d4c2c46bf..dfb5435e8 100644 --- a/hphp/test/zend/bad/ext-date/timezone_offset_get_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_offset_get_variation2.php.expectf @@ -1,114 +1,114 @@ *** Testing timezone_offset_get() : usage variation - unexpected values to second 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=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/timezone_open_basic1.php b/hphp/test/zend/bad/ext-date/timezone_open_basic1.php similarity index 100% rename from hphp/test/zend/good/ext-date/timezone_open_basic1.php rename to hphp/test/zend/bad/ext-date/timezone_open_basic1.php diff --git a/hphp/test/zend/bad/ext-date/timezone_open_basic1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_open_basic1.php.expectf new file mode 100644 index 000000000..4b32ce6a9 --- /dev/null +++ b/hphp/test/zend/bad/ext-date/timezone_open_basic1.php.expectf @@ -0,0 +1,20 @@ +*** Testing timezone_open() : 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_open_error.php.expectf b/hphp/test/zend/bad/ext-date/timezone_open_error.php.expectf index 5a9bdd124..e5b6475b6 100644 --- a/hphp/test/zend/bad/ext-date/timezone_open_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_open_error.php.expectf @@ -1,10 +1,10 @@ *** Testing timezone_open() : error conditions *** -- Testing timezone_open() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_open() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_open_variation1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_open_variation1.php.expectf index b25bcdc45..3a9618f26 100644 --- a/hphp/test/zend/bad/ext-date/timezone_open_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_open_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing timezone_open() : 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_transitions_get_error.php.expectf b/hphp/test/zend/bad/ext-date/timezone_transitions_get_error.php.expectf index 53a46ca21..8fdee3478 100644 --- a/hphp/test/zend/bad/ext-date/timezone_transitions_get_error.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_transitions_get_error.php.expectf @@ -1,18 +1,18 @@ *** Testing timezone_transitions_get() : error conditions *** -- Testing timezone_transitions_get() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_transitions_get() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing timezone_transitions_get() function with an invalid values for $object argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation1.php.expectf b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation1.php.expectf index 867ccd69f..4233c91c9 100644 --- a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing timezone_transitions_get() : usage variation - unexpected values to first argument $object*** -- 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=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation2.php.expectf b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation2.php.expectf index d409b98f9..83f4abcf6 100644 --- a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation2.php.expectf @@ -29,22 +29,22 @@ string(5) "array" int(8) -- empty array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- int indexed array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- associative array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- nested arrays -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) @@ -73,42 +73,42 @@ string(5) "array" int(8) -- empty string DQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- empty string SQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- string DQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- string SQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- mixed case string -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- heredoc -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- instance of classWithToString -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) @@ -121,7 +121,7 @@ string(5) "array" int(8) -- resource -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation3.php.expectf b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation3.php.expectf index bc76348bc..6fdbf6ab7 100644 --- a/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-date/timezone_transitions_get_variation3.php.expectf @@ -29,22 +29,22 @@ string(5) "array" int(1) -- empty array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- int indexed array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- associative array -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- nested arrays -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) @@ -73,42 +73,42 @@ string(5) "array" int(1) -- empty string DQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- empty string SQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- string DQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- string SQ -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- mixed case string -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- heredoc -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- instance of classWithToString -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) @@ -121,7 +121,7 @@ string(5) "array" int(1) -- resource -- -HipHop Warning: %a +HipHop Warning: %s string(7) "boolean" int(1) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-exif/exif_imagetype_error.php.expectf b/hphp/test/zend/bad/ext-exif/exif_imagetype_error.php.expectf index 4a04be639..895a23f70 100644 --- a/hphp/test/zend/bad/ext-exif/exif_imagetype_error.php.expectf +++ b/hphp/test/zend/bad/ext-exif/exif_imagetype_error.php.expectf @@ -1,14 +1,14 @@ *** Testing exif_imagetype() : error conditions *** -- Testing exif_imagetype() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing exif_imagetype() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing exif_imagetype() function with an unknown file -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-exif/exif_imagetype_variation1.php.expectf b/hphp/test/zend/bad/ext-exif/exif_imagetype_variation1.php.expectf index dce59780b..8456caf38 100644 --- a/hphp/test/zend/bad/ext-exif/exif_imagetype_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-exif/exif_imagetype_variation1.php.expectf @@ -1,85 +1,85 @@ *** Testing exif_imagetype() : different types for filename argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing exif_imagetype() by supplying different values for 'filename' argument --- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done diff --git a/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php b/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php index f5ab70734..abe5d32f4 100644 --- a/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php +++ b/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php @@ -73,7 +73,7 @@ $values = array ( // loop through each element of the array and check the working of exif_tagname() -// when $index arugment is supplied with different values +// when $index argument is supplied with different values echo "\n--- Testing exif_tagname() by supplying different values for 'index' argument ---\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php.expectf b/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php.expectf index a1403ee98..df20400b3 100644 --- a/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-exif/exif_tagname_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing exif_tagname() : different types for index argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing exif_tagname() by supplying different values for 'index' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- bool(false) @@ -45,20 +45,20 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- bool(false) -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-filter/009.php.expectf b/hphp/test/zend/bad/ext-filter/009.php.expectf index e23940704..85a9d4680 100644 --- a/hphp/test/zend/bad/ext-filter/009.php.expectf +++ b/hphp/test/zend/bad/ext-filter/009.php.expectf @@ -3,9 +3,9 @@ int(513) int(518) int(257) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-filter/040.php b/hphp/test/zend/bad/ext-filter/040.php similarity index 100% rename from hphp/test/zend/good/ext-filter/040.php rename to hphp/test/zend/bad/ext-filter/040.php diff --git a/hphp/test/zend/good/ext-filter/040.php.expectf b/hphp/test/zend/bad/ext-filter/040.php.expectf similarity index 71% rename from hphp/test/zend/good/ext-filter/040.php.expectf rename to hphp/test/zend/bad/ext-filter/040.php.expectf index d820b94fb..9fa00e44a 100644 --- a/hphp/test/zend/good/ext-filter/040.php.expectf +++ b/hphp/test/zend/bad/ext-filter/040.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) @@ -11,6 +11,6 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/001.php.expectf b/hphp/test/zend/bad/ext-gd/001.php.expectf index cdbec6fbb..380efd23d 100644 --- a/hphp/test/zend/bad/ext-gd/001.php.expectf +++ b/hphp/test/zend/bad/ext-gd/001.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug37360.php.expectf b/hphp/test/zend/bad/ext-gd/bug37360.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/bug37360.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug37360.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug39780.php.expectf b/hphp/test/zend/bad/ext-gd/bug39780.php.expectf index 432d9c23e..9ff924741 100644 --- a/hphp/test/zend/bad/ext-gd/bug39780.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug39780.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug39780_extern.php.expectf b/hphp/test/zend/bad/ext-gd/bug39780_extern.php.expectf index 4815e9426..a1b5144e0 100644 --- a/hphp/test/zend/bad/ext-gd/bug39780_extern.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug39780_extern.php.expectf @@ -1,4 +1,4 @@ gd-png: fatal libpng error: Read Error: truncated data gd-png error: setjmp returns error condition 2 -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug43073.php.expectf b/hphp/test/zend/bad/ext-gd/bug43073.php.expectf index c9414e5af..cd4324e58 100644 --- a/hphp/test/zend/bad/ext-gd/bug43073.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug43073.php.expectf @@ -1,16 +1,16 @@ -(500, 402), (610, 402), (610, 376), (500, 376) +(500, 40%d), (610, 40%d), (610, 376), (500, 376) (492, 363), (591, 322), (580, 295), (480, 336) (470, 331), (548, 254), (527, 233), (449, 310) (439, 309), (483, 202), (461, 193), (416, 299) -(401, 300), (401, 183), (381, 183), (381, 300) +(40%d, 300), (40%d, 183), (38%d, 183), (38%d, 300) (362, 307), (316, 195), (291, 205), (337, 318) (330, 329), (246, 244), (224, 265), (308, 350) (308, 360), (202, 316), (190, 344), (296, 388) -(300, 399), (186, 399), (186, 425), (300, 425) +(300, %d), (18%d, %d), (18%d, 425), (%d, 425) (306, 437), (195, 483), (206, 510), (318, 464) (328, 469), (240, 557), (260, 578), (349, 491) (359, 491), (312, 607), (334, 616), (382, 501) -(398, 500), (398, 618), (418, 618), (418, 500) +(%d, 500), (%d, 618), (41%d, 618), (41%d, 500) (436, 493), (483, 607), (507, 597), (461, 482) (468, 471), (555, 558), (577, 538), (490, 450) (490, 440), (600, 485), (611, 457), (502, 412) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug45799.php.expectf b/hphp/test/zend/bad/ext-gd/bug45799.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/bug45799.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug45799.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/bug48801.php.expectf b/hphp/test/zend/bad/ext-gd/bug48801.php.expectf index 144a90594..c3491fc82 100644 --- a/hphp/test/zend/bad/ext-gd/bug48801.php.expectf +++ b/hphp/test/zend/bad/ext-gd/bug48801.php.expectf @@ -1,4 +1,4 @@ (-1, 15) -(155, 15) -(155, -48) +(15%d, 15) +(15%d, -48) (-1, -48) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/colormatch.php.expectf b/hphp/test/zend/bad/ext-gd/colormatch.php.expectf index 47b2a40fb..76ca0fdb2 100644 --- a/hphp/test/zend/bad/ext-gd/colormatch.php.expectf +++ b/hphp/test/zend/bad/ext-gd/colormatch.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/createfromwbmp2.php.expectf b/hphp/test/zend/bad/ext-gd/createfromwbmp2.php.expectf index 9f1d21c43..3eb340714 100644 --- a/hphp/test/zend/bad/ext-gd/createfromwbmp2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/createfromwbmp2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-gd/createfromwbmp2.phpt on line %d -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/gd_info_error.php.expectf b/hphp/test/zend/bad/ext-gd/gd_info_error.php.expectf index d7ab1b430..7cc298070 100644 --- a/hphp/test/zend/bad/ext-gd/gd_info_error.php.expectf +++ b/hphp/test/zend/bad/ext-gd/gd_info_error.php.expectf @@ -1,8 +1,8 @@ *** Testing gd_info() : error conditions *** -- Testing gd_info() function with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageantialias_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imageantialias_error1.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imageantialias_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageantialias_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagechar_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagechar_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagechar_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagechar_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecharup_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagecharup_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecharup_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecharup_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation1.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation1.php.expectf index 81d054030..d85d800a4 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation1.php.expectf @@ -1,122 +1,122 @@ *** Testing imagecolorallocate() : usage variations *** -- int 0 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- int 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- int 12345 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- int -12345 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float 10.5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float -10.5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float 10.1234567e10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float 10.7654321E-10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float .5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- empty array -- -HipHop Warning: %a +HipHop Warning: %s NULL -- int indexed array -- -HipHop Warning: %a +HipHop Warning: %s NULL -- associative array -- -HipHop Warning: %a +HipHop Warning: %s NULL -- nested arrays -- -HipHop Warning: %a +HipHop Warning: %s NULL -- uppercase NULL -- -HipHop Warning: %a +HipHop Warning: %s NULL -- lowercase null -- -HipHop Warning: %a +HipHop Warning: %s NULL -- lowercase true -- -HipHop Warning: %a +HipHop Warning: %s NULL -- lowercase false -- -HipHop Warning: %a +HipHop Warning: %s NULL -- uppercase TRUE -- -HipHop Warning: %a +HipHop Warning: %s NULL -- uppercase FALSE -- -HipHop Warning: %a +HipHop Warning: %s NULL -- empty string DQ -- -HipHop Warning: %a +HipHop Warning: %s NULL -- empty string SQ -- -HipHop Warning: %a +HipHop Warning: %s NULL -- string DQ -- -HipHop Warning: %a +HipHop Warning: %s NULL -- string SQ -- -HipHop Warning: %a +HipHop Warning: %s NULL -- mixed case string -- -HipHop Warning: %a +HipHop Warning: %s NULL -- heredoc -- -HipHop Warning: %a +HipHop Warning: %s NULL -- instance of classWithToString -- -HipHop Warning: %a +HipHop Warning: %s NULL -- instance of classWithoutToString -- -HipHop Warning: %a +HipHop Warning: %s NULL -- undefined var -- -HipHop Warning: %a +HipHop Warning: %s NULL -- unset var -- -HipHop Warning: %a +HipHop Warning: %s NULL -- file resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation2.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation2.php.expectf index 99a834ff5..76998b491 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation2.php.expectf @@ -16,19 +16,19 @@ int(2570) int(2570) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -50,35 +50,35 @@ int(68106) int(2570) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- @@ -88,6 +88,6 @@ int(2570) int(2570) --file resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation3.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation3.php.expectf index 830de8e96..25c93129a 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation3.php.expectf @@ -16,19 +16,19 @@ int(655370) int(655370) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -50,35 +50,35 @@ int(655626) int(655370) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- @@ -88,6 +88,6 @@ int(655370) int(655370) --file resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation4.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation4.php.expectf index d94b2dea0..d5056673c 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocate_variation4.php.expectf @@ -16,19 +16,19 @@ int(657920) int(657920) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -50,35 +50,35 @@ int(657921) int(657920) --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- @@ -88,6 +88,6 @@ int(657920) int(657920) --file resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error1.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error1.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error2.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error3.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error3.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error4.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error4.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error5.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorallocatealpha_error5.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorclosesthwb.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorclosesthwb.php.expectf index bf4bdd1a2..d11fbf520 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorclosesthwb.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorclosesthwb.php.expectf @@ -1,7 +1,7 @@ int(16724480) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolordeallocate_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolormatch_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolormatch_error2.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolormatch_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolormatch_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolormatch_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolormatch_error3.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolormatch_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolormatch_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolormatch_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolormatch_error4.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolormatch_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolormatch_error4.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecolorstotal_error.php.expectf b/hphp/test/zend/bad/ext-gd/imagecolorstotal_error.php.expectf index 63348c606..50a7f0428 100644 --- a/hphp/test/zend/bad/ext-gd/imagecolorstotal_error.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagecolorstotal_error.php.expectf @@ -1,14 +1,14 @@ *** Testing imagecolorstotal() : error conditions *** -- Testing imagecolorstotal() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imagecolorstotal() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imagecolorstotal() function with a invalid resource -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageconvolution_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imageconvolution_error1.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imageconvolution_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageconvolution_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecrop_auto.php b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php new file mode 100644 index 000000000..4908bc86a --- /dev/null +++ b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php @@ -0,0 +1,53 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagecrop_auto.php.expectf b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php.expectf new file mode 100644 index 000000000..ac87683f5 --- /dev/null +++ b/hphp/test/zend/bad/ext-gd/imagecrop_auto.php.expectf @@ -0,0 +1,21 @@ +TC IMG_CROP_DEFAULT +int(11) +int(11) +Palette IMG_CROP_DEFAULT +int(11) +int(11) +TC IMG_CROP_SIDES +int(11) +int(11) +Palette IMG_CROP_SIDES +int(11) +int(11) +TC IMG_CROP_BLACK +int(11) +int(11) +Palette IMG_CROP_BLACK +int(11) +int(11) +IMG_CROP_THRESHOLD +int(240) +int(134) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageellipse_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imageellipse_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imageellipse_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageellipse_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilltoborder_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilltoborder_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error10.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error10.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error10.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error10.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error11.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error11.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error11.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error11.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error12.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error12.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error12.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error12.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error14.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error14.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error14.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error14.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error15.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error15.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error15.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error15.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error16.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error16.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error16.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error16.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error17.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error17.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error17.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error17.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error18.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error18.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error18.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error18.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error19.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error19.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error19.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error19.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error2.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error20.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error20.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error20.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error20.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error3.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error4.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error4.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error5.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error5.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error6.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error6.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error7.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error7.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error8.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error8.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error8.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error8.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagefilter_error9.php.expectf b/hphp/test/zend/bad/ext-gd/imagefilter_error9.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imagefilter_error9.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagefilter_error9.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageflip.php b/hphp/test/zend/bad/ext-gd/imageflip.php new file mode 100644 index 000000000..b9b6aec7d --- /dev/null +++ b/hphp/test/zend/bad/ext-gd/imageflip.php @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageflip.php.expectf b/hphp/test/zend/bad/ext-gd/imageflip.php.expectf new file mode 100644 index 000000000..fb34a8729 --- /dev/null +++ b/hphp/test/zend/bad/ext-gd/imageflip.php.expectf @@ -0,0 +1,4 @@ +string(2) "ff" +string(4) "ff00" +string(6) "ff0000" +string(2) "ff" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagegammacorrect_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagegammacorrect_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageinterlace_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imageinterlace_error2.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imageinterlace_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageinterlace_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageistruecolor_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imageistruecolor_error1.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imageistruecolor_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageistruecolor_error1.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagelayereffect_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagelayereffect_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagelayereffect_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagelayereffect_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagelayereffect_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagelayereffect_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagelayereffect_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagelayereffect_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagelayereffect_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagelayereffect_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagelayereffect_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagelayereffect_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageloadfont_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imageloadfont_error1.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-gd/imageloadfont_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageloadfont_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageloadfont_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imageloadfont_error2.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-gd/imageloadfont_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageloadfont_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imageloadfont_invalid.php.expectf b/hphp/test/zend/bad/ext-gd/imageloadfont_invalid.php.expectf index b37dd8d0d..78d2d9416 100644 --- a/hphp/test/zend/bad/ext-gd/imageloadfont_invalid.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imageloadfont_invalid.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s in %simageloadfont_invalid.php on line %d -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagerectangle_error8.php.expectf b/hphp/test/zend/bad/ext-gd/imagerectangle_error8.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagerectangle_error8.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagerectangle_error8.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagesetthickness_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagesetthickness_error1.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagesetthickness_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagesetthickness_error1.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagesetthickness_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagesetthickness_error2.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/imagesetthickness_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagesetthickness_error2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestring_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagestring_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestring_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestring_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error4.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error4.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error5.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error5.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error6.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error6.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error6.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error6.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagestringup_error7.php.expectf b/hphp/test/zend/bad/ext-gd/imagestringup_error7.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-gd/imagestringup_error7.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagestringup_error7.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error1.php.expectf b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error1.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error1.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error1.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error2.php.expectf b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error2.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error3.php.expectf b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error3.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/imagetruecolortopalette_error3.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error2.php.expectf b/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error2.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error2.php.expectf +++ b/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error3.php.expectf b/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error3.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/jpeg2wbmp_error3.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/libgd00086.php.expectf b/hphp/test/zend/bad/ext-gd/libgd00086.php.expectf index 432d9c23e..9ff924741 100644 --- a/hphp/test/zend/bad/ext-gd/libgd00086.php.expectf +++ b/hphp/test/zend/bad/ext-gd/libgd00086.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/libgd00086_extern.php.expectf b/hphp/test/zend/bad/ext-gd/libgd00086_extern.php.expectf index 2db8e5b98..2f57cd6f4 100644 --- a/hphp/test/zend/bad/ext-gd/libgd00086_extern.php.expectf +++ b/hphp/test/zend/bad/ext-gd/libgd00086_extern.php.expectf @@ -1,4 +1,4 @@ gd-png: fatal libpng error: Read Error: truncated data gd-png error: setjmp returns error condition 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/libgd00094.php.expectf b/hphp/test/zend/bad/ext-gd/libgd00094.php.expectf index 6db1e0f52..1a833f741 100644 --- a/hphp/test/zend/bad/ext-gd/libgd00094.php.expectf +++ b/hphp/test/zend/bad/ext-gd/libgd00094.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s in %slibgd00094.php on line %d -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/libgd00101.php.expectf b/hphp/test/zend/bad/ext-gd/libgd00101.php.expectf index d6ae4be69..ec4301b29 100644 --- a/hphp/test/zend/bad/ext-gd/libgd00101.php.expectf +++ b/hphp/test/zend/bad/ext-gd/libgd00101.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s in %slibgd00101.php on line %d -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/png2wbmp_error3.php.expectf b/hphp/test/zend/bad/ext-gd/png2wbmp_error3.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-gd/png2wbmp_error3.php.expectf +++ b/hphp/test/zend/bad/ext-gd/png2wbmp_error3.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/bug64745.php b/hphp/test/zend/bad/ext-hash/bug64745.php new file mode 100644 index 000000000..916099fb6 --- /dev/null +++ b/hphp/test/zend/bad/ext-hash/bug64745.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/bug64745.php.expectf b/hphp/test/zend/bad/ext-hash/bug64745.php.expectf new file mode 100644 index 000000000..18cde14ba --- /dev/null +++ b/hphp/test/zend/bad/ext-hash/bug64745.php.expectf @@ -0,0 +1,2 @@ +string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6" +string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/hash_copy_002.php.expectf b/hphp/test/zend/bad/ext-hash/hash_copy_002.php.expectf index b2dd2567e..b6d58c999 100644 --- a/hphp/test/zend/bad/ext-hash/hash_copy_002.php.expectf +++ b/hphp/test/zend/bad/ext-hash/hash_copy_002.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL resource(%d) of type (Hash Context) -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-hash/hash_file_basic.php b/hphp/test/zend/bad/ext-hash/hash_file_basic.php similarity index 97% rename from hphp/test/zend/good/ext-hash/hash_file_basic.php rename to hphp/test/zend/bad/ext-hash/hash_file_basic.php index c6046e9f2..1822de10b 100644 --- a/hphp/test/zend/good/ext-hash/hash_file_basic.php +++ b/hphp/test/zend/bad/ext-hash/hash_file_basic.php @@ -19,7 +19,8 @@ var_dump( hash_file( 'sha512', $filename ) ); var_dump( base64_encode( hash_file( 'md5', $filename, true ) ) ); ?> -===DONE=== + -===DONE=== + +===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/hash_pbkdf2_basic.php.expectf b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_basic.php.expectf new file mode 100644 index 000000000..8bfd1e409 --- /dev/null +++ b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_basic.php.expectf @@ -0,0 +1,10 @@ +*** Testing hash_pbkdf2() : basic functionality *** +sha1: 0c60c80f961f0e71f3a9 +sha1(raw): 0c60c80f961f0e71f3a9b524af6012062fe037a6 +sha1(rounds): 3d2eec4fe41c849b80c8d8366 +sha1(rounds)(raw): 3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038 +sha256: 120fb6cffcf8b32c43e7 +sha256(raw): 120fb6cffcf8b32c43e7225256c4f837a86548c9 +sha256(rounds): 348c89dbcbd32b2f32d814b8116e84cf2b17347e +sha256(rounds)(raw): 348c89dbcbd32b2f32d814b8116e84cf2b17347ebc1800181c4e2a1fb8dd53e1c635518c7dac47e9 +===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php new file mode 100644 index 000000000..6e29fea7a --- /dev/null +++ b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php @@ -0,0 +1,41 @@ + +===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php.expectf b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php.expectf new file mode 100644 index 000000000..7684ed092 --- /dev/null +++ b/hphp/test/zend/bad/ext-hash/hash_pbkdf2_error.php.expectf @@ -0,0 +1,31 @@ +*** Testing hash_pbkdf2() : error conditions *** + +-- Testing hash_pbkdf2() function with less than expected no. of arguments -- +NULL +hash_pbkdf2() expects at least 4 parameters, 0 given +NULL +hash_pbkdf2() expects at least 4 parameters, 1 given +NULL +hash_pbkdf2() expects at least 4 parameters, 2 given +NULL +hash_pbkdf2() expects at least 4 parameters, 3 given + +-- Testing hash_pbkdf2() function with more than expected no. of arguments -- +NULL +hash_pbkdf2() expects at most 6 parameters, 7 given + +-- Testing hash_pbkdf2() function with invalid hash algorithm -- +bool(false) +hash_pbkdf2(): Unknown hashing algorithm: foo + +-- Testing hash_pbkdf2() function with invalid iterations -- +bool(false) +hash_pbkdf2(): Iterations must be a positive integer: 0 +bool(false) +hash_pbkdf2(): Iterations must be a positive integer: -1 + +-- Testing hash_pbkdf2() function with invalid length -- +bool(false) +hash_pbkdf2(): Length must be greater than or equal to 0: -1 + +===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-hash/mhash_002.php b/hphp/test/zend/bad/ext-hash/mhash_002.php index 6c6f8521f..dc10b57ef 100644 --- a/hphp/test/zend/bad/ext-hash/mhash_002.php +++ b/hphp/test/zend/bad/ext-hash/mhash_002.php @@ -17,7 +17,7 @@ $supported_hash_al = array( "CRC32" => 4, "CRC32B" => 4, "ADLER32" => 4, -"NA_XYZ" => 0 /* verify that the algorythm works */ +"NA_XYZ" => 0 /* verify that the algorithm works */ ); $hc = mhash_count() + 1; diff --git a/hphp/test/zend/bad/ext-iconv/bug51250.php.expectf b/hphp/test/zend/bad/ext-iconv/bug51250.php.expectf index a427de0f4..6aba0c15a 100644 --- a/hphp/test/zend/bad/ext-iconv/bug51250.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/bug51250.php.expectf @@ -5,5 +5,5 @@ string(23) "Illegal encoded-word: ." string(23) "Legal encoded-word: * ." string(23) "Legal encoded-word: * ." string(24) "Illegal encoded-word: ." -HipHop Notice: %a +HipHop Notice: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/bug52211.php.expectf b/hphp/test/zend/bad/ext-iconv/bug52211.php.expectf index 2a3b009e2..94df10dfc 100644 --- a/hphp/test/zend/bad/ext-iconv/bug52211.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/bug52211.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a +HipHop Notice: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_get_encoding_error.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_get_encoding_error.php.expectf index 260eaadd9..272735706 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_get_encoding_error.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_get_encoding_error.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation1.php.expectf index 5a8967ca9..c00ed6808 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation1.php.expectf @@ -93,6 +93,6 @@ array(0) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation2.php.expectf index 250765f58..8c52a6a03 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation2.php.expectf @@ -286,27 +286,27 @@ array(5) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -348,6 +348,6 @@ array(5) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation3.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation3.php.expectf index 250765f58..8c52a6a03 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_headers_variation3.php.expectf @@ -286,27 +286,27 @@ array(5) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -348,6 +348,6 @@ array(5) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation1.php.expectf index f54fb75ae..ecc2c1ca7 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation1.php.expectf @@ -70,6 +70,6 @@ string(0) "" string(0) "" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation2.php.expectf index ccb1420e3..b59b47a2d 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation2.php.expectf @@ -46,27 +46,27 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 22 -- @@ -76,6 +76,6 @@ string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" string(52) "5375626a6563743a205072c3bc66756e67205072c3bc66756e67" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation3.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation3.php.expectf index b600261d5..dbbaee478 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_mime_decode_variation3.php.expectf @@ -1,39 +1,39 @@ *** Testing iconv_mime_decode() : usage variations *** -- Iteration 1 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 2 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 3 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 4 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 5 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 6 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 10 -- @@ -43,14 +43,14 @@ string(44) "5375626a6563743a20412053616d706c652054657374" string(44) "5375626a6563743a20412053616d706c652054657374" -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 13 -- string(44) "5375626a6563743a20412053616d706c652054657374" -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 15 -- @@ -63,19 +63,19 @@ string(44) "5375626a6563743a20412053616d706c652054657374" string(44) "5375626a6563743a20412053616d706c652054657374" -- Iteration 18 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 22 -- @@ -85,6 +85,6 @@ string(44) "5375626a6563743a20412053616d706c652054657374" string(44) "5375626a6563743a20412053616d706c652054657374" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_error.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_error.php.expectf index d25c761b9..aba22f45e 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_error.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_error.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_variation.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_variation.php.expectf index e4f8011be..4beb50537 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_variation.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_set_encoding_variation.php.expectf @@ -185,11 +185,11 @@ string(0) "" string(0) "" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" string(0) "" diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strlen_error1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strlen_error1.php.expectf index c1a3bd7f4..81340f74e 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strlen_error1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strlen_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing iconv_strlen() : error conditions *** -- Testing iconv_strlen() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing iconv_strlen() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strlen_error2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strlen_error2.php.expectf index b52e9783e..41ddf7ac6 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strlen_error2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strlen_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing iconv_strlen() : error *** -HipHop Notice: %a +HipHop Notice: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation1.php.expectf index 0e1871708..4053e6987 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation1.php.expectf @@ -73,6 +73,6 @@ int(0) int(0) --resource-- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation2.php.expectf index 2e44032fc..c8d8d90e5 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strlen_variation2.php.expectf @@ -1,39 +1,39 @@ *** Testing iconv_strlen() : usage variations *** -- Iteration 1 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 2 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 3 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 4 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 5 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 6 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 10 -- @@ -43,14 +43,14 @@ int(12) int(12) -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 13 -- int(12) -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 15 -- @@ -81,6 +81,6 @@ int(12) int(12) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_error1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_error1.php.expectf index a0f29ae6e..b83aa59e8 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_error1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing iconv_strpos() : error conditions *** -- Testing iconv_strpos() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing iconv_strpos() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_error2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_error2.php.expectf index a2d692502..207fa5e10 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_error2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing iconv_strpos() : error conditions *** -HipHop Notice: %a +HipHop Notice: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation1.php.expectf index 5e6ecad92..4a45fa567 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation1.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation2.php.expectf index 57f33a449..58412dc8e 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation2.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3.php.expectf index ad346ff94..4e8452a7d 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3.php.expectf @@ -10,18 +10,18 @@ int(8) bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- @@ -49,27 +49,27 @@ int(8) int(8) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -79,6 +79,6 @@ int(8) int(8) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3_64bit.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3_64bit.php.expectf index ad3df0ca3..0efeb6a0f 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation3_64bit.php.expectf @@ -10,14 +10,14 @@ int(8) bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -48,27 +48,27 @@ int(8) int(8) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- @@ -78,6 +78,6 @@ int(8) int(8) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation4.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation4.php.expectf index d658dd2d7..65eb623e9 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strpos_variation4.php.expectf @@ -1,39 +1,39 @@ *** Testing iconv_strpos() : usage variations *** -- Iteration 1 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 2 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 3 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 4 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 5 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 6 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 10 -- @@ -43,14 +43,14 @@ int(7) int(7) -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 13 -- int(7) -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 15 -- @@ -81,6 +81,6 @@ int(7) int(7) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error1.php.expectf index a089fed9a..fc3e1de58 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing iconv_strrpos() : error conditions *** -- Testing iconv_strrpos() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing iconv_strrpos() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error2.php.expectf index 1032974c0..580df7058 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing iconv_strrpos() : error conditions *** -HipHop Notice: %a +HipHop Notice: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation1.php.expectf index f2b6d769f..e5b410b7e 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation1.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation2.php.expectf index f2b6d769f..e5b410b7e 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation2.php.expectf @@ -70,6 +70,6 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation3.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation3.php.expectf index 81118908d..e00628b66 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_strrpos_variation3.php.expectf @@ -1,39 +1,39 @@ *** Testing iconv_strrpos() : usage variations *** -- Iteration 1 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 2 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 3 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 4 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 5 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 6 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 10 -- @@ -43,14 +43,14 @@ int(7) int(7) -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 13 -- int(7) -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 15 -- @@ -81,6 +81,6 @@ int(7) int(7) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_substr_error1.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_substr_error1.php.expectf index afee92997..a0b740f41 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_substr_error1.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_substr_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing iconv_substr() : error conditions *** -- Testing iconv_substr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing iconv_substr() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-iconv/iconv_substr_error2.php.expectf b/hphp/test/zend/bad/ext-iconv/iconv_substr_error2.php.expectf index 3f953fe14..d7284676d 100644 --- a/hphp/test/zend/bad/ext-iconv/iconv_substr_error2.php.expectf +++ b/hphp/test/zend/bad/ext-iconv/iconv_substr_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing iconv_substr() : error conditions *** -HipHop Notice: %a +HipHop Notice: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/bug46918.php.expectf b/hphp/test/zend/bad/ext-imap/bug46918.php.expectf index 249585860..491132546 100644 --- a/hphp/test/zend/bad/ext-imap/bug46918.php.expectf +++ b/hphp/test/zend/bad/ext-imap/bug46918.php.expectf @@ -48,4 +48,4 @@ array ( 'host' => '.SYNTAX-ERROR.', )), ) -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_append_basic.php b/hphp/test/zend/bad/ext-imap/imap_append_basic.php index 3fc4cdf4d..8a5d20d24 100644 --- a/hphp/test/zend/bad/ext-imap/imap_append_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_append_basic.php @@ -40,6 +40,7 @@ var_dump(imap_headers($imap_stream)); imap_close($imap_stream); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_body.php.expectf b/hphp/test/zend/bad/ext-imap/imap_body.php.expectf index 9cf6d2873..f870557df 100644 --- a/hphp/test/zend/bad/ext-imap/imap_body.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_body.php.expectf @@ -1,10 +1,10 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -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 bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_body_basic.php b/hphp/test/zend/bad/ext-imap/imap_body_basic.php index 92d22db9d..60c7f3856 100644 --- a/hphp/test/zend/bad/ext-imap/imap_body_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_body_basic.php @@ -25,6 +25,7 @@ var_dump(imap_body($imap_stream, 1, FT_UID)); imap_close($imap_stream); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php b/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php index c4ec84cf4..ac98e5f6a 100644 --- a/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php @@ -61,6 +61,7 @@ function isValid($param) return $result; } ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_clearflag_full_basic.php b/hphp/test/zend/bad/ext-imap/imap_clearflag_full_basic.php index 9702f61ac..225f539af 100644 --- a/hphp/test/zend/bad/ext-imap/imap_clearflag_full_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_clearflag_full_basic.php @@ -40,6 +40,7 @@ var_dump(imap_search($imap_stream, "DELETED")); imap_close($imap_stream); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_basic.php b/hphp/test/zend/bad/ext-imap/imap_close_basic.php index a8d19e205..71471d012 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_close_basic.php @@ -30,6 +30,7 @@ echo "There are now " . imap_num_msg($stream_id) . " msgs in mailbox '$mailbox'\ echo "\n-- Call to imap_close() with mandatory arguments --\n"; var_dump( imap_close($stream_id) ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_close_error.php.expectf index 617b7f406..5e195c541 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_close_error.php.expectf @@ -1,10 +1,10 @@ *** Testing imap_close() : error conditions *** -- Testing imap_close() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imap_close() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation1.php.expectf b/hphp/test/zend/bad/ext-imap/imap_close_variation1.php.expectf index 15acf2a7a..167ec9019 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing imap_close() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation2.php b/hphp/test/zend/bad/ext-imap/imap_close_variation2.php index 10b834523..87876f5a2 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation2.php +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation2.php @@ -103,6 +103,7 @@ foreach($inputs as $input) { }; ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation2.php.expectf b/hphp/test/zend/bad/ext-imap/imap_close_variation2.php.expectf index 27895ead0..b210598dc 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation2.php.expectf @@ -7,7 +7,7 @@ bool(true) CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- @@ -15,19 +15,19 @@ bool(true) CL_EXPUNGE was set -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- @@ -47,7 +47,7 @@ bool(true) CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- @@ -55,7 +55,7 @@ bool(true) CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- @@ -63,17 +63,17 @@ bool(true) CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL CL_EXPUNGE was not set, 3 msgs in mailbox -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL CL_EXPUNGE was not set, 3 msgs in mailbox diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation3.php.expectf b/hphp/test/zend/bad/ext-imap/imap_close_variation3.php.expectf index daa853544..5d73290b3 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation3.php.expectf @@ -2,13 +2,13 @@ -- File Resource opened with fopen() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (stream) -- Directory Resource opened with opendir() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (stream) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation4.php b/hphp/test/zend/bad/ext-imap/imap_close_variation4.php index 5b05472bf..6a4bab7b2 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation4.php +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation4.php @@ -51,6 +51,7 @@ foreach($inputs as $input) { }; ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation4.php.expectf b/hphp/test/zend/bad/ext-imap/imap_close_variation4.php.expectf index fdb912e95..1a6e5d95c 100644 --- a/hphp/test/zend/bad/ext-imap/imap_close_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_close_variation4.php.expectf @@ -11,14 +11,14 @@ bool(true) CL_EXPUNGE was set -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_errors_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_errors_basic.php.expectf index 7fddf8ea1..8fb3182aa 100644 --- a/hphp/test/zend/bad/ext-imap/imap_errors_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_errors_basic.php.expectf @@ -1,6 +1,6 @@ *** Testing imap_errors() : basic functionality *** Issue open with invalid password with normal default number of retries, i.e 3 -HipHop Warning: %a +HipHop Warning: %s List any errors array(%d) { [0]=> @@ -13,7 +13,7 @@ array(%d) { Issue open with invalid password with retries == 1 -HipHop Warning: %a +HipHop Warning: %s List any errors array(%d) { [0]=> diff --git a/hphp/test/zend/bad/ext-imap/imap_expunge_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_expunge_error.php.expectf index cd23c8186..bd16fee6d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_expunge_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_expunge_error.php.expectf @@ -1,5 +1,5 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_basic.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_basic.php index f570a99f6..f6ac9c52a 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_basic.php @@ -37,6 +37,7 @@ displayOverviewFields($a[1]); imap_close($stream_id); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php index 4ccd78cbe..f774445f5 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php @@ -25,6 +25,7 @@ var_dump( imap_fetch_overview($stream_id, $msg_no, $options, $extra_arg) ); echo "\n-- Testing imap_fetch_overview() function with less than expected no. of arguments --\n"; var_dump( imap_fetch_overview($stream_id) ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php.expectf index 7a8253b3f..0ef433d4c 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_error.php.expectf @@ -3,10 +3,10 @@ -- Testing imap_fetch_overview() function with more than expected no. of arguments -- Create a temporary mailbox and add 2 msgs .. mailbox '{%s}%s' created -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imap_fetch_overview() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php.expectf index 60e838daf..f81f5922d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing imap_fetch_overview() : usage variations *** -- Testing with first argument value: int(0) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: int(1) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: int(12345) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: int(-2345) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: float(10.5) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: float(-10.5) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: float(123456789000) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: float(1.23456789E-9) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: float(0.5) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: %string|unicode%(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: %string|unicode%(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: %string|unicode%(6) "string" -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: %string|unicode%(6) "string" -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: %string|unicode%(11) "hello world" -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: object(classA)#1 (0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with first argument value: NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php index b2b27443a..ee5e3a848 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php @@ -103,6 +103,7 @@ fclose($fp); // clear the error stack imap_errors(); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php.expectf index 5f7efbd5d..bda45c7e5 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation2.php.expectf @@ -82,7 +82,7 @@ Sequence out of range -- Testing with second argument value: array(0) { } -HipHop Warning: %a +HipHop Warning: %s Sequence out of range -- Testing with second argument value: %string|unicode%(6) "string" @@ -105,6 +105,6 @@ Syntax error in sequence Syntax error in sequence -- Testing with second argument value: resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s Syntax error in sequence ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php index bbf2b394b..71f925afa 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php @@ -41,6 +41,7 @@ foreach($options as $option) { } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php.expectf index 13422f576..4402a82bb 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation3.php.expectf @@ -15,8 +15,8 @@ Testing with option value:float(1) imap_fetch_overview() returns an object Testing with option value:int(%d) -HipHop Warning: %a +HipHop Warning: %s Testing with option value:int(-%d) -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php.expectf index 41937b25f..51b671058 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php.expectf @@ -2,11 +2,11 @@ -- File Resource opened with fopen() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Directory Resource opened with opendir() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation5.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation5.php index 8dda6d0fd..f723a4860 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation5.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation5.php @@ -35,6 +35,7 @@ foreach($sequences as $msg_no) { // clear error stack imap_errors(); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation6.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation6.php index d517b3ffc..1bdb560c6 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation6.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation6.php @@ -78,6 +78,7 @@ function create_multipart_message($imap_stream, $mailbox) { } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php index e71450f45..8b3d3770a 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php @@ -49,6 +49,7 @@ $overview = imap_fetch_overview($stream_id, 1); echo "Seen Flag: "; var_dump( $overview[0]->seen ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php index 2121db4f4..1b1d2c05a 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php @@ -28,6 +28,7 @@ echo "\n-- Testing imap_fetchbody() function with less than expected no. of argu var_dump( imap_fetchbody($stream_id, $msg_no) ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php.expectf index 666bfdb79..26e77f01e 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php.expectf @@ -3,10 +3,10 @@ -- Testing imap_fetchbody() function with more than expected no. of arguments -- Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imap_fetchbody() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php.expectf index b0c2eff73..45e8dc867 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing imap_fetchbody() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php index 6670b5176..d48ab246e 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php @@ -88,6 +88,7 @@ foreach($inputs as $input) { $iterator++; }; ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php.expectf index 24faa2fd0..a754e9271 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php.expectf @@ -3,95 +3,95 @@ Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- %unicode|string%(%d) "1: this is a test message, please ignore%a" -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- %unicode|string%(%d) "1: this is a test message, please ignore%a" -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- %unicode|string%(%d) "1: this is a test message, please ignore%a" -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php index c06951d4d..050f6aa9d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php @@ -88,6 +88,7 @@ foreach($inputs as $input) { $iterator++; }; ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php.expectf index 58d0dc9e2..f5e084eb7 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php.expectf @@ -82,7 +82,7 @@ Subject: test1 1: this is a test message, please ignore%a" -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php index 80d907d7e..e64801751 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php @@ -38,6 +38,7 @@ foreach($options as $option) { } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php.expectf index 895af6bf9..66318496a 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php.expectf @@ -15,10 +15,10 @@ FT_UID valid FT_UID valid -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s FT_UID not valid -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s FT_UID not valid ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php.expectf index f9144e9cd..d19469f4e 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php.expectf @@ -2,11 +2,11 @@ -- File Resource opened with fopen() -- resource(5) of type (stream) -HipHop Warning: %a +HipHop Warning: %s NULL -- Directory Resource opened with opendir() -- resource(6) of type (stream) -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php index fa43016b7..2da3e44a3 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php @@ -29,6 +29,7 @@ foreach($sequences as $msg_no) { } } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php.expectf index 7175584a0..c6e9ea840 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php.expectf @@ -3,20 +3,20 @@ Create a temporary mailbox and add 3 msgs .. mailbox '{%s}%s' created -- $msg_no is 0 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- $msg_no is 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- $msg_no is 1,3 -- -HipHop Notice: %a +HipHop Notice: %s %unicode|string%(%d) "1: this is a test message, please ignore%a" -- $msg_no is 1:3 -- -HipHop Notice: %a +HipHop Notice: %s %unicode|string%(%d) "1: this is a test message, please ignore%a" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php index ab724411e..403904627 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php @@ -29,6 +29,7 @@ foreach ($options as $key => $option) { echo "\n-- Mandatory arguments --\n"; var_dump( imap_fetchheader($stream_id, $msg_no) ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php.expectf index cd506582f..e272ad6e2 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php.expectf @@ -1,10 +1,10 @@ *** Testing imap_fetchheader() : error conditions *** -- Testing imap_fetchheader() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imap_fetchheader() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php.expectf index f5f1fe6da..88ef945a9 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php.expectf @@ -1,110 +1,110 @@ *** Testing imap_fetchheader() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php index c54024a9e..a5249b2c1 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php @@ -102,7 +102,8 @@ foreach($inputs as $input) { fclose($fp); ?> -===DONE=== + ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php.expectf index 684715110..32db359ac 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php.expectf @@ -3,7 +3,7 @@ Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- @@ -16,39 +16,39 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s" " -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- @@ -61,7 +61,7 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s" " -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- @@ -74,58 +74,58 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s" " -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php index 196fd4d69..6766b1dac 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php @@ -36,6 +36,7 @@ foreach($options as $option) { $iterator++; } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php.expectf index d9ec6c7ae..6f67e935f 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php.expectf @@ -15,10 +15,10 @@ FT_UID valid FT_UID valid -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s FT_UID not valid -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s FT_UID not valid ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php.expectf index 66d2cfb7d..b93aa18cb 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php.expectf @@ -2,11 +2,11 @@ -- File Resource opened with fopen() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Directory Resource opened with opendir() -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php index a9844d396..880f8cd80 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php @@ -30,6 +30,7 @@ foreach($sequences as $msg_no) { // clear error stack imap_errors(); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php.expectf index ed0b1e484..1b2b27026 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php.expectf @@ -3,17 +3,17 @@ Create a temporary mailbox and add 3 msgs .. mailbox '{%s}%s' created -- $msg_no is 0 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- $msg_no is 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- $msg_no is 1,3 -- -HipHop Notice: %a +HipHop Notice: %s %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 To: %s @@ -23,7 +23,7 @@ Content-Type: MULTIPART/mixed; BOUNDARY="%s" " -- $msg_no is 1:3 -- -HipHop Notice: %a +HipHop Notice: %s %unicode|string%(%d) "From: foo@anywhere.com Subject: Test msg 1 To: %s diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php.expectf index 469cb23dd..f4d8fcdf6 100644 --- a/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php.expectf @@ -1,11 +1,11 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -HipHop Warning: %a +HipHop Warning: %s bool(true) bool(true) bool(true) diff --git a/hphp/test/zend/bad/ext-imap/imap_gc_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_gc_error.php.expectf index 8b11ca82b..43e7b537f 100644 --- a/hphp/test/zend/bad/ext-imap/imap_gc_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_gc_error.php.expectf @@ -1,6 +1,6 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php.expectf index 125e2cc85..54765b6bf 100644 --- a/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php.expectf @@ -1,10 +1,10 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) Checking OK bool(true) diff --git a/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php.expectf index 8b11ca82b..43e7b537f 100644 --- a/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php.expectf @@ -1,6 +1,6 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_headers.php.expectf b/hphp/test/zend/bad/ext-imap/imap_headers.php.expectf index cd23c8186..bd16fee6d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_headers.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_headers.php.expectf @@ -1,5 +1,5 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_list_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_list_basic.php.expectf index a63b40d35..16721a017 100644 --- a/hphp/test/zend/bad/ext-imap/imap_list_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_list_basic.php.expectf @@ -1,9 +1,9 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(true) string(%s) "{%s}%s" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php.expectf index 234ccdf7e..f6114b880 100644 --- a/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php.expectf @@ -1,10 +1,10 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) Checking OK bool(true) diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_copy.php.expectf b/hphp/test/zend/bad/ext-imap/imap_mail_copy.php.expectf index eb2ce30bc..16afe76d8 100644 --- a/hphp/test/zend/bad/ext-imap/imap_mail_copy.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_mail_copy.php.expectf @@ -1,13 +1,13 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Test with IMAP server -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_copy_basic.php b/hphp/test/zend/bad/ext-imap/imap_mail_copy_basic.php index db1017f2a..15306aa27 100644 --- a/hphp/test/zend/bad/ext-imap/imap_mail_copy_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_mail_copy_basic.php @@ -22,6 +22,7 @@ var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); imap_close($imap_stream); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_move.php.expectf b/hphp/test/zend/bad/ext-imap/imap_mail_move.php.expectf index eb2ce30bc..16afe76d8 100644 --- a/hphp/test/zend/bad/ext-imap/imap_mail_move.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_mail_move.php.expectf @@ -1,13 +1,13 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Test with IMAP server -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_move_basic.php b/hphp/test/zend/bad/ext-imap/imap_mail_move_basic.php index e8a61b291..543224c4d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_mail_move_basic.php +++ b/hphp/test/zend/bad/ext-imap/imap_mail_move_basic.php @@ -22,6 +22,7 @@ var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix)); imap_close($imap_stream); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_mutf7_to_utf8.php.expectf b/hphp/test/zend/bad/ext-imap/imap_mutf7_to_utf8.php.expectf index 4f91b9db6..1a61b3505 100644 --- a/hphp/test/zend/bad/ext-imap/imap_mutf7_to_utf8.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_mutf7_to_utf8.php.expectf @@ -1,6 +1,6 @@ string(0) "" string(1) "1" -HipHop Warning: %a +HipHop Warning: %s NULL string(5) "täst" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_num_msg_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_num_msg_error.php.expectf index cd23c8186..bd16fee6d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_num_msg_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_num_msg_error.php.expectf @@ -1,5 +1,5 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_num_recent_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_num_recent_error.php.expectf index cd23c8186..bd16fee6d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_num_recent_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_num_recent_error.php.expectf @@ -1,5 +1,5 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_open_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_open_error.php.expectf index 2f04b496f..4c40ba69c 100644 --- a/hphp/test/zend/bad/ext-imap/imap_open_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_open_error.php.expectf @@ -1,11 +1,11 @@ Checking with no parameters -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 Checking with incorrect parameters -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Notice: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_ping_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_ping_error.php.expectf index cd23c8186..bd16fee6d 100644 --- a/hphp/test/zend/bad/ext-imap/imap_ping_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_ping_error.php.expectf @@ -1,5 +1,5 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php.expectf index e9a59f459..c362b57b7 100644 --- a/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php.expectf @@ -1,12 +1,12 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Checking OK bool(true) bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php.expectf index b73fffadc..a0d484fd5 100644 --- a/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php.expectf @@ -1,11 +1,11 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Create a temporary mailbox and add 1 msgs .. mailbox '{%s}%s' created -HipHop Warning: %a +HipHop Warning: %s bool(true) Size: %d bool(true) diff --git a/hphp/test/zend/bad/ext-imap/imap_timeout_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_timeout_basic.php.expectf index c9ebd4993..387d7a035 100644 --- a/hphp/test/zend/bad/ext-imap/imap_timeout_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_timeout_basic.php.expectf @@ -1,7 +1,7 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a +HipHop Warning: %s GET values: int(%d) int(%d) diff --git a/hphp/test/zend/bad/ext-imap/imap_undelete_error.php.expectf b/hphp/test/zend/bad/ext-imap/imap_undelete_error.php.expectf index 8b11ca82b..43e7b537f 100644 --- a/hphp/test/zend/bad/ext-imap/imap_undelete_error.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_undelete_error.php.expectf @@ -1,6 +1,6 @@ Checking with no parameters -HipHop Warning: %a +HipHop Warning: %s Checking with incorrect parameter type -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_utf8.php.expectf b/hphp/test/zend/bad/ext-imap/imap_utf8.php.expectf index 147b210d6..467fdf2fa 100644 --- a/hphp/test/zend/bad/ext-imap/imap_utf8.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_utf8.php.expectf @@ -1,6 +1,6 @@ string(0) "" string(1) "1" -HipHop Warning: %a +HipHop Warning: %s NULL string(4) "%s" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-imap/imap_utf8_to_mutf7_basic.php.expectf b/hphp/test/zend/bad/ext-imap/imap_utf8_to_mutf7_basic.php.expectf index 54ecd305d..306a5ce86 100644 --- a/hphp/test/zend/bad/ext-imap/imap_utf8_to_mutf7_basic.php.expectf +++ b/hphp/test/zend/bad/ext-imap/imap_utf8_to_mutf7_basic.php.expectf @@ -1,6 +1,6 @@ string(0) "" string(1) "1" -HipHop Warning: %a +HipHop Warning: %s NULL string(8) "t&AOQ-st" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/badargs.php b/hphp/test/zend/bad/ext-intl/badargs.php index cf394ccc3..c9f83a625 100644 --- a/hphp/test/zend/bad/ext-intl/badargs.php +++ b/hphp/test/zend/bad/ext-intl/badargs.php @@ -8,7 +8,10 @@ foreach($funcs as $func) { if($rfunc->getNumberOfRequiredParameters() == 0) { continue; } - $res = $func($arg); + + try { + $res = $func($arg); + } catch (Exception $e) { continue; } if($res != false) { echo "$func: "; var_dump($res); diff --git a/hphp/test/zend/bad/ext-intl/breakiter___construct_error.php b/hphp/test/zend/bad/ext-intl/breakiter___construct_error.php new file mode 100644 index 000000000..83d8a0b6a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter___construct_error.php @@ -0,0 +1,9 @@ +setText('foobar'); +$bi_clone = clone $bi; +var_dump(get_class($bi), get_class($bi_clone)); +var_dump($bi == $bi_clone); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_clone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_clone_basic.php.expectf new file mode 100644 index 000000000..07608adb2 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_clone_basic.php.expectf @@ -0,0 +1,6 @@ +string(26) "IntlRuleBasedBreakIterator" +string(26) "IntlRuleBasedBreakIterator" +bool(true) +string(26) "IntlRuleBasedBreakIterator" +string(26) "IntlRuleBasedBreakIterator" +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php new file mode 100644 index 000000000..f9a14e7ac --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php @@ -0,0 +1,14 @@ +setText($text); + +print_r(iterator_to_array($codepoint_it)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php.expectf new file mode 100644 index 000000000..146985c7e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_basic.php.expectf @@ -0,0 +1,21 @@ +string(26) "IntlCodePointBreakIterator" +Array +( + [0] => 0 + [1] => 3 + [2] => 6 + [3] => 9 + [4] => 12 + [5] => 15 + [6] => 18 + [7] => 21 + [8] => 24 + [9] => 27 + [10] => 30 + [11] => 33 + [12] => 36 + [13] => 39 + [14] => 42 + [15] => 45 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_error.php b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_error.php new file mode 100644 index 000000000..fcfc54de5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_createCodePointInstance_error.php @@ -0,0 +1,4 @@ +current()); +$bi->setText('foo bar trans zoo bee'); + +var_dump($bi->first()); +var_dump($bi->current()); +var_dump($bi->next()); +var_dump($bi->current()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_current_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_current_basic.php.expectf new file mode 100644 index 000000000..039e6f2ab --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_current_basic.php.expectf @@ -0,0 +1,6 @@ +int(0) +int(0) +int(0) +int(3) +int(3) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_factories_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_factories_basic.php new file mode 100644 index 000000000..e4f496b90 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_factories_basic.php @@ -0,0 +1,18 @@ +setText('foo bar trans'); + +var_dump($bi->current()); +var_dump($bi->next()); +var_dump($bi->first()); +var_dump($bi->current()); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_first_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_first_basic.php.expectf new file mode 100644 index 000000000..480e0b65a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_first_basic.php.expectf @@ -0,0 +1,4 @@ +int(0) +int(3) +int(0) +int(0) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php b/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php new file mode 100644 index 000000000..4b8657b7d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php @@ -0,0 +1,10 @@ +setText("\x80sdfé\x90d888 dfsa9"); + +var_dump($bi->first(1)); +var_dump($bi->last(1)); +var_dump($bi->previous(1)); +var_dump($bi->current(1)); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php.expectf new file mode 100644 index 000000000..7bb4dce2e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_first_last_previous_current_error.php.expectf @@ -0,0 +1,12 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php new file mode 100644 index 000000000..14bbe2c89 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php @@ -0,0 +1,12 @@ +setText('foo bar trans zoo bee'); + +var_dump($bi->following(5)); +var_dump($bi->following(50)); +var_dump($bi->following(-1)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php.expectf new file mode 100644 index 000000000..845238e78 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_following_basic.php.expectf @@ -0,0 +1,4 @@ +int(7) +int(-1) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php b/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php new file mode 100644 index 000000000..db5211563 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php @@ -0,0 +1,12 @@ +setText("\x80sdfé\x90d888 dfsa9"); + +var_dump($bi->following(1, 2)); +var_dump($bi->following(array())); +var_dump($bi->preceding(1, 2)); +var_dump($bi->preceding(array())); +var_dump($bi->isBoundary(1, 2)); +var_dump($bi->isBoundary(array())); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php.expectf new file mode 100644 index 000000000..a23decc82 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_following_preceding_isBoundary_error.php.expectf @@ -0,0 +1,18 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php new file mode 100644 index 000000000..9e5be4464 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php @@ -0,0 +1,10 @@ +getLocale(0)); +var_dump($bi->getLocale(1)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php.expectf new file mode 100644 index 000000000..06cccf079 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_basic.php.expectf @@ -0,0 +1,3 @@ +string(4) "root" +string(4) "root" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php new file mode 100644 index 000000000..7f358ec69 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php @@ -0,0 +1,9 @@ +setText("\x80sdfé\x90d888 dfsa9"); + +var_dump($bi->getLocale(1, 2)); +var_dump($bi->getLocale(array())); +var_dump($bi->getLocale()); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php.expectf new file mode 100644 index 000000000..83bd7ec5f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getLocale_error.php.expectf @@ -0,0 +1,9 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php new file mode 100644 index 000000000..7aa22ddff --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php @@ -0,0 +1,16 @@ +getPartsIterator(); +var_dump(get_class($pi)); +print_r(iterator_to_array($pi)); + +$bi->setText("foo bar"); +$pi = $bi->getPartsIterator(); +var_dump(get_class($pi->getBreakIterator())); +print_r(iterator_to_array($pi)); +var_dump($pi->getRuleStatus()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php.expectf new file mode 100644 index 000000000..1f0b0fc1a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_basic.php.expectf @@ -0,0 +1,13 @@ +string(17) "IntlPartsIterator" +Array +( +) +string(26) "IntlRuleBasedBreakIterator" +Array +( + [0] => foo + [1] => + [2] => bar +) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php new file mode 100644 index 000000000..ac2afb1a9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php @@ -0,0 +1,11 @@ +getPartsIterator(array())); +var_dump($it->getPartsIterator(1, 2)); +var_dump($it->getPartsIterator(-1)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php.expectf new file mode 100644 index 000000000..f68bcbf29 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_error.php.expectf @@ -0,0 +1,9 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php new file mode 100644 index 000000000..db56b6862 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php @@ -0,0 +1,15 @@ +setText($text); + +var_dump(iterator_to_array($it->getPartsIterator(IntlPartsIterator::KEY_SEQUENTIAL))); +var_dump(iterator_to_array($it->getPartsIterator(IntlPartsIterator::KEY_LEFT))); +var_dump(iterator_to_array($it->getPartsIterator(IntlPartsIterator::KEY_RIGHT))); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php.expectf new file mode 100644 index 000000000..15b2ab1e7 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getPartsIterator_var1.php.expectf @@ -0,0 +1,37 @@ +array(5) { + [0]=> + string(3) "foo" + [1]=> + string(1) " " + [2]=> + string(3) "bar" + [3]=> + string(1) " " + [4]=> + string(3) "tao" +} +array(5) { + [0]=> + string(3) "foo" + [4]=> + string(1) " " + [5]=> + string(3) "bar" + [8]=> + string(1) " " + [9]=> + string(3) "tao" +} +array(5) { + [3]=> + string(3) "foo" + [5]=> + string(1) " " + [8]=> + string(3) "bar" + [9]=> + string(1) " " + [12]=> + string(3) "tao" +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php new file mode 100644 index 000000000..4a1fb02ad --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php @@ -0,0 +1,7 @@ +getText()); +$bi->setText('foo bar'); +var_dump($bi->getText()); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php.expectf new file mode 100644 index 000000000..aca0d3bc1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getText_basic.php.expectf @@ -0,0 +1,2 @@ +NULL +string(7) "foo bar" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php b/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php new file mode 100644 index 000000000..75a21949d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php @@ -0,0 +1,5 @@ +getText(array())); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php.expectf new file mode 100644 index 000000000..97450ca6a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_getText_error.php.expectf @@ -0,0 +1,3 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php new file mode 100644 index 000000000..8b206ef46 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php @@ -0,0 +1,14 @@ +setText('foo bar trans zoo bee'); + +var_dump($bi->isBoundary(0)); +var_dump($bi->isBoundary(7)); +var_dump($bi->isBoundary(-1)); +var_dump($bi->isBoundary(1)); +var_dump($bi->isBoundary(50)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php.expectf new file mode 100644 index 000000000..5511e0ad4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_isBoundary_basic.php.expectf @@ -0,0 +1,6 @@ +bool(true) +bool(true) +bool(false) +bool(false) +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php new file mode 100644 index 000000000..9de657b6c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php @@ -0,0 +1,9 @@ +setText('foo bar trans'); + +var_dump($bi->current()); +var_dump($bi->last()); +var_dump($bi->current()); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php.expectf new file mode 100644 index 000000000..343c02dbf --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_last_basic.php.expectf @@ -0,0 +1,3 @@ +int(0) +int(13) +int(13) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php new file mode 100644 index 000000000..f966c1577 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php @@ -0,0 +1,15 @@ +setText('foo bar trans zoo bee'); + +var_dump($bi->first()); +var_dump($bi->next()); +var_dump($bi->next(2)); +var_dump($bi->next(-1)); +var_dump($bi->next(0)); +var_dump($bi->next(NULL)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php.expectf new file mode 100644 index 000000000..fdcc797d6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_next_basic.php.expectf @@ -0,0 +1,7 @@ +int(0) +int(3) +int(7) +int(4) +int(4) +int(7) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_next_error.php b/hphp/test/zend/bad/ext-intl/breakiter_next_error.php new file mode 100644 index 000000000..1447c9134 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_next_error.php @@ -0,0 +1,8 @@ +setText("\x80sdfé\x90d888 dfsa9"); + +var_dump($bi->next(1, 2)); +var_dump($bi->next(array())); diff --git a/hphp/test/zend/bad/ext-intl/breakiter_next_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_next_error.php.expectf new file mode 100644 index 000000000..4afecd224 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_next_error.php.expectf @@ -0,0 +1,6 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php new file mode 100644 index 000000000..055a1ff69 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php @@ -0,0 +1,12 @@ +setText('foo bar trans zoo bee'); + +var_dump($bi->preceding(5)); +var_dump($bi->preceding(50)); +var_dump($bi->preceding(-1)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php.expectf new file mode 100644 index 000000000..baabcad49 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_preceding_basic.php.expectf @@ -0,0 +1,4 @@ +int(4) +int(21) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php new file mode 100644 index 000000000..3630e9793 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php @@ -0,0 +1,11 @@ +setText('foo bar trans'); + +var_dump($bi->last()); +var_dump($bi->previous()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php.expectf new file mode 100644 index 000000000..f87922570 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_previous_basic.php.expectf @@ -0,0 +1,3 @@ +int(13) +int(8) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php b/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php new file mode 100644 index 000000000..35d6cf619 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php @@ -0,0 +1,19 @@ +setText('foo bar')); +var_dump($bi->getText()); +var_dump($bi->setText(1)); +var_dump($bi->getText()); +var_dump($bi->setText(new A)); +var_dump($bi->getText()); + +/* setText resets the pointer */ +var_dump($bi->next()); +var_dump($bi->setText('foo bar')); +var_dump($bi->current()); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php.expectf new file mode 100644 index 000000000..dc016ebf6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_setText_basic.php.expectf @@ -0,0 +1,9 @@ +bool(true) +string(7) "foo bar" +bool(true) +string(1) "1" +bool(true) +string(3) "aaa" +int(3) +bool(true) +int(0) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php b/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php new file mode 100644 index 000000000..c8adbc52c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php @@ -0,0 +1,18 @@ +setText()); +var_dump($bi->setText(array())); +var_dump($bi->setText(1,2)); + +class A { +function __destruct() { var_dump('destructed'); throw new Exception('e'); } +function __tostring() { return 'foo'; } +} + +try { +var_dump($bi->setText(new A)); +} catch (Exception $e) { +var_dump($e->getMessage()); +} diff --git a/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php.expectf b/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php.expectf new file mode 100644 index 000000000..68e63ad5d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/breakiter_setText_error.php.expectf @@ -0,0 +1,11 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +string(10) "destructed" +string(1) "e" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug48227.php.expectf b/hphp/test/zend/bad/ext-intl/bug48227.php.expectf index 2e2d470c7..3e1fd308b 100644 --- a/hphp/test/zend/bad/ext-intl/bug48227.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug48227.php.expectf @@ -1,5 +1,5 @@ string(1) "0" string(1) "1" string(1) "0" -HipHop Notice: %a +HipHop Notice: %s string(1) "1" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php b/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php new file mode 100644 index 000000000..94e3635fd --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php @@ -0,0 +1,23 @@ +format(array($time)) . "\n"; + +//NOT FIXED: +/*$msgf = new MessageFormatter('en_US', +'{1, select, date {{0,date,full}} other {{0,time,h:m:s a V}}}'); + +echo "msgf2: ", $msgf->format(array($time, 'date')), " ", + $msgf->format(array($time, 'time')), "\n"; +*/ + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php.expectf b/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php.expectf new file mode 100644 index 000000000..7d0297d95 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/bug58756_MessageFormatter.php.expectf @@ -0,0 +1,3 @@ +date: Tuesday, July 7, 2009 8:41:13 PM EDT +msgf: Tuesday, July 7, 2009 8:41:13 PM EDT +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug60192-compare.php.expectf b/hphp/test/zend/bad/ext-intl/bug60192-compare.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-intl/bug60192-compare.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug60192-compare.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug60192-getlocale.php.expectf b/hphp/test/zend/bad/ext-intl/bug60192-getlocale.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-intl/bug60192-getlocale.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug60192-getlocale.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug60192-sort.php.expectf b/hphp/test/zend/bad/ext-intl/bug60192-sort.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-intl/bug60192-sort.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug60192-sort.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug60192-sortwithsortkeys.php.expectf b/hphp/test/zend/bad/ext-intl/bug60192-sortwithsortkeys.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-intl/bug60192-sortwithsortkeys.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug60192-sortwithsortkeys.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug62017.php.expectf b/hphp/test/zend/bad/ext-intl/bug62017.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/bad/ext-intl/bug62017.php.expectf +++ b/hphp/test/zend/bad/ext-intl/bug62017.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug62915.php b/hphp/test/zend/bad/ext-intl/bug62915.php new file mode 100644 index 000000000..2e8f316b6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/bug62915.php @@ -0,0 +1,15 @@ +getMessage()); +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/bug62915.php.expectf b/hphp/test/zend/bad/ext-intl/bug62915.php.expectf new file mode 100644 index 000000000..7c2f24b52 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/bug62915.php.expectf @@ -0,0 +1 @@ +string(39) "Cannot clone unconstructed IntlTimeZone" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php b/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php new file mode 100644 index 000000000..a77271464 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php @@ -0,0 +1,22 @@ +clear()); +var_dump( + $intlcal->get(IntlCalendar::FIELD_YEAR), + $intlcal->get(IntlCalendar::FIELD_MONTH), + $intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH), + $intlcal->get(IntlCalendar::FIELD_HOUR), + $intlcal->get(IntlCalendar::FIELD_MINUTE), + $intlcal->get(IntlCalendar::FIELD_SECOND), + $intlcal->get(IntlCalendar::FIELD_MILLISECOND) +); + +$intlcal2 = IntlCalendar::createInstance('Europe/Amsterdam'); +intlcal_clear($intlcal2, null); +var_dump($intlcal2->getTime()); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php.expectf new file mode 100644 index 000000000..b4b16d7ba --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_clear_basic.php.expectf @@ -0,0 +1,10 @@ +bool(true) +int(1970) +int(0) +int(1) +int(0) +int(0) +int(0) +int(0) +float(-3600000) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php b/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php new file mode 100644 index 000000000..0e5b4b0f0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php @@ -0,0 +1,20 @@ +getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; +print_R($cal->getType()); +echo "\n"; + +$timeMillis = $cal->getTime(); +$time = time(); + +var_dump(abs($timeMillis - $time * 1000) < 1000); + +?> +==DONE== diff --git a/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php.expectf new file mode 100644 index 000000000..34be0a031 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_createInstance_basic.php.expectf @@ -0,0 +1,11 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Amsterdam + [rawOffset] => 3600000 + [currentOffset] => %d +) +nl +gregorian +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_createInstance_error.php b/hphp/test/zend/bad/ext-intl/calendar_createInstance_error.php new file mode 100644 index 000000000..2aab6a61d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_createInstance_error.php @@ -0,0 +1,11 @@ +getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; + +$cal = intlcal_create_instance('Europe/Lisbon', null); +print_R($cal->getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; + +$cal = intlcal_create_instance(IntlTimeZone::createTimeZone('Europe/Lisbon')); +print_R($cal->getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; + +$cal = intlcal_create_instance(null, "pt"); +print_R($cal->getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; + +$cal = intlcal_create_instance("Europe/Lisbon", "pt"); +print_R($cal->getTimeZone()); +print_R($cal->getLocale(Locale::ACTUAL_LOCALE)); +echo "\n"; + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_createInstance_variation1.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_createInstance_variation1.php.expectf new file mode 100644 index 000000000..fac8f305c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_createInstance_variation1.php.expectf @@ -0,0 +1,41 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Amsterdam + [rawOffset] => 3600000 + [currentOffset] => %d +) +nl +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Lisbon + [rawOffset] => 0 + [currentOffset] => %d +) +nl +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Lisbon + [rawOffset] => 0 + [currentOffset] => %d +) +nl +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Amsterdam + [rawOffset] => 3600000 + [currentOffset] => %d +) +pt +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Lisbon + [rawOffset] => 0 + [currentOffset] => %d +) +pt +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php new file mode 100644 index 000000000..d8e9a7140 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php @@ -0,0 +1,30 @@ +getTime(), + strtotime('2012-01-01 00:00:00 Europe/Rome') * 1000., + $cal->getTimeZone()->getID(), + $cal->getLocale(1) +); +echo "\n"; + +$cal = IntlCalendar::fromDateTime(new DateTime('2012-01-01 00:00:00 PST'), "pt_PT"); +var_dump( + $cal->getTime(), + strtotime('2012-01-01 00:00:00 PST') * 1000., + $cal->getTimeZone()->getID(), + $cal->getLocale(1) +); + +echo "\n"; + +$cal = intlcal_from_date_time(new DateTime('2012-01-01 00:00:00 +03:40')); +var_dump( + $cal->getTime(), + strtotime('2012-01-01 00:00:00 +03:40') * 1000., + $cal->getTimeZone()->getID() +); diff --git a/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php.expectf new file mode 100644 index 000000000..37fe0f4a6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_basic.php.expectf @@ -0,0 +1,13 @@ +float(1325372400000) +float(1325372400000) +string(11) "Europe/Rome" +string(5) "nl_NL" + +float(1325404800000) +float(1325404800000) +string(3) "PST" +string(5) "pt_PT" + +float(1325362800000) +float(1325362800000) +string(%d) "GMT+03%S40" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_error.php b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_error.php new file mode 100644 index 000000000..a29387149 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_fromDateTime_error.php @@ -0,0 +1,26 @@ + 100); + +$locales = intlcal_get_available_locales(); +var_dump(in_array('pt', $locales)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_basic.php.expectf new file mode 100644 index 000000000..ef4f6c528 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_basic.php.expectf @@ -0,0 +1,3 @@ +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_error.php b/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_error.php new file mode 100644 index 000000000..7ddd8753b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getAvailableLocales_error.php @@ -0,0 +1,5 @@ +getFirstDayOfWeek()); +var_dump(intlcal_get_first_day_of_week($intlcal)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getFirstDayOfWeek_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getFirstDayOfWeek_basic.php.expectf new file mode 100644 index 000000000..24c49b7a6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getFirstDayOfWeek_basic.php.expectf @@ -0,0 +1,3 @@ +int(2) +int(2) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php new file mode 100644 index 000000000..c9693894f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php @@ -0,0 +1,18 @@ + 8); +var_dump(in_array('japanese', $var)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php.expectf new file mode 100644 index 000000000..c296eac06 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_basic.php.expectf @@ -0,0 +1,8 @@ +Array +( + [0] => gregorian +) + +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_error.php b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_error.php new file mode 100644 index 000000000..8ddcf62fc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getKeywordValuesForLocale_error.php @@ -0,0 +1,5 @@ +getLocale(Locale::ACTUAL_LOCALE)); +var_dump(intlcal_get_locale($intlcal, Locale::VALID_LOCALE)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getLocale_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getLocale_basic.php.expectf new file mode 100644 index 000000000..fdd255eff --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getLocale_basic.php.expectf @@ -0,0 +1,3 @@ +string(2) "nl" +string(5) "nl_NL" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php b/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php new file mode 100644 index 000000000..5c158ff7b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php @@ -0,0 +1,9 @@ +getMinimalDaysInFirstWeek()); +var_dump(intlcal_get_minimal_days_in_first_week($intlcal)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php.expectf new file mode 100644 index 000000000..f7c1fcbaa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getMinimalDaysInFirstWeek_basic.php.expectf @@ -0,0 +1,3 @@ +int(4) +int(4) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php b/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php new file mode 100644 index 000000000..202fd05f7 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php @@ -0,0 +1,12 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php.expectf new file mode 100644 index 000000000..ef4f6c528 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getNow_basic.php.expectf @@ -0,0 +1,3 @@ +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getNow_error.php b/hphp/test/zend/bad/ext-intl/calendar_getNow_error.php new file mode 100644 index 000000000..bbdc90720 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getNow_error.php @@ -0,0 +1,5 @@ +getTimeZone()); +print_r(intlcal_get_time_zone($intlcal)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_getTimeZone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_getTimeZone_basic.php.expectf new file mode 100644 index 000000000..230437372 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_getTimeZone_basic.php.expectf @@ -0,0 +1,15 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT+00:01 + [rawOffset] => 60000 + [currentOffset] => 60000 +) +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT+00:01 + [rawOffset] => 60000 + [currentOffset] => 60000 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_basic.php b/hphp/test/zend/bad/ext-intl/calendar_get_basic.php new file mode 100644 index 000000000..ccdfbc7f3 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_basic.php @@ -0,0 +1,12 @@ +set(IntlCalendar::FIELD_DAY_OF_MONTH, 4); + +var_dump($intlcal->get(IntlCalendar::FIELD_DAY_OF_MONTH)); +var_dump(intlcal_get($intlcal, IntlCalendar::FIELD_DAY_OF_MONTH)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_get_basic.php.expectf new file mode 100644 index 000000000..f7c1fcbaa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_basic.php.expectf @@ -0,0 +1,3 @@ +int(4) +int(4) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php b/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php new file mode 100644 index 000000000..069d56ecb --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php @@ -0,0 +1,29 @@ + +setRepeatedWallTimeOption(IntlCalendar::WALLTIME_LAST)); +var_dump($intlcal->getRepeatedWallTimeOption()); +$intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 30); +var_dump( + strtotime('2012-10-28 02:30:00 +0100'), + (int)($intlcal->getTime() /1000) +); + +var_dump(intlcal_set_repeated_wall_time_option($intlcal, IntlCalendar::WALLTIME_FIRST)); +var_dump(intlcal_get_repeated_wall_time_option($intlcal)); +$intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 30); +var_dump( + strtotime('2012-10-28 02:30:00 +0200'), + (int)($intlcal->getTime() /1000) +); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php.expectf new file mode 100644 index 000000000..7f6daefc3 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_setRepeatedWallTimeOption_basic.php.expectf @@ -0,0 +1,9 @@ +bool(true) +int(0) +int(1351387800) +int(1351387800) +bool(true) +int(1) +int(1351384200) +int(1351384200) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php b/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php new file mode 100644 index 000000000..fddb22099 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php @@ -0,0 +1,41 @@ + +getSkippedWallTimeOption()); +$intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 30); +echo "Should be 3h30\n"; +var_dump( + $intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY), + $intlcal->get(IntlCalendar::FIELD_MINUTE) +); + +var_dump($intlcal->setSkippedWallTimeOption(IntlCalendar::WALLTIME_FIRST)); +var_dump(intlcal_get_skipped_wall_time_option($intlcal)); +$intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 30); +echo "Should be 1h30\n"; +var_dump( + $intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY), + $intlcal->get(IntlCalendar::FIELD_MINUTE) +); + +var_dump(intlcal_set_skipped_wall_time_option($intlcal, IntlCalendar::WALLTIME_NEXT_VALID)); +var_dump($intlcal->getSkippedWallTimeOption()); +$intlcal->set(IntlCalendar::FIELD_HOUR_OF_DAY, 2); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 30); +echo "Should be 3h00\n"; +var_dump( + $intlcal->get(IntlCalendar::FIELD_HOUR_OF_DAY), + $intlcal->get(IntlCalendar::FIELD_MINUTE) +); + + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php.expectf new file mode 100644 index 000000000..bed12680e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_get_setSkippedWallTimeOption_basic.php.expectf @@ -0,0 +1,15 @@ +int(0) +Should be 3h30 +int(3) +int(30) +bool(true) +int(1) +Should be 1h30 +int(1) +int(30) +bool(true) +int(2) +Should be 3h00 +int(3) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php b/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php new file mode 100644 index 000000000..6242b39c7 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php @@ -0,0 +1,23 @@ +roll(IntlCalendar::FIELD_MONTH, true); + +var_dump( + "1 - 1", + $intlcal1->isEquivalentTo($intlcal1), + "1 - 2", + $intlcal1->isEquivalentTo($intlcal2), + "1 - 3", + $intlcal1->isEquivalentTo($intlcal3), + "1 - 4", + $intlcal1->isEquivalentTo($intlcal4) +); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php.expectf new file mode 100644 index 000000000..c290b66cd --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_isEquivalentTo_basic.php.expectf @@ -0,0 +1,9 @@ +string(5) "1 - 1" +bool(true) +string(5) "1 - 2" +bool(false) +string(5) "1 - 3" +bool(false) +string(5) "1 - 4" +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php b/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php new file mode 100644 index 000000000..20259536f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php @@ -0,0 +1,12 @@ +isSet(IntlCalendar::FIELD_MINUTE)); +$intlcal->clear(IntlCalendar::FIELD_MINUTE); +var_dump($intlcal->isSet(IntlCalendar::FIELD_MINUTE)); +$intlcal->set(IntlCalendar::FIELD_MINUTE, 0); +var_dump(intlcal_is_set($intlcal, IntlCalendar::FIELD_MINUTE)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php.expectf new file mode 100644 index 000000000..215637a3d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_isSet_basic.php.expectf @@ -0,0 +1,4 @@ +bool(true) +bool(false) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php b/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php new file mode 100644 index 000000000..3d10540d9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php @@ -0,0 +1,13 @@ +isLenient()); +var_dump(intlcal_is_lenient($intlcal1)); +var_dump($intlcal1->setLenient(false)); +var_dump($intlcal1->isLenient()); +var_dump(intlcal_set_lenient($intlcal1, true)); +var_dump($intlcal1->isLenient()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php.expectf new file mode 100644 index 000000000..72e95e73d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_is_set_lenient_basic.php.expectf @@ -0,0 +1,7 @@ +bool(true) +bool(true) +bool(true) +bool(false) +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php b/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php new file mode 100644 index 000000000..e3929fea4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php @@ -0,0 +1,14 @@ +setFirstDayOfWeek(IntlCalendar::DOW_TUESDAY), + $intlcal->getFirstDayOfWeek(), + intlcal_set_first_day_of_week($intlcal, IntlCalendar::DOW_WEDNESDAY), + $intlcal->getFirstDayOfWeek() +); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php.expectf new file mode 100644 index 000000000..27814c79b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setFirstDayOfWeek_basic.php.expectf @@ -0,0 +1,6 @@ +int(3) +bool(true) +int(3) +bool(true) +int(4) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php new file mode 100644 index 000000000..7d0bbfe1a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php @@ -0,0 +1,22 @@ +getTimeZone()->getID()); +echo "\n"; +var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); + +$intlcal->setTimeZone(IntlTimeZone::getGMT()); +print_r($intlcal->getTimeZone()->getID()); +echo "\n"; +var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); + +intlcal_set_time_zone($intlcal, + IntlTimeZone::createTimeZone('GMT+05:30')); +print_r($intlcal->getTimeZone()->getID()); +echo "\n"; +var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php.expectf new file mode 100644 index 000000000..9877932ba --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_basic.php.expectf @@ -0,0 +1,7 @@ +Europe/Amsterdam +int(3600000) +GMT +int(0) +GMT+05:30 +int(19800000) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php new file mode 100644 index 000000000..7e8429933 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php @@ -0,0 +1,14 @@ +setTimeZone($pstdate->getTimeZone()); +var_dump($intlcal->getTimeZone()->getID()); + +$pstdate = new DateTime('2012-01-01 00:00:00 +24:00'); +$intlcal->setTimeZone($pstdate->getTimeZone()); +var_dump($intlcal->getTimeZone()->getID()); diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php.expectf new file mode 100644 index 000000000..6da3ac5c0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_error2.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +string(16) "Europe/Amsterdam" +HipHop Warning: %s +string(16) "Europe/Amsterdam" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php new file mode 100644 index 000000000..1755bcffc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php @@ -0,0 +1,17 @@ +getTimeZone()->getID()); +echo "\n"; +var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); + +/* passing NULL has no effect */ +$intlcal->setTimeZone(null); +print_r($intlcal->getTimeZone()->getID()); +echo "\n"; +var_dump($intlcal->get(IntlCalendar::FIELD_ZONE_OFFSET)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php.expectf new file mode 100644 index 000000000..9d8b6b266 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation1.php.expectf @@ -0,0 +1,5 @@ +Europe/Amsterdam +int(3600000) +Europe/Amsterdam +int(3600000) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php new file mode 100644 index 000000000..a7569f9f9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php @@ -0,0 +1,18 @@ +setTimeZone('Europe/Paris'); +var_dump($intlcal->getTimeZone()->getID()); +$intlcal->setTimeZone(new DateTimeZone('Europe/Madrid')); +var_dump($intlcal->getTimeZone()->getID()); + +$pstdate = new DateTime('2012-01-01 00:00:00 PST'); +$intlcal->setTimeZone($pstdate->getTimeZone()); +var_dump($intlcal->getTimeZone()->getID()); + +$offsetdate = new DateTime('2012-01-01 00:00:00 -02:30'); +$intlcal->setTimeZone($offsetdate->getTimeZone()); +var_dump($intlcal->getTimeZone()->getID()); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php.expectf new file mode 100644 index 000000000..54c11ef16 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_setTimeZone_variation2.php.expectf @@ -0,0 +1,4 @@ +string(12) "Europe/Paris" +string(13) "Europe/Madrid" +string(3) "PST" +string(%d) "GMT-02%S30" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php new file mode 100644 index 000000000..201b787aa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php @@ -0,0 +1,12 @@ +toDateTime(); + +var_dump($dt->format("c"), $dt->getTimeZone()->getName()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php.expectf new file mode 100644 index 000000000..61b48e381 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_basic.php.expectf @@ -0,0 +1,3 @@ +string(25) "2012-05-17T17:35:36+01:00" +string(13) "Europe/Lisbon" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php new file mode 100644 index 000000000..897c4d0c2 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php @@ -0,0 +1,17 @@ +toDateTime(3)); + +var_dump(intlcal_to_date_time($cal, 3)); + +$cal = new IntlGregorianCalendar("Etc/Unknown"); +try { +var_dump($cal->toDateTime()); +} catch (Exception $e) { +var_dump("exception: {$e->getMessage()}"); +} + +var_dump(intlcal_to_date_time(3)); diff --git a/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php.expectf b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php.expectf new file mode 100644 index 000000000..ec789319f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/calendar_toDateTime_error.php.expectf @@ -0,0 +1,9 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +string(77) "exception: DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)" +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php b/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php new file mode 100644 index 000000000..072ed9fe5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php @@ -0,0 +1,21 @@ +setText($text); + +$it_clone = clone $it; +var_dump($it == $it_clone); + +$it->setText($text2 ); +var_dump($it == $it_clone); + +$it_clone->setText($text2); +var_dump($it == $it_clone); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php.expectf b/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php.expectf new file mode 100644 index 000000000..215637a3d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_clone_equality.php.expectf @@ -0,0 +1,4 @@ +bool(true) +bool(false) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php new file mode 100644 index 000000000..a068c6b2e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php @@ -0,0 +1,39 @@ +setText($text); + +var_dump($codepoint_it->getLastCodePoint()); +//first() and last() don't read codepoint and set the last code point var to -1 +//The pointer is after the last read codepoint if moving forward and +//before the last read codepoint is moving backwards +$p = $codepoint_it->first(); +while ($p != IntlBreakIterator::DONE) { + $c = $codepoint_it->getLastCodePoint(); + if ($c > 0) + var_dump(sprintf('U+%04X', $codepoint_it->getLastCodePoint())); + else + var_dump($c); + //it's a post-increment operation as to the codepoint, i.e., it gives the codepoint + //starting at the initial position and only then moves the pointer forward + $p = $codepoint_it->next(); +} + +echo "Now backwards\n"; +$p = $codepoint_it->last(); +while ($p != IntlBreakIterator::DONE) { + $c = $codepoint_it->getLastCodePoint(); + if ($c > 0) + var_dump(sprintf('U+%04X', $codepoint_it->getLastCodePoint())); + else + var_dump($c); + $p = $codepoint_it->previous(); +} + + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php.expectf b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php.expectf new file mode 100644 index 000000000..8a1c8df25 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_basic.php.expectf @@ -0,0 +1,35 @@ +int(-1) +int(-1) +string(6) "U+0E15" +string(6) "U+0E31" +string(6) "U+0E27" +string(6) "U+0E2D" +string(6) "U+0E22" +string(6) "U+0E48" +string(6) "U+0E32" +string(6) "U+0E07" +string(6) "U+0E02" +string(6) "U+0E49" +string(6) "U+0E2D" +string(6) "U+0E04" +string(6) "U+0E27" +string(6) "U+0E32" +string(6) "U+0E21" +Now backwards +int(-1) +string(6) "U+0E21" +string(6) "U+0E32" +string(6) "U+0E27" +string(6) "U+0E04" +string(6) "U+0E2D" +string(6) "U+0E49" +string(6) "U+0E02" +string(6) "U+0E07" +string(6) "U+0E32" +string(6) "U+0E48" +string(6) "U+0E22" +string(6) "U+0E2D" +string(6) "U+0E27" +string(6) "U+0E31" +string(6) "U+0E15" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php new file mode 100644 index 000000000..a51616d58 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php @@ -0,0 +1,5 @@ +getLastCodePoint(array())); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php.expectf b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php.expectf new file mode 100644 index 000000000..97450ca6a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_getLastCodePoint_error.php.expectf @@ -0,0 +1,3 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php b/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php new file mode 100644 index 000000000..41f2bcc60 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php @@ -0,0 +1,16 @@ +getPartsIterator(); +$it->getBreakIterator()->setText($text); + +foreach ($it as $k => $v) { + echo "$k. $v (" . sprintf("U+%04X", $it->getBreakIterator()->getLastCodePoint()) . + ") at {$it->getBreakIterator()->current()}\r\n"; +} + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php.expectf b/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php.expectf new file mode 100644 index 000000000..f44f67b43 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/cpbi_parts_iterator.php.expectf @@ -0,0 +1,16 @@ +0. ต (U+0E15) at 3 +1. ั (U+0E31) at 6 +2. ว (U+0E27) at 9 +3. อ (U+0E2D) at 12 +4. ย (U+0E22) at 15 +5. ่ (U+0E48) at 18 +6. า (U+0E32) at 21 +7. ง (U+0E07) at 24 +8. ข (U+0E02) at 27 +9. ้ (U+0E49) at 30 +10. อ (U+0E2D) at 33 +11. ค (U+0E04) at 36 +12. ว (U+0E27) at 39 +13. า (U+0E32) at 42 +14. ม (U+0E21) at 45 +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php b/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php new file mode 100644 index 000000000..f2851faa7 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php @@ -0,0 +1,14 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php.expectf new file mode 100644 index 000000000..2b31af4f6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat___construct_bad_tz_cal.php.expectf @@ -0,0 +1,7 @@ +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php b/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php new file mode 100644 index 000000000..dce43b5d2 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php @@ -0,0 +1,37 @@ +format($ts), "\n"; + +$cal = IntlCalendar::createInstance('UTC', 'en@calendar=islamic'); +$df = new IntlDateFormatter('es_ES', 0, 0, NULL, $cal); +echo $df->format($ts), "\n"; + +//override calendar's timezone +$cal = new IntlGregorianCalendar('UTC', NULL); +$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Madrid', $cal); +echo $df->format($ts), "\n"; + +//default calendar is gregorian +$df = new IntlDateFormatter('es_ES@calendar=islamic', 0, 0); +echo $df->format($ts), "\n"; + +//try now with traditional +$df = new IntlDateFormatter('es_ES@calendar=islamic', 0, 0, NULL, IntlDateFormatter::TRADITIONAL); +echo $df->format($ts), "\n"; + +//the timezone can be overridden when not specifying a calendar +$df = new IntlDateFormatter('es_ES@calendar=islamic', 0, 0, 'UTC', IntlDateFormatter::TRADITIONAL); +echo $df->format($ts), "\n"; + +$df = new IntlDateFormatter('es_ES', 0, 0, 'UTC', 0); +echo $df->format($ts), "\n"; + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php.expectf new file mode 100644 index 000000000..b6182ef06 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_create_cal_arg.php.expectf @@ -0,0 +1,8 @@ +domingo%S 1 de enero de 2012 00:00:00 GMT +domingo%S 8 de Safar de 1433 00:00:00 GMT +domingo%S 1 de enero de 2012 01:00:00 Hora estándar de Europa Central +sábado%S 31 de diciembre de 2011 d.C. 23:00:00 Hora %Sde las Azores +sábado%S 7 de Safar de 1433 AH 23:00:00 Hora %Sde las Azores +domingo%S 8 de Safar de 1433 AH 00:00:00 GMT +domingo%S 1 de enero de 2012 00:00:00 GMT +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_format.php b/hphp/test/zend/bad/ext-intl/dateformat_format.php index 9bc8f52ac..a6565206e 100644 --- a/hphp/test/zend/bad/ext-intl/dateformat_format.php +++ b/hphp/test/zend/bad/ext-intl/dateformat_format.php @@ -1,5 +1,7 @@ setTime(strtotime('2012-01-01 00:00:00')*1000.); +echo IntlDateFormatter::formatObject($cal), "\n"; +echo IntlDateFormatter::formatObject($cal, IntlDateFormatter::FULL, "en-US"), "\n"; + +?> +==DONE== diff --git a/hphp/test/zend/bad/ext-intl/dateformat_formatObject_calendar.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_calendar.php.expectf new file mode 100644 index 000000000..4418437bf --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_calendar.php.expectf @@ -0,0 +1,9 @@ +01/01/2012 00:00:00 +Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental +Jan 1, 2012 12:00:00 AM +1/1/12 12:00:00 AM Western European %STime +Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon) +Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 +06/02/1433 00:00:00 +Sunday, Safar 6, 1433 12:00:00 AM Western European %STime +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php new file mode 100644 index 000000000..a3d2cd23e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php @@ -0,0 +1,17 @@ + +==DONE== diff --git a/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php.expectf new file mode 100644 index 000000000..1980bdcb5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_datetime.php.expectf @@ -0,0 +1,7 @@ +01/01/2012 00:00:00 +Domingo, 1 de Janeiro de 2012 0:00:00 Hora %Sda Europa Ocidental +Jan 1, 2012 12:00:00 AM +1/1/12 12:00:00 AM Western European %STime +Sun 2012-01-1 00,00,00.000 Portugal Time (Lisbon) +Domingo, 1 de Janeiro de 2012 5:00:00 GMT+03:00 +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php new file mode 100644 index 000000000..23f1c4fb4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php @@ -0,0 +1,25 @@ + +==DONE== diff --git a/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php.expectf new file mode 100644 index 000000000..a70332245 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_formatObject_error.php.expectf @@ -0,0 +1,26 @@ +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_format_parse.php b/hphp/test/zend/bad/ext-intl/dateformat_format_parse.php index cccb949a8..2c2c523f3 100644 --- a/hphp/test/zend/bad/ext-intl/dateformat_format_parse.php +++ b/hphp/test/zend/bad/ext-intl/dateformat_format_parse.php @@ -7,7 +7,7 @@ function ut_main() { - $timezone = 'GMT+5'; + $timezone = 'GMT+05:00'; $locale_arr = array ( 'en_US' diff --git a/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php b/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php new file mode 100644 index 000000000..10f5ed809 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php @@ -0,0 +1,14 @@ +getCalendarObject(9)); +var_dump(datefmt_get_calendar_object($df, 9)); +var_dump(datefmt_get_calendar_object($df, 9)); +var_dump(datefmt_get_calendar_object(new stdclass)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php.expectf new file mode 100644 index 000000000..ac7976931 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_getCalendarObject_error.php.expectf @@ -0,0 +1,13 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php b/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php new file mode 100644 index 000000000..8adcb46e5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php @@ -0,0 +1,14 @@ +getTimeZone(9)); +var_dump(datefmt_get_timezone($df, 9)); +var_dump(datefmt_get_timezone($df, 9)); +var_dump(datefmt_get_timezone(new stdclass)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php.expectf new file mode 100644 index 000000000..ac7976931 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_getTimeZone_error.php.expectf @@ -0,0 +1,13 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php b/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php index f29ffb5c2..2d6350d45 100644 --- a/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php +++ b/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php @@ -1,42 +1,31 @@ format($ts), "\n"; +var_dump($df->getCalendar(), +$df->getCalendarObject()->getType(), +$df->getCalendarObject()->getTimeZone()->getId()); +echo "\n"; } -include_once( 'ut_common.inc' ); +$df = new IntlDateFormatter('fr@calendar=islamic', 0, 0, 'Europe/Minsk'); +d($df); -// Run the test -ut_run(); -?> \ No newline at end of file + +//changing the calendar with a cal type should not change tz +$df->setCalendar(IntlDateFormatter::TRADITIONAL); +d($df); + +//but changing with an actual calendar should +$cal = IntlCalendar::createInstance("UTC"); +$df->setCalendar($cal); +d($df); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php.expectf index a291e0152..4e32c9ba7 100644 --- a/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php.expectf +++ b/hphp/test/zend/bad/ext-intl/dateformat_get_set_calendar.php.expectf @@ -1,12 +1,16 @@ -Creating IntlDateFormatter with calendar = 1 -After call to get_calendar : calendar= 1 -------------------- -Setting IntlDateFormatter with calendar = 1 -After call to get_calendar : calendar= 1 -------------------- -Setting IntlDateFormatter with calendar = 0 -After call to get_calendar : calendar= 0 -------------------- -Setting IntlDateFormatter with calendar = 3 -After call to get_calendar : calendar= 0 -------------------- \ No newline at end of file +dimanche 1 janvier 2012 ap. J.-C. 03:00:00 UTC+03:00 +int(1) +string(9) "gregorian" +string(12) "Europe/Minsk" + +dimanche 8 Safar 1433 AH 03:00:00 UTC+03:00 +int(0) +string(7) "islamic" +string(12) "Europe/Minsk" + +dimanche 1 janvier 2012 ap. J.-C. 00:00:00 UTC +bool(false) +string(9) "gregorian" +string(3) "UTC" + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php b/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php new file mode 100644 index 000000000..4ea922713 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php @@ -0,0 +1,33 @@ +format($ts), "\n"; +var_dump( +$df->getTimeZoneID(), +$df->getTimeZone()->getID()); +echo "\n"; +} + +$df = new IntlDateFormatter('pt_PT', 0, 0, 'Europe/Minsk'); +d($df); + +$df->setTimeZone(NULL); +d($df); + +$df->setTimeZone('Europe/Madrid'); +d($df); + +$df->setTimeZone(IntlTimeZone::createTimeZone('Europe/Paris')); +d($df); + +$df->setTimeZone(new DateTimeZone('Europe/Amsterdam')); +d($df); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php.expectf new file mode 100644 index 000000000..6eae7d4c4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_get_set_timezone.php.expectf @@ -0,0 +1,21 @@ +Domingo, 1 de Janeiro de 2012 3:00:00 GMT+03:00 +string(12) "Europe/Minsk" +string(12) "Europe/Minsk" + +Sábado, 31 de Dezembro de 2011 23:00:00 Hor%s %Sdos Açores +string(15) "Atlantic/Azores" +string(15) "Atlantic/Azores" + +Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central +string(13) "Europe/Madrid" +string(13) "Europe/Madrid" + +Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central +string(12) "Europe/Paris" +string(12) "Europe/Paris" + +Domingo, 1 de Janeiro de 2012 1:00:00 Hor%s %Sda Europa Central +string(16) "Europe/Amsterdam" +string(16) "Europe/Amsterdam" + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php new file mode 100644 index 000000000..7eaefb7b2 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php @@ -0,0 +1,11 @@ +setTimeZoneId('Europe/Madrid'); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php.expectf new file mode 100644 index 000000000..c4a2ccf65 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.php.expectf @@ -0,0 +1,2 @@ +Deprecated: IntlDateFormatter::setTimeZoneId(): Use datefmt_set_timezone() instead, which also accepts a plain time zone identifier and for which this function is now an alias in hphp/test/zend/bad/ext-intl/dateformat_setTimeZoneID_deprecation.phpt on line %d +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php new file mode 100644 index 000000000..f3a598583 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php @@ -0,0 +1,16 @@ +setTimeZone()); +var_dump(datefmt_set_timezone()); +var_dump($df->setTimeZone(array())); +var_dump($df->setTimeZone(1, 2)); +var_dump($df->setTimeZone('non existing timezone')); +var_dump(datefmt_set_timezone(new stdclass, 'UTC')); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php.expectf new file mode 100644 index 000000000..afdc46719 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_setTimeZone_error.php.expectf @@ -0,0 +1,18 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Notice: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php b/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php new file mode 100644 index 000000000..7e1b89576 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php @@ -0,0 +1,29 @@ +format($ts), "\n"; + +$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam'); +echo $df->format($ts), "\n"; + +$df = new IntlDateFormatter('es_ES', 0, 0, new DateTimeZone('Europe/Lisbon')); +echo $df->format($ts), "\n"; + +$df = new IntlDateFormatter('es_ES', 0, 0, IntlTimeZone::createTimeZone('America/New_York')); +echo $df->format($ts), "\n"; + +//time zone has priority +$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', new IntlGregorianCalendar('Europe/Lisbon')); +echo $df->format($ts), "\n"; + +//calendar has priority +$df = new IntlDateFormatter('es_ES', 0, 0, NULL, new IntlGregorianCalendar('Europe/Lisbon')); +echo $df->format($ts), "\n"; + +$df = new IntlDateFormatter('es_ES', 0, 0, 'Europe/Amsterdam', 0); +echo $df->format($ts), "\n"; diff --git a/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php.expectf b/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php.expectf new file mode 100644 index 000000000..9383900e0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/dateformat_timezone_arg_variations.php.expectf @@ -0,0 +1,7 @@ +sábado%S 31 de diciembre de 2011 23:00:00 Hora%S de las Azores +domingo%S 1 de enero de 2012 01:00:00 Hora estándar de Europa Central +domingo%S 1 de enero de 2012 00:00:00 Hora%S de Europa Occidental +sábado%S 31 de diciembre de 2011 19:00:00 Hora estándar oriental +domingo%S 1 de enero de 2012 01:00:00 Hora estándar de Europa Central +domingo%S 1 de enero de 2012 00:00:00 Hora%S de Europa Occidental +domingo%S 1 de enero de 2012 01:00:00 Hora estándar de Europa Central \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/formatter_fail.php.expectf b/hphp/test/zend/bad/ext-intl/formatter_fail.php.expectf index efef77c27..29fa8e404 100644 --- a/hphp/test/zend/bad/ext-intl/formatter_fail.php.expectf +++ b/hphp/test/zend/bad/ext-intl/formatter_fail.php.expectf @@ -1,17 +1,17 @@ -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'numfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR' diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php new file mode 100644 index 000000000..f637d659a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php @@ -0,0 +1,29 @@ +getTimeZone()->getId()); +var_dump($intlcal->getLocale(1)); + +$intlcal = new IntlGregorianCalendar('Europe/Lisbon', NULL); +var_dump($intlcal->getTimeZone()->getId()); +var_dump($intlcal->getLocale(1)); + +$intlcal = new IntlGregorianCalendar(NULL, 'pt_PT'); +var_dump($intlcal->getTimeZone()->getId()); +var_dump($intlcal->getLocale(1)); + +$intlcal = new IntlGregorianCalendar('Europe/Lisbon', 'pt_PT'); +var_dump($intlcal->getTimeZone()->getId()); +var_dump($intlcal->getLocale(1)); + +$intlcal = new IntlGregorianCalendar('Europe/Paris', 'fr_CA', NULL, NULL, NULL, NULL); +var_dump($intlcal->getTimeZone()->getId()); +var_dump($intlcal->getLocale(1)); + +var_dump($intlcal->getType()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php.expectf b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php.expectf new file mode 100644 index 000000000..b1b207656 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_basic.php.expectf @@ -0,0 +1,12 @@ +string(16) "Europe/Amsterdam" +string(5) "nl_NL" +string(13) "Europe/Lisbon" +string(5) "nl_NL" +string(16) "Europe/Amsterdam" +string(5) "pt_PT" +string(13) "Europe/Lisbon" +string(5) "pt_PT" +string(12) "Europe/Paris" +string(5) "fr_CA" +string(9) "gregorian" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_error.php b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_error.php new file mode 100644 index 000000000..2b6d938d7 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_error.php @@ -0,0 +1,9 @@ +getTimeZone()->getId()); +var_dump($intlcal->getTime(), (float)strtotime('2012-02-29 16:00:00') * 1000); + +$intlcal = new IntlGregorianCalendar(2012, 1, 29, 16, 7, 8); +var_dump($intlcal->getTime(), (float)strtotime('2012-02-29 16:07:08') * 1000); + +var_dump($intlcal->getType()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_variant1.php.expectf new file mode 100644 index 000000000..3cde396e0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar___construct_variant1.php.expectf @@ -0,0 +1,7 @@ +string(16) "Europe/Amsterdam" +float(1330527600000) +float(1330527600000) +float(1330528028000) +float(1330528028000) +string(9) "gregorian" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php b/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php new file mode 100644 index 000000000..03ff154ea --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php @@ -0,0 +1,18 @@ +getGregorianChange()); + +var_dump($intlcal->setGregorianChange(0)); +var_dump(intlgregcal_get_gregorian_change($intlcal)); + +var_dump(intlgregcal_set_gregorian_change($intlcal, 1)); +var_dump($intlcal->getGregorianChange()); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php.expectf b/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php.expectf new file mode 100644 index 000000000..945ec0997 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar_get_setGregorianChange_basic.php.expectf @@ -0,0 +1,6 @@ +float(-12219292800000) +bool(true) +float(0) +bool(true) +float(1) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php b/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php new file mode 100644 index 000000000..2ec5a5873 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php @@ -0,0 +1,15 @@ +isLeapYear(2012)); +var_dump($intlcal->isLeapYear(1900)); + +var_dump(intlgregcal_is_leap_year($intlcal, 2012)); +var_dump(intlgregcal_is_leap_year($intlcal, 1900)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php.expectf b/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php.expectf new file mode 100644 index 000000000..4b5a430f0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/gregoriancalendar_isLeapYear_basic.php.expectf @@ -0,0 +1,5 @@ +bool(true) +bool(false) +bool(true) +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/idn_uts46_errors.php.expectf b/hphp/test/zend/bad/ext-intl/idn_uts46_errors.php.expectf index c7d37ca4c..2105363a1 100644 --- a/hphp/test/zend/bad/ext-intl/idn_uts46_errors.php.expectf +++ b/hphp/test/zend/bad/ext-intl/idn_uts46_errors.php.expectf @@ -1,19 +1,19 @@ => PHP level errors bad args: -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL bad variant: -HipHop Warning: %a +HipHop Warning: %s bool(false) empty domain: -HipHop Warning: %a +HipHop Warning: %s bool(false) fourth arg for 2003 variant (only notice raised): -HipHop Notice: %a +HipHop Notice: %s string(7) "foo.com" with error, but no details arg: bool(false) diff --git a/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php b/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php new file mode 100644 index 000000000..7d8209733 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php @@ -0,0 +1,11 @@ +transliterate('a', 3)); +} catch (IntlException $intlE) { + var_dump($intlE->getMessage()); +} +ini_set("intl.use_exceptions", false); +ini_set("intl.error_level", E_NOTICE); +var_dump($t->transliterate('a', 3)); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php.expectf b/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php.expectf new file mode 100644 index 000000000..796bc1637 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/ini_use_exceptions_basic.php.expectf @@ -0,0 +1,3 @@ +string(130) "transliterator_transliterate: Neither "start" nor the "end" arguments can exceed the number of UTF-16 code units (in this case, 1)" +HipHop Notice: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/locale_accept.php.expectf b/hphp/test/zend/bad/ext-intl/locale_accept.php.expectf index 708431d87..e2a3f978a 100644 --- a/hphp/test/zend/bad/ext-intl/locale_accept.php.expectf +++ b/hphp/test/zend/bad/ext-intl/locale_accept.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Accepting en-us,en;q=0.5: en_US Accepting da, en-gb;q=0.8, en;q=0.7: da Accepting zh, en-us;q=0.8, en;q=0.7: zh diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_fail.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_fail.php.expectf index ca1f95231..27eabe790 100644 --- a/hphp/test/zend/bad/ext-intl/msgfmt_fail.php.expectf +++ b/hphp/test/zend/bad/ext-intl/msgfmt_fail.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' @@ -16,11 +16,11 @@ HipHop Warning: %a 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_fail2.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_fail2.php.expectf index a0ca016e0..c10b20f3e 100644 --- a/hphp/test/zend/bad/ext-intl/msgfmt_fail2.php.expectf +++ b/hphp/test/zend/bad/ext-intl/msgfmt_fail2.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' @@ -16,11 +16,11 @@ HipHop Warning: %a 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' -HipHop Warning: %a +HipHop Warning: %s 'msgfmt_create: unable to parse input parameters: U_ILLEGAL_ARGUMENT_ERROR' 'msgfmt_create: message formatter creation failed: U_PATTERN_SYNTAX_ERROR' 'msgfmt_create: message formatter creation failed: U_PATTERN_SYNTAX_ERROR' diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php new file mode 100644 index 000000000..8653f1939 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php @@ -0,0 +1,9 @@ +format(array(7))); diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php.expectf new file mode 100644 index 000000000..c8aa74b11 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error1.php.expectf @@ -0,0 +1 @@ +string(5) "7 {1}" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php new file mode 100644 index 000000000..ddf1d310a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php @@ -0,0 +1,9 @@ +format(array(7))); diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php.expectf new file mode 100644 index 000000000..30eda3aaa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error2.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php new file mode 100644 index 000000000..8ad9f0674 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php @@ -0,0 +1,9 @@ +format(array("foo" => 7, -1 => "bar"))); diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php.expectf new file mode 100644 index 000000000..30eda3aaa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error3.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php new file mode 100644 index 000000000..ec7ab464c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php @@ -0,0 +1,11 @@ +format(array("foo" => 7, "\x80" => "bar"))); + +var_dump($mf->format(array("foo" => "\x80"))); diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php.expectf new file mode 100644 index 000000000..79fe1faf3 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error4.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php new file mode 100644 index 000000000..cbdbd185b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php @@ -0,0 +1,9 @@ +format(array("foo" => 'bar', 7 => fopen('php://memory', 'r+')))); diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php.expectf new file mode 100644 index 000000000..30eda3aaa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_error6.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php new file mode 100644 index 000000000..d70affdc1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php @@ -0,0 +1,20 @@ +format(array($cal)), "\n"; + +//NOT FIXED: +/*$msgf = new MessageFormatter('en_US', +'{1, select, date {{0,date,full}} other {{0,time,h:m:s a V}}}'); + +echo "msgf2: ", $msgf->format(array($time, 'date')), " ", + $msgf->format(array($time, 'time')), "\n"; +*/ + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php.expectf new file mode 100644 index 000000000..45de01c6a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_intlcalendar.php.expectf @@ -0,0 +1,2 @@ +Quinta-feira, 17 de Maio de 2012 5:35:36 p.m. WEST +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php new file mode 100644 index 000000000..422b040b4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php @@ -0,0 +1,12 @@ +format(array(2.3, "foo" => 1.3))); +var_dump($mf->format(array("foo" => 1.3, 0 => 2.3))); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php.expectf new file mode 100644 index 000000000..059baf05c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_mixed_params.php.expectf @@ -0,0 +1,3 @@ +string(10) "2.3 -- 1st" +string(10) "2.3 -- 1st" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php new file mode 100644 index 000000000..c6618565e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php @@ -0,0 +1,57 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php.expectf new file mode 100644 index 000000000..35a4f84f9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns.php.expectf @@ -0,0 +1,8 @@ +'Alice does not give a party.' +'Alice does not give a party.' +'Alice invites Bob to his party.' +'Alice invites Bob to his party.' +'Alice invites Bob and one other person to their party.' +'Alice invites Bob and one other person to their party.' +'Alice invites Bob as one of the 26 people invited to her party.' +'Alice invites Bob as one of the 26 people invited to her party.' \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php new file mode 100644 index 000000000..c9cca50e6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php @@ -0,0 +1,57 @@ + 'female', 'num_guests' => 0, 'host' => 'Alice', 'guest' => 'Bob'), + array('gender_of_host' => 'male', 'num_guests' => 1, 'host' => 'Alice', 'guest' => 'Bob'), + array('gender_of_host' => 'none', 'num_guests' => 2, 'host' => 'Alice', 'guest' => 'Bob'), + array('gender_of_host' => 'female', 'num_guests' => 27, 'host' => 'Alice', 'guest' => 'Bob'), +); + +$str_res = ''; + + $fmt = ut_msgfmt_create( 'en_US', $pattern ); + if(!$fmt) { + $str_res .= dump(intl_get_error_message())."\n"; + return $str_res; + } + foreach ($args as $arg) { + $str_res .= dump( ut_msgfmt_format($fmt, $arg) ). "\n"; + $str_res .= dump( ut_msgfmt_format_message('en_US', $pattern, $arg) ) . "\n"; + } + return $str_res; +} + +include_once( 'ut_common.inc' ); + +// Run the test +ut_run(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php.expectf new file mode 100644 index 000000000..35a4f84f9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_format_subpatterns_named.php.expectf @@ -0,0 +1,8 @@ +'Alice does not give a party.' +'Alice does not give a party.' +'Alice invites Bob to his party.' +'Alice invites Bob to his party.' +'Alice invites Bob and one other person to their party.' +'Alice invites Bob and one other person to their party.' +'Alice invites Bob as one of the 26 people invited to her party.' +'Alice invites Bob as one of the 26 people invited to her party.' \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php b/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php new file mode 100644 index 000000000..898a76ac8 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php @@ -0,0 +1,15 @@ +format(array(1336310569.123))); + +$p = 'On 2012-05-06 AD at 15:22:49.123 GMT+02:00 something odd happened'; +var_dump($mf->parse($p)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php.expectf new file mode 100644 index 000000000..6a6708c96 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_millisecond_dates.php.expectf @@ -0,0 +1,6 @@ +string(%d) "On 2012-05-0%d AD at %d:%d:49.123 %s something odd happened" +array(1) { + [0]=> + float(1336310569.123) +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php b/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php new file mode 100644 index 000000000..42b2fcf6e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php @@ -0,0 +1,14 @@ +format(array(1.3, 1.3))); +var_dump($mf->format(array(1.3, 1.3))); +$mf->setPattern("{0,ordinal} -- {1,number}"); +var_dump($mf->format(array(1.3, 1.3))); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php.expectf b/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php.expectf new file mode 100644 index 000000000..50ee4cd9e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/msgfmt_setPattern_cache.php.expectf @@ -0,0 +1,4 @@ +string(10) "1.3 -- 1st" +string(10) "1.3 -- 1st" +string(10) "1st -- 1.3" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php b/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php new file mode 100644 index 000000000..2017a3323 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php @@ -0,0 +1,21 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php.expectf b/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php.expectf new file mode 100644 index 000000000..175034cb2 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter___construct_basic.php.expectf @@ -0,0 +1,2 @@ +string(26) "IntlRuleBasedBreakIterator" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php b/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php new file mode 100644 index 000000000..2bf1d0c1d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php @@ -0,0 +1,28 @@ +setText('sdfkjsdf88á.... ,;');; + +$br = $rbbi->getBinaryRules(); + +$rbbi2 = new IntlRuleBasedBreakIterator($br, true); + +var_dump($rbbi->getRules(), $rbbi2->getRules()); +var_dump($rbbi->getRules() == $rbbi2->getRules()); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php.expectf b/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php.expectf new file mode 100644 index 000000000..f9aea5fe0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getBinaryRules_basic.php.expectf @@ -0,0 +1,4 @@ +string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" +string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php new file mode 100644 index 000000000..91e6d8de5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php @@ -0,0 +1,28 @@ +setText('sdfkjsdf88á.... ,;');; + +do { + var_dump($rbbi->current(), $rbbi->getRuleStatusVec()); +} while ($rbbi->next() != IntlBreakIterator::DONE); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php.expectf b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php.expectf new file mode 100644 index 000000000..28eae6d60 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatusVec_basic.php.expectf @@ -0,0 +1,23 @@ +int(0) +array(1) { + [0]=> + int(0) +} +int(12) +array(2) { + [0]=> + int(1) + [1]=> + int(4) +} +int(16) +array(1) { + [0]=> + int(42) +} +int(19) +array(1) { + [0]=> + int(4) +} +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php new file mode 100644 index 000000000..c238814d1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php @@ -0,0 +1,27 @@ +setText('sdfkjsdf88á.... ,;'); + +do { + echo "pos : {$rbbi->current()}\n", + "rule status: {$rbbi->getRuleStatus()}\n"; +} while ($rbbi->next() != IntlBreakIterator::DONE); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php.expectf b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php.expectf new file mode 100644 index 000000000..ea4a69205 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRuleStatus_basic.php.expectf @@ -0,0 +1,11 @@ +pos : 0 +rule status: 0 +pos : 12 +rule status: 1 +pos : 16 +rule status: 42 +pos : 17 +rule status: 0 +pos : 19 +rule status: 42 +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php b/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php new file mode 100644 index 000000000..11b33d653 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php @@ -0,0 +1,22 @@ +getRules()); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php.expectf b/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php.expectf new file mode 100644 index 000000000..25bbb0041 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/rbbiter_getRules_basic.php.expectf @@ -0,0 +1,2 @@ +string(128) "$LN = [[:letter:] [:number:]];$S = [.;,:];!!forward;$LN+ {1};$S+ {42};!!reverse;$LN+ {1};$S+ {42};!!safe_forward;!!safe_reverse;" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php b/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php new file mode 100644 index 000000000..0ff68afff --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php @@ -0,0 +1,14 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php.expectf new file mode 100644 index 000000000..6f426bdcc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_clone_basic.php.expectf @@ -0,0 +1,29 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Amsterdam + [rawOffset] => 3600000 + [currentOffset] => %d +) +IntlTimeZone Object +( + [valid] => 1 + [id] => Europe/Amsterdam + [rawOffset] => 3600000 + [currentOffset] => %d +) +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT + [rawOffset] => 0 + [currentOffset] => 0 +) +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT + [rawOffset] => 0 + [currentOffset] => 0 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_clone_error.php b/hphp/test/zend/bad/ext-intl/timezone_clone_error.php new file mode 100644 index 000000000..eb87a019c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_clone_error.php @@ -0,0 +1,17 @@ +getMessage()); +} + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_clone_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_clone_error.php.expectf new file mode 100644 index 000000000..15ba51763 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_clone_error.php.expectf @@ -0,0 +1,7 @@ +object(A)#1 (1) { + ["valid"]=> + bool(false) +} +string(9) "Exception" +string(39) "Cannot clone unconstructed IntlTimeZone" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php new file mode 100644 index 000000000..d2ab15fcc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php @@ -0,0 +1,9 @@ += 2); + +$count2 = intltz_count_equivalent_ids('Europe/Lisbon'); +var_dump($count2 == $count); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php.expectf new file mode 100644 index 000000000..ef4f6c528 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_basic.php.expectf @@ -0,0 +1,3 @@ +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_error.php b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_error.php new file mode 100644 index 000000000..db2c5082b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_countEquivalentIDs_error.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createDefault_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createDefault_basic.php.expectf new file mode 100644 index 000000000..699284e73 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createDefault_basic.php.expectf @@ -0,0 +1,15 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => %s + [rawOffset] => %i + [currentOffset] => %i +) +IntlTimeZone Object +( + [valid] => 1 + [id] => %s + [rawOffset] => %i + [currentOffset] => %i +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createDefault_error.php b/hphp/test/zend/bad/ext-intl/timezone_createDefault_error.php new file mode 100644 index 000000000..e22885dcc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createDefault_error.php @@ -0,0 +1,5 @@ + 300); + +$tz = intltz_create_enumeration(); +var_dump(get_class($tz)); +$count2 = count(iterator_to_array($tz)); +var_dump($count == $count2); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_basic.php.expectf new file mode 100644 index 000000000..ad40ad73d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_basic.php.expectf @@ -0,0 +1,5 @@ +string(12) "IntlIterator" +bool(true) +string(12) "IntlIterator" +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_error.php b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_error.php new file mode 100644 index 000000000..64c2dc41f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_error.php @@ -0,0 +1,6 @@ + 20); + +$tz->rewind(); +var_dump(in_array('Europe/Amsterdam', iterator_to_array($tz))); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation1.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation1.php.expectf new file mode 100644 index 000000000..dda6f3cda --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation1.php.expectf @@ -0,0 +1,4 @@ +string(12) "IntlIterator" +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php new file mode 100644 index 000000000..2c18d3fdf --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php @@ -0,0 +1,12 @@ += 1); + +$tz->rewind(); +var_dump(in_array('Europe/Amsterdam', iterator_to_array($tz))); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php.expectf new file mode 100644 index 000000000..dda6f3cda --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createEnumeration_variation2.php.expectf @@ -0,0 +1,4 @@ +string(12) "IntlIterator" +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php new file mode 100644 index 000000000..e11f13b1e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php @@ -0,0 +1,15 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php.expectf new file mode 100644 index 000000000..1af468f51 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_basic.php.expectf @@ -0,0 +1,9 @@ +Array +( + [0] => Atlantic/Azores +) +Array +( + [0] => Atlantic/Azores +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_error.php b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_error.php new file mode 100644 index 000000000..8d1ec8596 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_error.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant1.php.expectf new file mode 100644 index 000000000..cb072910d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant1.php.expectf @@ -0,0 +1,4 @@ +bool(true) +bool(true) +bool(true) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php new file mode 100644 index 000000000..f2471590e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php @@ -0,0 +1,33 @@ + $countCanonical); +var_dump($countCanonical > $countCanonicalLocation); + +$enum = IntlTimeZone::createTimeZoneIDEnumeration( + IntlTimeZone::TYPE_ANY, null, null); +$countAny2 = count(iterator_to_array($enum)); +var_dump($countAny == $countAny2); + +$enum = IntlTimeZone::createTimeZoneIDEnumeration( + IntlTimeZone::TYPE_ANY, null, -3600000); +$values = iterator_to_array($enum); + +print_r( +array_values( +array_intersect($values, +array('Etc/GMT+1', 'Atlantic/Azores')) +)); + + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php.expectf new file mode 100644 index 000000000..39d445951 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZoneIDEnumeration_variant2.php.expectf @@ -0,0 +1,9 @@ +bool(true) +bool(true) +bool(true) +Array +( + [0] => Atlantic/Azores + [1] => Etc/GMT+1 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php new file mode 100644 index 000000000..fd2fdb49f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php.expectf new file mode 100644 index 000000000..9d469515c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_basic.php.expectf @@ -0,0 +1,15 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT+01:00 + [rawOffset] => 3600000 + [currentOffset] => 3600000 +) +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT+01:00 + [rawOffset] => 3600000 + [currentOffset] => 3600000 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_error.php b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_error.php new file mode 100644 index 000000000..157b8f8e6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_createTimeZone_error.php @@ -0,0 +1,7 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_equals_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_equals_basic.php.expectf new file mode 100644 index 000000000..82d48e1b0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_equals_basic.php.expectf @@ -0,0 +1,9 @@ +Comparison to self: +bool(true) +Comparison to equal instance: +bool(true) +Comparison to equivalent instance: +bool(false) +Comparison to GMT: +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_equals_error.php b/hphp/test/zend/bad/ext-intl/timezone_equals_error.php new file mode 100644 index 000000000..c0ae8d3fa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_equals_error.php @@ -0,0 +1,18 @@ +getMessage()); +} + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_equals_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_equals_error.php.expectf new file mode 100644 index 000000000..12e4971ef --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_equals_error.php.expectf @@ -0,0 +1,17 @@ +object(A)#1 (1) { + ["valid"]=> + bool(false) +} +object(IntlTimeZone)#2 (4) { + ["valid"]=> + bool(true) + ["id"]=> + string(3) "GMT" + ["rawOffset"]=> + int(0) + ["currentOffset"]=> + int(0) +} +string(9) "Exception" +string(63) "Comparison with at least one unconstructed IntlTimeZone operand" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php b/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php new file mode 100644 index 000000000..6ecd7e4c8 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php @@ -0,0 +1,24 @@ +getID(), $tz->getRawOffset()); + + +$dt = new DateTime('2012-01-01 00:00:00 CET'); +$dtz = $dt->getTimeZone(); +/* this is different from new DateTimeZone('CET'), + * which gives a Europe/Berlin timezone */ +var_dump($dtz->getName()); +$tz = IntlTimeZone::fromDateTimeZone($dtz); +var_dump($tz->getID(), $tz->getRawOffset()); + + +$dt = new DateTime('2012-01-01 00:00:00 +0340'); +$dtz = $dt->getTimeZone(); +/* I don't think this timezone can be generated without a DateTime object */ +var_dump($dtz->getName()); +$tz = IntlTimeZone::fromDateTimeZone($dtz); +var_dump($tz->getID(), $tz->getRawOffset() /* (3*60+40)*60000 */); diff --git a/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php.expectf new file mode 100644 index 000000000..9101069f0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_fromDateTimeZone_basic.php.expectf @@ -0,0 +1,8 @@ +string(16) "Europe/Amsterdam" +int(3600000) +string(3) "CET" +string(3) "CET" +int(3600000) +string(6) "+03:40" +string(%d) "GMT+03%s0" +int(13200000) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php new file mode 100644 index 000000000..c1a43cba1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php.expectf new file mode 100644 index 000000000..e9f45cecf --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_basic.php.expectf @@ -0,0 +1,3 @@ +Europe/Lisbon +Europe/Lisbon +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_error.php b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_error.php new file mode 100644 index 000000000..4e550508f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_error.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_variant1.php.expectf new file mode 100644 index 000000000..549122650 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getCanonicalID_variant1.php.expectf @@ -0,0 +1,5 @@ +string(13) "Europe/Lisbon" +bool(true) +string(0) "" +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php new file mode 100644 index 000000000..5c250abef --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php @@ -0,0 +1,10 @@ +getDSTSavings()); + +var_dump(intltz_get_dst_savings($lsb)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php.expectf new file mode 100644 index 000000000..8e7089e3c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_basic.php.expectf @@ -0,0 +1,3 @@ +int(3600000) +int(3600000) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php new file mode 100644 index 000000000..80fc6106b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php @@ -0,0 +1,7 @@ +getDSTSavings(array())); + +var_dump(intltz_get_dst_savings(null)); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDSTSavings_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php new file mode 100644 index 000000000..941e8cad8 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php @@ -0,0 +1,13 @@ +getDisplayName()); + +ini_set('intl.default_locale', 'pt_PT'); +var_dump($lsb->getDisplayName()); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php.expectf new file mode 100644 index 000000000..17fb2b989 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_basic.php.expectf @@ -0,0 +1,3 @@ +string(%d) "Western European%sTime" +string(%d) "Hora%sda Europa Ocidental" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php new file mode 100644 index 000000000..ef26de112 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php @@ -0,0 +1,11 @@ +getDisplayName(array())); +var_dump($tz->getDisplayName(false, array())); +var_dump($tz->getDisplayName(false, -1)); +var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, array())); +var_dump($tz->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT, NULL, NULL)); + +var_dump(intltz_get_display_name(null, IntlTimeZone::DISPLAY_SHORT, false, 'pt_PT')); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php.expectf new file mode 100644 index 000000000..752a3550e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_error.php.expectf @@ -0,0 +1,15 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php new file mode 100644 index 000000000..ce42e96d4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php @@ -0,0 +1,14 @@ +getDisplayName()); +var_dump($lsb->getDisplayName(false)); +var_dump($lsb->getDisplayName(true)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php.expectf new file mode 100644 index 000000000..ddc29f75f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant1.php.expectf @@ -0,0 +1,4 @@ +string(%d) "Western European%sTime" +string(%d) "Western European%sTime" +string(28) "Western European Summer Time" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php new file mode 100644 index 000000000..32976c21b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php @@ -0,0 +1,19 @@ +getDisplayName(false, IntlTimeZone::DISPLAY_SHORT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_GENERIC)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG_GENERIC)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_GMT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG_GMT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_COMMONLY_USED)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php.expectf new file mode 100644 index 000000000..e6cf5a993 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2-49+.php.expectf @@ -0,0 +1,9 @@ +string(3) "GMT" +string(30) "Western European Standard Time" +string(22) "Portugal Time (Lisbon)" +string(21) "Western European Time" +string(5) "+0000" +string(3) "GMT" +string(3) "GMT" +string(22) "Portugal Time (Lisbon)" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php new file mode 100644 index 000000000..32976c21b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php @@ -0,0 +1,19 @@ +getDisplayName(false, IntlTimeZone::DISPLAY_SHORT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_GENERIC)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG_GENERIC)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_GMT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG_GMT)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_SHORT_COMMONLY_USED)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php.expectf new file mode 100644 index 000000000..0f2caaac3 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant2.php.expectf @@ -0,0 +1,9 @@ +string(3) "WET" +string(21) "Western European Time" +string(22) "Portugal Time (Lisbon)" +string(22) "Portugal Time (Lisbon)" +string(5) "+0000" +string(3) "GMT" +string(3) "GMT" +string(22) "Portugal Time (Lisbon)" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php new file mode 100644 index 000000000..b40167771 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php @@ -0,0 +1,14 @@ +getDisplayName(false, IntlTimeZone::DISPLAY_LONG)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, NULL)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, 'pt_PT')); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php.expectf new file mode 100644 index 000000000..49c4e4666 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3-49+.php.expectf @@ -0,0 +1,4 @@ +string(30) "Western European Standard Time" +string(30) "Western European Standard Time" +string(32) "Hora Padrão da Europa Ocidental" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php new file mode 100644 index 000000000..b40167771 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php @@ -0,0 +1,14 @@ +getDisplayName(false, IntlTimeZone::DISPLAY_LONG)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, NULL)); +var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_LONG, 'pt_PT')); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php.expectf new file mode 100644 index 000000000..c041a02a5 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getDisplayName_variant3.php.expectf @@ -0,0 +1,4 @@ +string(21) "Western European Time" +string(21) "Western European Time" +string(24) "Hora da Europa Ocidental" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php new file mode 100644 index 000000000..c793d1f7c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php.expectf new file mode 100644 index 000000000..50ef135d4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_basic.php.expectf @@ -0,0 +1,3 @@ +Portugal +Portugal +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_error.php b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_error.php new file mode 100644 index 000000000..c9e4d28ba --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getEquivalentID_error.php @@ -0,0 +1,7 @@ +getErrorCode()); +var_dump($lsb->getErrorMessage()); + +var_dump($lsb->getOffset(INF, 1, $a, $b)); + +var_dump($lsb->getErrorCode()); +var_dump($lsb->getErrorMessage()); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getErrorCodeMessage_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getErrorCodeMessage_basic.php.expectf new file mode 100644 index 000000000..18cc543fa --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getErrorCodeMessage_basic.php.expectf @@ -0,0 +1,7 @@ +int(0) +string(12) "U_ZERO_ERROR" +HipHop Warning: %s +bool(false) +int(1) +string(67) "intltz_get_offset: error obtaining offset: U_ILLEGAL_ARGUMENT_ERROR" +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php b/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php new file mode 100644 index 000000000..716568fae --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php @@ -0,0 +1,7 @@ +getErrorCode(array())); + +var_dump(intltz_get_error_code(null)); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getErrorCode_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php b/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php new file mode 100644 index 000000000..83e41f66d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php @@ -0,0 +1,7 @@ +getErrorMessage(array())); + +var_dump(intltz_get_error_message(null)); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getErrorMessage_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php new file mode 100644 index 000000000..001dcc2e9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php.expectf new file mode 100644 index 000000000..54d3f2197 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getGMT_basic.php.expectf @@ -0,0 +1,15 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT + [rawOffset] => 0 + [currentOffset] => 0 +) +IntlTimeZone Object +( + [valid] => 1 + [id] => GMT + [rawOffset] => 0 + [currentOffset] => 0 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getGMT_error.php b/hphp/test/zend/bad/ext-intl/timezone_getGMT_error.php new file mode 100644 index 000000000..0e4489503 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getGMT_error.php @@ -0,0 +1,5 @@ +getID('foo')); +intltz_get_id(null); + diff --git a/hphp/test/zend/bad/ext-intl/timezone_getID_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getID_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getID_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php b/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php new file mode 100644 index 000000000..9f0b93a27 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php @@ -0,0 +1,9 @@ +getOffset(INF, true, $a, $a)); +var_dump($tz->getOffset(time()*1000, true, $a)); +var_dump($tz->getOffset(time()*1000, true, $a, $a, $a)); + +intltz_get_offset(null, time()*1000, false, $a, $a); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php.expectf new file mode 100644 index 000000000..bf6a43b58 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getOffset_error.php.expectf @@ -0,0 +1,9 @@ +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php new file mode 100644 index 000000000..3d7cb9679 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php @@ -0,0 +1,10 @@ +getRawOffset()); + +$lsb = IntlTimeZone::createTimeZone('Europe/Lisbon'); +var_dump(intltz_get_raw_offset($lsb)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php.expectf new file mode 100644 index 000000000..0e89871e9 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_basic.php.expectf @@ -0,0 +1,3 @@ +int(3600000) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php new file mode 100644 index 000000000..84389943b --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php @@ -0,0 +1,7 @@ +getRawOffset('foo')); + +intltz_get_raw_offset(null); diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRawOffset_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php new file mode 100644 index 000000000..7390e7fca --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php @@ -0,0 +1,8 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php.expectf new file mode 100644 index 000000000..e76f73b10 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRegion_basic.php.expectf @@ -0,0 +1,3 @@ +NL +NL +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getRegion_error.php b/hphp/test/zend/bad/ext-intl/timezone_getRegion_error.php new file mode 100644 index 000000000..89d631b7a --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getRegion_error.php @@ -0,0 +1,10 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getTZData_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getTZData_basic.php.expectf new file mode 100644 index 000000000..9a03b88e6 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getTZData_basic.php.expectf @@ -0,0 +1,3 @@ +20%d%s +20%d%s +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php b/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php new file mode 100644 index 000000000..9d31384fc --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php @@ -0,0 +1,10 @@ + +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php.expectf new file mode 100644 index 000000000..d7e71cce4 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_getUnknown_basic.php.expectf @@ -0,0 +1,15 @@ +IntlTimeZone Object +( + [valid] => 1 + [id] => Etc/Unknown + [rawOffset] => 0 + [currentOffset] => 0 +) +IntlTimeZone Object +( + [valid] => 1 + [id] => Etc/Unknown + [rawOffset] => 0 + [currentOffset] => 0 +) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php new file mode 100644 index 000000000..e225ed05e --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php @@ -0,0 +1,18 @@ +hasSameRules($lsb)); + +echo "\nEurope/Lisbon has same rules as Portugal:\n"; +var_dump($lsb->hasSameRules($prt)); + +echo "\nEurope/Lisbon has same rules as Atlantic/Azores:\n"; +var_dump(intltz_has_same_rules($lsb, $azo)); + +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php.expectf new file mode 100644 index 000000000..80f72f21f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_basic.php.expectf @@ -0,0 +1,9 @@ +Europe/Lisbon has same rules as itself: +bool(true) + +Europe/Lisbon has same rules as Portugal: +bool(true) + +Europe/Lisbon has same rules as Atlantic/Azores: +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php new file mode 100644 index 000000000..acd1b577d --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php @@ -0,0 +1,14 @@ +hasSameRules('foo')); + +var_dump(intltz_has_same_rules(null, $tz)); diff --git a/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php.expectf new file mode 100644 index 000000000..3ae8ab8c8 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_hasSameRules_error.php.expectf @@ -0,0 +1,14 @@ +int(4096) +string(99) "Argument 1 passed to IntlTimeZone::hasSameRules() must be an instance of IntlTimeZone, string given" +int(2) +string(81) "IntlTimeZone::hasSameRules() expects parameter 1 to be IntlTimeZone, string given" +int(2) +string(66) "IntlTimeZone::hasSameRules(): intltz_has_same_rules: bad arguments" +bool(false) +int(4096) +string(92) "Argument 1 passed to intltz_has_same_rules() must be an instance of IntlTimeZone, null given" +int(2) +string(74) "intltz_has_same_rules() expects parameter 1 to be IntlTimeZone, null given" +int(2) +string(61) "intltz_has_same_rules(): intltz_has_same_rules: bad arguments" +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php new file mode 100644 index 000000000..f31dfe99c --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php @@ -0,0 +1,17 @@ +getID(), $tz->getRawOffset()); + if (!$proc) + $dtz = $tz->toDateTimeZone(); + else + $dtz = intltz_to_date_time_zone($tz); + var_dump($dtz->getName(), $dtz->getOffset(new DateTime('2012-01-01 00:00:00'))); +} + +do_test(IntlTimeZone::createTimeZone('CET')); +do_test(IntlTimeZone::createTimeZone('Europe/Amsterdam')); +do_test(IntlTimeZone::createTimeZone('GMT+0405'), true); diff --git a/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php.expectf new file mode 100644 index 000000000..61308663f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_basic.php.expectf @@ -0,0 +1,12 @@ +string(3) "CET" +int(3600000) +string(13) "Europe/Berlin" +int(3600) +string(16) "Europe/Amsterdam" +int(3600000) +string(16) "Europe/Amsterdam" +int(3600) +string(%s) "GMT+04%s5" +int(14700000) +string(6) "+04:05" +int(14700) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php new file mode 100644 index 000000000..4119c3561 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php @@ -0,0 +1,14 @@ +toDateTimeZone('')); +try { + var_dump($tz->toDateTimeZone()); +} catch (Exception $e) { + var_dump($e->getMessage()); +} + +var_dump(intltz_to_date_time_zone()); +var_dump(intltz_to_date_time_zone(1)); diff --git a/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php.expectf new file mode 100644 index 000000000..c296ebe84 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_toDateTimeZone_error.php.expectf @@ -0,0 +1,9 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Warning: %s +string(66) "DateTimeZone::__construct(): Unknown or bad timezone (Etc/Unknown)" +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php new file mode 100644 index 000000000..43e5e9a0f --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php @@ -0,0 +1,12 @@ +useDaylightTime()); +var_dump($gmt->useDaylightTime()); + +var_dump(intltz_use_daylight_time($lsb)); +var_dump(intltz_use_daylight_time($gmt)); +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php.expectf new file mode 100644 index 000000000..4b5a430f0 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_basic.php.expectf @@ -0,0 +1,5 @@ +bool(true) +bool(false) +bool(true) +bool(false) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php new file mode 100644 index 000000000..aaa32c544 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php @@ -0,0 +1,6 @@ +useDaylightTime('foo')); +intltz_use_daylight_time(null); diff --git a/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php.expectf b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php.expectf new file mode 100644 index 000000000..e21345ef1 --- /dev/null +++ b/hphp/test/zend/bad/ext-intl/timezone_useDaylightTime_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +bool(false) +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf index af142e3e5..e2d8da66c 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_create_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID -HipHop Warning: %a +HipHop Warning: %s String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_create_from_rule_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_create_from_rule_error.php.expectf index 17595753b..a13db50d7 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_create_from_rule_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_create_from_rule_error.php.expectf @@ -1,13 +1,13 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s transliterator_create_from_rules: bad arguments: U_ILLEGAL_ARGUMENT_ERROR -HipHop Warning: %a +HipHop Warning: %s String conversion of rules to UTF-16 failed: U_INVALID_CHAR_FOUND -HipHop Warning: %a +HipHop Warning: %s transliterator_create_from_rules: unable to create ICU transliterator from rules (parse error after "{'``'}a > “;", before or at "{'``'}a > b;"): U_RULE_MASK_ERROR -HipHop Warning: %a +HipHop Warning: %s transliterator_create_from_rules: unable to create ICU transliterator from rules (parse error at offset 0, before or at "ffff"): U_MISSING_OPERATOR Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_create_inverse_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_create_inverse_error.php.expectf index 94d23619c..d31a9d98c 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_create_inverse_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_create_inverse_error.php.expectf @@ -1,4 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a - -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_basic.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_basic.php.expectf index ae0cf24ab..f9e5b855d 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_basic.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_basic.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) 10 10 diff --git a/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_error.php.expectf index 83b8a4ea7..cbcedde78 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_get_error_code_error.php.expectf @@ -1,8 +1,7 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_basic.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_basic.php.expectf index 946609959..f39b584c6 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_basic.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_basic.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) String conversion of string to UTF-16 failed: U_INVALID_CHAR_FOUND String conversion of string to UTF-16 failed: U_INVALID_CHAR_FOUND diff --git a/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_error.php.expectf index 83b8a4ea7..cbcedde78 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_get_error_message_error.php.expectf @@ -1,8 +1,7 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_list_ids_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_list_ids_error.php.expectf index 86e6fb65e..e62a70886 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_list_ids_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_list_ids_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_error.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_error.php.expectf index fa65bed86..88f5d4fa3 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_error.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_error.php.expectf @@ -1,21 +1,21 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +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: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf index ee7648cc1..a15374a94 100644 --- a/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf +++ b/hphp/test/zend/bad/ext-intl/transliterator_transliterate_variant1.php.expectf @@ -1,10 +1,10 @@ \u0020o -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s String conversion of id to UTF-16 failed: U_INVALID_CHAR_FOUND -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s transliterator_create: unable to open ICU transliterator with id "inexistant id": U_INVALID_ID Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/001.php.expectf b/hphp/test/zend/bad/ext-json/001.php.expectf index 59b9c2743..97c3941fe 100644 --- a/hphp/test/zend/bad/ext-json/001.php.expectf +++ b/hphp/test/zend/bad/ext-json/001.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL NULL NULL diff --git a/hphp/test/zend/bad/ext-json/003.php b/hphp/test/zend/bad/ext-json/003.php new file mode 100644 index 000000000..df5bc2b1d --- /dev/null +++ b/hphp/test/zend/bad/ext-json/003.php @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/003.php.expectf b/hphp/test/zend/bad/ext-json/003.php.expectf new file mode 100644 index 000000000..77099ce42 --- /dev/null +++ b/hphp/test/zend/bad/ext-json/003.php.expectf @@ -0,0 +1,16 @@ +array(1) { + [0]=> + &array(1) { + [0]=> + *RECURSION* + } +} + +bool(false) +int(6) +string(%d) "Recursion detected" + +string(8) "[[null]]" +int(6) +string(%d) "Recursion detected" +Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/004.php b/hphp/test/zend/bad/ext-json/004.php new file mode 100644 index 000000000..de22211bf --- /dev/null +++ b/hphp/test/zend/bad/ext-json/004.php @@ -0,0 +1,19 @@ +prop = $a; + +var_dump($a); + +echo "\n"; + +var_dump(json_encode($a)); +var_dump(json_last_error(), json_last_error_msg()); + +echo "\n"; + +var_dump(json_encode($a, JSON_PARTIAL_OUTPUT_ON_ERROR)); +var_dump(json_last_error(), json_last_error_msg()); + +echo "Done\n"; +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/004.php.expectf b/hphp/test/zend/bad/ext-json/004.php.expectf similarity index 50% rename from hphp/test/zend/good/ext-json/004.php.expectf rename to hphp/test/zend/bad/ext-json/004.php.expectf index afe90e01f..ff8a3c1e0 100644 --- a/hphp/test/zend/good/ext-json/004.php.expectf +++ b/hphp/test/zend/bad/ext-json/004.php.expectf @@ -2,6 +2,12 @@ object(stdClass)#%d (1) { ["prop"]=> *RECURSION* } -HipHop Warning: %a + +bool(false) +int(6) +string(%d) "Recursion detected" + string(22) "{"prop":{"prop":null}}" +int(6) +string(%d) "Recursion detected" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/007.php b/hphp/test/zend/bad/ext-json/007.php index 6efb75a1d..115060bef 100644 --- a/hphp/test/zend/bad/ext-json/007.php +++ b/hphp/test/zend/bad/ext-json/007.php @@ -1,14 +1,14 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/bug43941.php.expectf b/hphp/test/zend/bad/ext-json/bug43941.php.expectf similarity index 80% rename from hphp/test/zend/good/ext-json/bug43941.php.expectf rename to hphp/test/zend/bad/ext-json/bug43941.php.expectf index 892d710f6..3ff7ede96 100644 --- a/hphp/test/zend/good/ext-json/bug43941.php.expectf +++ b/hphp/test/zend/bad/ext-json/bug43941.php.expectf @@ -1,5 +1,5 @@ string(5) ""abc"" -string(4) "null" +bool(false) string(4) "null" string(17) "[null,null,"abc"]" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/bug53946.php b/hphp/test/zend/bad/ext-json/bug53946.php similarity index 100% rename from hphp/test/zend/good/ext-json/bug53946.php rename to hphp/test/zend/bad/ext-json/bug53946.php diff --git a/hphp/test/zend/good/ext-json/bug53946.php.expectf b/hphp/test/zend/bad/ext-json/bug53946.php.expectf similarity index 89% rename from hphp/test/zend/good/ext-json/bug53946.php.expectf rename to hphp/test/zend/bad/ext-json/bug53946.php.expectf index d7cdbbfc1..d767b7c65 100644 --- a/hphp/test/zend/good/ext-json/bug53946.php.expectf +++ b/hphp/test/zend/bad/ext-json/bug53946.php.expectf @@ -1,4 +1,4 @@ string(156) ""latin 1234 -\/ russian \u043c\u0430\u043c\u0430 \u043c\u044b\u043b\u0430 \u0440\u0430\u043c\u0443 specialchars \u0002 \b \n U+1D11E >\ud834\udd1e<"" string(100) ""latin 1234 -\/ russian мама мыла раму specialchars \u0002 \b \n U+1D11E >ð„ž<"" -string(4) "null" -string(4) "null" \ No newline at end of file +bool(false) +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug54058.php b/hphp/test/zend/bad/ext-json/bug54058.php index 1d6627156..6e5412e61 100644 --- a/hphp/test/zend/bad/ext-json/bug54058.php +++ b/hphp/test/zend/bad/ext-json/bug54058.php @@ -3,23 +3,24 @@ $bad_utf8 = quoted_printable_decode('=B0'); json_encode($bad_utf8); -var_dump(json_last_error()); +var_dump(json_last_error(), json_last_error_msg()); $a = new stdclass; $a->foo = quoted_printable_decode('=B0'); json_encode($a); -var_dump(json_last_error()); +var_dump(json_last_error(), json_last_error_msg()); $b = new stdclass; $b->foo = $bad_utf8; $b->bar = 1; json_encode($b); -var_dump(json_last_error()); +var_dump(json_last_error(), json_last_error_msg()); $c = array( 'foo' => $bad_utf8, 'bar' => 1 ); json_encode($c); -var_dump(json_last_error()); +var_dump(json_last_error(), json_last_error_msg()); + ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug54058.php.expectf b/hphp/test/zend/bad/ext-json/bug54058.php.expectf index e9636d121..8957b18a5 100644 --- a/hphp/test/zend/bad/ext-json/bug54058.php.expectf +++ b/hphp/test/zend/bad/ext-json/bug54058.php.expectf @@ -1,4 +1,8 @@ int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" int(5) -int(5) \ No newline at end of file +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug61537.php b/hphp/test/zend/bad/ext-json/bug61537.php new file mode 100644 index 000000000..62002aea3 --- /dev/null +++ b/hphp/test/zend/bad/ext-json/bug61537.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug61537.php.expectf b/hphp/test/zend/bad/ext-json/bug61537.php.expectf new file mode 100644 index 000000000..550abc00e --- /dev/null +++ b/hphp/test/zend/bad/ext-json/bug61537.php.expectf @@ -0,0 +1,13 @@ +bool(false) +int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +string(4) "null" +int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" + +bool(false) +int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" +string(4) "null" +int(5) +string(56) "Malformed UTF-8 characters, possibly incorrectly encoded" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug61978.php b/hphp/test/zend/bad/ext-json/bug61978.php index 569cb268a..f909d0270 100644 --- a/hphp/test/zend/bad/ext-json/bug61978.php +++ b/hphp/test/zend/bad/ext-json/bug61978.php @@ -24,11 +24,11 @@ class JsonTest2 implements JsonSerializable { $obj1 = new JsonTest1(); -var_dump(json_encode($obj1)); +var_dump(json_encode($obj1, JSON_PARTIAL_OUTPUT_ON_ERROR)); -echo "\n==\n"; +echo "==\n"; $obj2 = new JsonTest2(); -var_dump(json_encode($obj2)); +var_dump(json_encode($obj2, JSON_PARTIAL_OUTPUT_ON_ERROR)); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug61978.php.expectf b/hphp/test/zend/bad/ext-json/bug61978.php.expectf index adfdaa834..d9b3c3914 100644 --- a/hphp/test/zend/bad/ext-json/bug61978.php.expectf +++ b/hphp/test/zend/bad/ext-json/bug61978.php.expectf @@ -1,6 +1,3 @@ -HipHop Warning: %a string(44) "{"test":"123","me":{"test":"123","me":null}}" - == -HipHop Warning: %a string(44) "{"test":"123","me":{"test":"123","me":null}}" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/bug62369.php b/hphp/test/zend/bad/ext-json/bug62369.php new file mode 100644 index 000000000..3e08fcce5 --- /dev/null +++ b/hphp/test/zend/bad/ext-json/bug62369.php @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/inf_nan_error.php.expectf b/hphp/test/zend/bad/ext-json/inf_nan_error.php.expectf new file mode 100644 index 000000000..4a13983b3 --- /dev/null +++ b/hphp/test/zend/bad/ext-json/inf_nan_error.php.expectf @@ -0,0 +1,15 @@ +float(INF) +bool(false) +int(7) +string(34) "Inf and NaN cannot be JSON encoded" +string(1) "0" +int(7) +string(34) "Inf and NaN cannot be JSON encoded" + +float(NAN) +bool(false) +int(7) +string(34) "Inf and NaN cannot be JSON encoded" +string(1) "0" +int(7) +string(34) "Inf and NaN cannot be JSON encoded" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/json_encode_basic.php.expectf b/hphp/test/zend/bad/ext-json/json_encode_basic.php.expectf index a135444fb..01d667277 100644 --- a/hphp/test/zend/bad/ext-json/json_encode_basic.php.expectf +++ b/hphp/test/zend/bad/ext-json/json_encode_basic.php.expectf @@ -50,8 +50,7 @@ string(4) "null" -- Iteration 25 -- string(4) "null" -- Iteration 26 -- -HipHop Warning: %a -string(4) "null" +bool(false) -- Iteration 27 -- string(82) "{"MyInt":99,"MyFloat":123.45,"MyBool":true,"MyNull":null,"MyString":"Hello World"}" ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/json_encode_error.php b/hphp/test/zend/bad/ext-json/json_encode_error.php similarity index 100% rename from hphp/test/zend/good/ext-json/json_encode_error.php rename to hphp/test/zend/bad/ext-json/json_encode_error.php diff --git a/hphp/test/zend/good/ext-json/json_encode_error.php.expectf b/hphp/test/zend/bad/ext-json/json_encode_error.php.expectf similarity index 82% rename from hphp/test/zend/good/ext-json/json_encode_error.php.expectf rename to hphp/test/zend/bad/ext-json/json_encode_error.php.expectf index e310b4635..6ab3899b1 100644 --- a/hphp/test/zend/good/ext-json/json_encode_error.php.expectf +++ b/hphp/test/zend/bad/ext-json/json_encode_error.php.expectf @@ -1,10 +1,9 @@ *** Testing json_encode() : error conditions *** -- Testing json_encode() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing json_encode() function with more than expected no. of arguments -- -HipHop Warning: %a -NULL +string(5) ""abc"" ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/unsupported_type_error.php b/hphp/test/zend/bad/ext-json/unsupported_type_error.php new file mode 100644 index 000000000..93268ce41 --- /dev/null +++ b/hphp/test/zend/bad/ext-json/unsupported_type_error.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-json/unsupported_type_error.php.expectf b/hphp/test/zend/bad/ext-json/unsupported_type_error.php.expectf new file mode 100644 index 000000000..a2305823b --- /dev/null +++ b/hphp/test/zend/bad/ext-json/unsupported_type_error.php.expectf @@ -0,0 +1,7 @@ +resource(5) of type (stream) +bool(false) +int(8) +string(21) "Type is not supported" +string(4) "null" +int(8) +string(21) "Type is not supported" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-ldap/bug48441.php b/hphp/test/zend/bad/ext-ldap/bug48441.php index 926194c7d..9e293cda3 100644 --- a/hphp/test/zend/bad/ext-ldap/bug48441.php +++ b/hphp/test/zend/bad/ext-ldap/bug48441.php @@ -20,7 +20,8 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== + diff --git a/hphp/test/zend/bad/ext-ldap/bug48696.php.expectf b/hphp/test/zend/bad/ext-ldap/bug48696.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-ldap/bug48696.php.expectf +++ b/hphp/test/zend/bad/ext-ldap/bug48696.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-ldap/ldap_add_basic.php b/hphp/test/zend/bad/ext-ldap/ldap_add_basic.php index f641d41f1..1d2bb801a 100644 --- a/hphp/test/zend/bad/ext-ldap/ldap_add_basic.php +++ b/hphp/test/zend/bad/ext-ldap/ldap_add_basic.php @@ -18,7 +18,8 @@ var_dump( ) ); ?> -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + diff --git a/hphp/test/zend/bad/ext-ldap/ldap_search_variation4.php b/hphp/test/zend/bad/ext-ldap/ldap_search_variation4.php index 076ecbb3b..abf71cec6 100644 --- a/hphp/test/zend/bad/ext-ldap/ldap_search_variation4.php +++ b/hphp/test/zend/bad/ext-ldap/ldap_search_variation4.php @@ -11,7 +11,8 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== + diff --git a/hphp/test/zend/bad/ext-ldap/ldap_search_variation5.php b/hphp/test/zend/bad/ext-ldap/ldap_search_variation5.php index a75533f3d..613d8f7a7 100644 --- a/hphp/test/zend/bad/ext-ldap/ldap_search_variation5.php +++ b/hphp/test/zend/bad/ext-ldap/ldap_search_variation5.php @@ -19,7 +19,8 @@ var_dump( ldap_get_entries($link, $result) ); ?> -===DONE=== + @@ -18,7 +18,7 @@ array(2) { string(28) "cn=userA,dc=my-domain,dc=com" } } -HipHop Warning: %a +HipHop Warning: %s resource(%d) of type (ldap result) array(2) { ["count"]=> @@ -38,7 +38,7 @@ array(2) { string(28) "cn=userA,dc=my-domain,dc=com" } } -HipHop Warning: %a +HipHop Warning: %s resource(%d) of type (ldap result) array(2) { ["count"]=> diff --git a/hphp/test/zend/bad/ext-ldap/ldap_search_variation6.php b/hphp/test/zend/bad/ext-ldap/ldap_search_variation6.php index 7cf1cbee8..caadc1efd 100644 --- a/hphp/test/zend/bad/ext-ldap/ldap_search_variation6.php +++ b/hphp/test/zend/bad/ext-ldap/ldap_search_variation6.php @@ -23,7 +23,8 @@ var_dump( ldap_get_entries($link, $result[1]) ); ?> -===DONE=== + -===DONE=== + -===DONE=== +validate()); echo "Done.\n"; +?> string(14) "ANSI_X3.4-1968" diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf index fcc89ba59..9523506da 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg1.php.expectf @@ -7,7 +7,7 @@ array(3) { [2]=> int(3) } -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -17,7 +17,7 @@ array(3) { [2]=> string(0) "" } -HipHop Notice: %a +HipHop Notice: %s bool(false) array(3) { [0]=> @@ -28,7 +28,7 @@ array(3) { [2]=> string(0) "" } -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf index 348a0974c..e090e2f29 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg2.php.expectf @@ -10,7 +10,7 @@ array(1) { [0]=> string(2) "-1" } -HipHop Warning: %a +HipHop Warning: %s int(-1) int(-1) array(1) { diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf index 348a0974c..e090e2f29 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg3.php.expectf @@ -10,7 +10,7 @@ array(1) { [0]=> string(2) "-1" } -HipHop Warning: %a +HipHop Warning: %s int(-1) int(-1) array(1) { diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf index 348a0974c..e090e2f29 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg4.php.expectf @@ -10,7 +10,7 @@ array(1) { [0]=> string(2) "-1" } -HipHop Warning: %a +HipHop Warning: %s int(-1) int(-1) array(1) { diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf index f28a7afe0..6ddf8303e 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_error.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_ereg() : error conditions *** -- Testing mb_ereg() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing mb_ereg() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf index 2c6aee387..c27af1a61 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_match_error1.php.expectf @@ -1,14 +1,14 @@ *** Testing mb_ereg_match() : error conditions *** -- Testing mb_ereg_match() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing mb_ereg_match() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing mb_ereg_match() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf index 68bec38f6..b56e7b5da 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_error.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_ereg_replace() : error conditions *** -- Testing mb_ereg_replace() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing mb_ereg_replace() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf index 253575f78..6349cf381 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation2.php.expectf @@ -70,6 +70,6 @@ string(1) "_" string(1) "_" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf index d30f62082..60056c628 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation3.php.expectf @@ -70,6 +70,6 @@ string(0) "" string(0) "" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf index 361592129..14ca45222 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_replace_variation4.php.expectf @@ -70,6 +70,6 @@ string(10) "str1n1_v1l" string(10) "str1n1_v1l" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf index 10194c351..c4a842ddb 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-mbstring/mb_ereg_variation2.php.expectf @@ -99,7 +99,7 @@ bool(false) NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mbstring/mb_http_input.php b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php index f89a0045d..04bf6e3b1 100644 --- a/hphp/test/zend/bad/ext-mbstring/mb_http_input.php +++ b/hphp/test/zend/bad/ext-mbstring/mb_http_input.php @@ -1,7 +1,9 @@ diff --git a/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf b/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf index 78cf68bc0..2f88d3392 100644 --- a/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/bug47438.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug47438.phpt on line %d 0.a 1.b 2.c \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf b/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf index 76055c716..edaca20d1 100644 --- a/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/bug48754.php.expectf @@ -1,21 +1,29 @@ Explicit connection on close + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug48754.phpt on line %d Expect same thread id for $link and default conn: bool(true) resource(%d) of type (mysql link) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s Closing default link + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug48754.phpt on line %d Expect same thread id for $link and default conn but not the previous: bool(true) resource(%d) of type (mysql link) resource(%d) of type (mysql link) resource(%d) of type (Unknown) Explicit resource and pconnect + +Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug48754.phpt on line %d resource(%d) of type (mysql link persistent) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s Default link and pconnect + +Deprecated: mysql_pconnect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug48754.phpt on line %d resource(%d) of type (mysql link persistent) resource(%d) of type (mysql link persistent) resource(%d) of type (Unknown) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf b/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf index 348ebd949..4f7642602 100644 --- a/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/bug53649.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/bug53649.phpt on line %d done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf index dd55c26f1..9d8561057 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_affected_rows.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_affected_rows.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf index dd55c26f1..c75c7cf23 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_client_encoding.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_client_encoding.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf index dd55c26f1..9af537d4c 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_close.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_close.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf index 6305362dc..0bebb77f2 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_connect.php.expectf @@ -1,2 +1,21 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d +HipHop Warning: %s + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_connect.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf index dd55c26f1..c0714ec59 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_constants.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_constants.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf index dd55c26f1..3a6a35a9c 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_create_db.php.expectf @@ -1 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_create_db.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_create_db.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf index 3ecd7c4e4..043cfa763 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_data_seek.php.expectf @@ -1,5 +1,6 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_data_seek.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf index bbb6a90e5..439659afa 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_db_name.php.expectf @@ -1,4 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_db_name.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf index dd55c26f1..1535d18b1 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_db_query.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_db_query.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf index dd55c26f1..59610d0d6 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_drop_db.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_drop_db.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf index 8bef15d2c..b6d978ad4 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_errno.php.expectf @@ -1,5 +1,6 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_errno.phpt on line %d int(0) int(%d) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf index f2f386ad8..9eb65c64d 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_error.php.expectf @@ -1,3 +1,4 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_error.phpt on line %d +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf index d6c28a050..2c3f1fbf2 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_array.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_array.phpt on line %d [005] array(4) { [0]=> @@ -70,6 +71,6 @@ array(11) { [%u|b%"e"]=> %unicode|string%(1) "1" } -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf index cf4880dcd..313ca3c45 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.phpt on line %d [005] array(2) { [%u|b%"id"]=> @@ -20,7 +21,9 @@ array(5) { [%u|b%"e"]=> %unicode|string%(1) "1" } -HipHop Warning: %a +HipHop Warning: %s + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_assoc.phpt on line %d [010] array(5) { [%u|b%"id"]=> diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf index adbecee87..656188bf3 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_field.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_field.phpt on line %d object(stdClass)#%d (13) { [%u|b%"name"]=> %unicode|string%(2) "ID" @@ -55,8 +56,8 @@ object(stdClass)#%d (13) { int(0) } bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s object(stdClass)#%d (13) { [%u|b%"name"]=> %unicode|string%(2) "id" diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf index e75812829..42ff18680 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_lengths.phpt on line %d array(2) { [0]=> int(1) @@ -5,6 +6,6 @@ array(2) { int(1) } bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf index a3a5f5b80..02cf38d4e 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_object.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_object.phpt on line %d object(stdClass)#%d (2) { [%u|b%"ID"]=> %unicode|string%(1) "1" @@ -14,10 +15,10 @@ object(mysql_fetch_object_test)#%d (4) { [%u|b%"label"]=> %unicode|string%(1) "b" } -HipHop Warning: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Notice: %s object(mysql_fetch_object_construct)#%d (4) { [%u|b%"a"]=> NULL @@ -28,8 +29,8 @@ object(mysql_fetch_object_construct)#%d (4) { [%u|b%"label"]=> %unicode|string%(1) "c" } -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s object(mysql_fetch_object_construct)#%d (4) { [%u|b%"a"]=> %unicode|string%(1) "a" @@ -55,6 +56,6 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf index 95afff965..a1929dbd8 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_fetch_row.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_fetch_row.phpt on line %d [004] array(2) { [0]=> @@ -7,6 +8,6 @@ array(2) { } [005] bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php index 409c38fc0..922047ef2 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php @@ -37,12 +37,12 @@ mysql_free_result($res); $version = mysql_get_server_info($link); if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches)) printf("[009] Cannot get server version\n"); -$version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3]; +$version = ($matches[1] * 1000) + ($matches[2] * 100) + $matches[3]; $tables = array( 'label INT, UNIQUE KEY (label)' => array( array('label', '1'), - 'label' => array(($version < 500) ? 'multiple_key' : 'unique_key') + 'label' => array(($version < 5000) ? 'multiple_key' : 'unique_key') ), 'labela INT, label2 CHAR(1), KEY keyname (labela, label2)' => array( array('labela, label2', "1, 'a'"), @@ -78,7 +78,7 @@ $tables = array( ), ); -if ($version < 560) { +if ($version < 5600) { $tables['label1 TIMESTAMP']['label1'][] = 'zerofill'; $tables['label1 TIMESTAMP']['label1'][] = 'unsigned'; } diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf index bd8b7405b..94d3bda81 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_flags.php.expectf @@ -1,6 +1,7 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_flags.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf index bd8b7405b..e1eac6d92 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_len.php.expectf @@ -1,6 +1,7 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_len.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf index 38a80cc64..fb2daf9ee 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_name.php.expectf @@ -1,7 +1,8 @@ -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_name.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s %unicode|string%(2) "id" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf index 2d166617d..28d26d744 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_seek.php.expectf @@ -1,4 +1,5 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_seek.phpt on line %d +HipHop Warning: %s bool(false) object(stdClass)#%d (13) { [%u|b%"name"]=> @@ -86,9 +87,9 @@ object(stdClass)#%d (13) { [%u|b%"zerofill"]=> int(0) } -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf index b2f11176e..0595e2461 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_table.php.expectf @@ -1,7 +1,8 @@ -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_table.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s %unicode|string%(4) "test" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf index 452c3c171..6b9121cb7 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_field_type.php.expectf @@ -1,7 +1,8 @@ -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_field_type.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s %unicode|string%(3) "int" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf index 69d1f7d6d..480ce922c 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_free_result.php.expectf @@ -1,4 +1,5 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_free_result.phpt on line %d bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf index dd55c26f1..2abbd95bf 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_get_host_info.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_get_host_info.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf index dd55c26f1..b423b65f7 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_get_proto_info.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf index dd55c26f1..55e393b1e 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_get_server_info.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_get_server_info.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf index dd55c26f1..533e3ffc4 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_info.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_info.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf index f2f386ad8..cb85eb74e 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_insert_id.php.expectf @@ -1,3 +1,4 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_insert_id.phpt on line %d +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf index dd55c26f1..b65d3cc47 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_list_dbs.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_list_dbs.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf index 5c309fd1d..6238b3062 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_list_fields.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_list_fields.phpt on line %d [006] [%d] %s bool(false) Field Offset 0 @@ -7,7 +8,7 @@ mysql_field_name(): id mysql_field_type(): int Field Offset 1 mysql_field_flags()%s -mysql_field_len(): 1 +mysql_field_len(): %s mysql_field_name(): label mysql_field_type(): string done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf index dd55c26f1..be5970028 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_list_processes.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_list_processes.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf index dd55c26f1..6685c07c4 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_list_tables.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_list_tables.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf index 6305362dc..a40321925 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_num_fields.php.expectf @@ -1,2 +1,3 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_num_fields.phpt on line %d +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf index bbb6a90e5..e5108292c 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_num_rows.php.expectf @@ -1,4 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_num_rows.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf index 7dcae4d15..8eaf9f441 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_ping.php.expectf @@ -1,5 +1,6 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_ping.phpt on line %d bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf index b5c652981..453ff1b7c 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_query.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_query.phpt on line %d array(1) { [%u|b%"valid"]=> %unicode|string%(30) "this is sql but with semicolon" @@ -7,5 +8,5 @@ array(1) { %unicode|string%(1) "a" } %unicode|string%(1) "a" -HipHop Warning: %a +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf index dc835dbda..e89d30cd2 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.php.expectf @@ -1,3 +1,6 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.phpt on line %d + +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_query_load_data_openbasedir.phpt on line %d [006] [1148] %s [007] [0] '' [008] LOAD DATA not run? diff --git a/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf index 74500f8a5..6f5db0faa 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_real_escape_string.phpt on line %d %unicode|string%(31) "Am I a unicode string in PHP 6?" %unicode|string%(2) "\\" %unicode|string%(2) "\"" diff --git a/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php b/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php new file mode 100644 index 000000000..c501b0ebf --- /dev/null +++ b/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php @@ -0,0 +1,32 @@ +name); + printf("Version: %s\n", $r->getVersion()); + $classes = $r->getClasses(); + if (!empty($classes)) { + printf("[002] Expecting no class\n"); + asort($classes); + var_dump($classes); + } + + $ignore = array(); + + $functions = $r->getFunctions(); + asort($functions); + printf("Functions:\n"); + foreach ($functions as $func) { + if (isset($ignore[$func->name])) { + unset($ignore[$func->name]); + } else { + printf(" %s\n", $func->name); + } + } + if (!empty($ignore)) { + printf("Dumping version dependent and missing functions\n"); + var_dump($ignore); + } + + + print "done!"; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php.expectf new file mode 100644 index 000000000..718aeae39 --- /dev/null +++ b/hphp/test/zend/bad/ext-mysql/mysql_reflection_extension.php.expectf @@ -0,0 +1,65 @@ +Name: mysql +Version: 1.0 +Functions: + mysql + mysql_affected_rows + mysql_client_encoding + mysql_close + mysql_connect + mysql_data_seek + mysql_db_name + mysql_db_query + mysql_dbname + mysql_errno + mysql_error + mysql_escape_string + mysql_fetch_array + mysql_fetch_assoc + mysql_fetch_field + mysql_fetch_lengths + mysql_fetch_object + mysql_fetch_row + mysql_field_flags + mysql_field_len + mysql_field_name + mysql_field_seek + mysql_field_table + mysql_field_type + mysql_fieldflags + mysql_fieldlen + mysql_fieldname + mysql_fieldtable + mysql_fieldtype + mysql_free_result + mysql_freeresult + mysql_get_client_info + mysql_get_host_info + mysql_get_proto_info + mysql_get_server_info + mysql_info + mysql_insert_id + mysql_list_dbs + mysql_list_fields + mysql_list_processes + mysql_list_tables + mysql_listdbs + mysql_listfields + mysql_listtables + mysql_num_fields + mysql_num_rows + mysql_numfields + mysql_numrows + mysql_pconnect + mysql_ping + mysql_query + mysql_real_escape_string + mysql_result + mysql_select_db + mysql_selectdb + mysql_set_charset + mysql_stat + mysql_table_name + mysql_tablename + mysql_thread_id + mysql_unbuffered_query +done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php b/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php new file mode 100644 index 000000000..d373fbd7d --- /dev/null +++ b/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php @@ -0,0 +1,24 @@ +getFunctions(); + asort($functions); + printf("Functions:\n"); + foreach ($functions as $func) { + if (isset($ignore[$func->name])) + continue; + + printf(" %s\n", $func->name); + $rf = new ReflectionFunction($func->name); + printf(" Deprecated: %s\n", $rf->isDeprecated() ? "yes" : "no"); + printf(" Accepted parameters: %d\n", $rf->getNumberOfParameters()); + printf(" Required parameters: %d\n", $rf->getNumberOfRequiredParameters()); + foreach( $rf->getParameters() as $param ) { + printf(" %s\n", $param); + } + } + + print "done!"; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php.expectf new file mode 100644 index 000000000..1c940d7e2 --- /dev/null +++ b/hphp/test/zend/bad/ext-mysql/mysql_reflection_functions.php.expectf @@ -0,0 +1,355 @@ +Functions: + mysql + Deprecated: yes + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $database_name ] + Parameter #1 [ $query ] + Parameter #2 [ $link_identifier ] + mysql_affected_rows + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_client_encoding + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_close + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_connect + Deprecated: no + Accepted parameters: 5 + Required parameters: 0 + Parameter #0 [ $hostname ] + Parameter #1 [ $username ] + Parameter #2 [ $password ] + Parameter #3 [ $new ] + Parameter #4 [ $flags ] + mysql_data_seek + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row_number ] + mysql_db_name + Deprecated: no + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row ] + Parameter #2 [ $field ] + mysql_db_query + Deprecated: yes + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $database_name ] + Parameter #1 [ $query ] + Parameter #2 [ $link_identifier ] + mysql_dbname + Deprecated: yes + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row ] + Parameter #2 [ $field ] + mysql_errno + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_error + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_escape_string + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $string ] + mysql_fetch_array + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $result ] + Parameter #1 [ $result_type ] + mysql_fetch_assoc + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_fetch_field + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_fetch_lengths + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_fetch_object + Deprecated: no + Accepted parameters: 3 + Required parameters: 1 + Parameter #0 [ $result ] + Parameter #1 [ $class_name ] + Parameter #2 [ $ctor_params ] + mysql_fetch_row + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_field_flags + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_field_len + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_field_name + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_index ] + mysql_field_seek + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_field_table + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_field_type + Deprecated: no + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_fieldflags + Deprecated: yes + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_fieldlen + Deprecated: yes + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_fieldname + Deprecated: yes + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_index ] + mysql_fieldtable + Deprecated: yes + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_fieldtype + Deprecated: yes + Accepted parameters: 2 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $field_offset ] + mysql_free_result + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_freeresult + Deprecated: yes + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_get_client_info + Deprecated: no + Accepted parameters: 0 + Required parameters: 0 + mysql_get_host_info + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_get_proto_info + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_get_server_info + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_info + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_insert_id + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_list_dbs + Deprecated: yes + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_list_fields + Deprecated: no + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $database_name ] + Parameter #1 [ $table_name ] + Parameter #2 [ $link_identifier ] + mysql_list_processes + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_list_tables + Deprecated: yes + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $database_name ] + Parameter #1 [ $link_identifier ] + mysql_listdbs + Deprecated: yes + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_listfields + Deprecated: yes + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $database_name ] + Parameter #1 [ $table_name ] + Parameter #2 [ $link_identifier ] + mysql_listtables + Deprecated: yes + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $database_name ] + Parameter #1 [ $link_identifier ] + mysql_num_fields + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_num_rows + Deprecated: no + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_numfields + Deprecated: yes + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_numrows + Deprecated: yes + Accepted parameters: 1 + Required parameters: 1 + Parameter #0 [ $result ] + mysql_pconnect + Deprecated: no + Accepted parameters: 4 + Required parameters: 0 + Parameter #0 [ $hostname ] + Parameter #1 [ $username ] + Parameter #2 [ $password ] + Parameter #3 [ $flags ] + mysql_ping + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_query + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $query ] + Parameter #1 [ $link_identifier ] + mysql_real_escape_string + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $string ] + Parameter #1 [ $link_identifier ] + mysql_result + Deprecated: no + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row ] + Parameter #2 [ $field ] + mysql_select_db + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $database_name ] + Parameter #1 [ $link_identifier ] + mysql_selectdb + Deprecated: yes + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $database_name ] + Parameter #1 [ $link_identifier ] + mysql_set_charset + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $charset_name ] + Parameter #1 [ $link_identifier ] + mysql_stat + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_table_name + Deprecated: no + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row ] + Parameter #2 [ $field ] + mysql_tablename + Deprecated: no + Accepted parameters: 3 + Required parameters: 2 + Parameter #0 [ $result ] + Parameter #1 [ $row ] + Parameter #2 [ $field ] + mysql_thread_id + Deprecated: no + Accepted parameters: 1 + Required parameters: 0 + Parameter #0 [ $link_identifier ] + mysql_unbuffered_query + Deprecated: no + Accepted parameters: 2 + Required parameters: 1 + Parameter #0 [ $query ] + Parameter #1 [ $link_identifier ] +done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf index bb22d1601..d21e3ae56 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_result.php.expectf @@ -1,10 +1,11 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_result.phpt on line %d +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) valid fields %unicode|string%(1) "1" @@ -14,13 +15,13 @@ valid fields %unicode|string%(1) "a" %unicode|string%(1) "a" some invalid fields -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) _id %unicode|string%(1) "1" @@ -28,10 +29,10 @@ _label string(2) "aa" _foo NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf index 34c09c10c..9d0d36446 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_select_db.php.expectf @@ -1,4 +1,5 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_select_db.phpt on line %d %unicode|string%(%d) "%s" bool(false) -HipHop Warning: %a +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf index dd55c26f1..20eb68802 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_set_charset.php.expectf @@ -1 +1,2 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_set_charset.phpt on line %d done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf index 6305362dc..8a9b0ac41 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_stat.php.expectf @@ -1,2 +1,3 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_stat.phpt on line %d +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf index 3ff00b182..b7b902f60 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_tablename.php.expectf @@ -1,7 +1,8 @@ -HipHop Warning: %a -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_tablename.phpt on line %d +HipHop Warning: %s +HipHop Warning: %s %unicode|string%(1) "1" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf index 6305362dc..190590468 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_thread_id.php.expectf @@ -1,2 +1,3 @@ -HipHop Warning: %a +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_thread_id.phpt on line %d +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf index 6b8e7ddb9..09e53fa1d 100644 --- a/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf +++ b/hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.php.expectf @@ -1,3 +1,4 @@ +Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in hphp/test/zend/bad/ext-mysql/mysql_unbuffered_query.phpt on line %d array(1) { [%u|b%"valid"]=> %unicode|string%(30) "this is sql but with semicolon" @@ -5,6 +6,6 @@ array(1) { bool(true) resource(%d) of type (mysql result) int(0) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/002.php.expectf b/hphp/test/zend/bad/ext-openssl/002.php.expectf index 8e44c6351..47fac682c 100644 --- a/hphp/test/zend/bad/ext-openssl/002.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/002.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/004.php.expectf b/hphp/test/zend/bad/ext-openssl/004.php.expectf index b8567b2bd..7c3fc6a4e 100644 --- a/hphp/test/zend/bad/ext-openssl/004.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/004.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) resource(%d) of type (OpenSSL X.509 CSR) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/006.php.expectf b/hphp/test/zend/bad/ext-openssl/006.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-openssl/006.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/006.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/007.php.expectf b/hphp/test/zend/bad/ext-openssl/007.php.expectf index 394676fc1..443087ac0 100644 --- a/hphp/test/zend/bad/ext-openssl/007.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/007.php.expectf @@ -2,17 +2,17 @@ resource(%d) of type (OpenSSL X.509) resource(%d) of type (Unknown) resource(%d) of type (OpenSSL X.509) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (OpenSSL X.509) resource(%d) of type (Unknown) -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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/012.php.expectf b/hphp/test/zend/bad/ext-openssl/012.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-openssl/012.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/012.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/018.php.expectf b/hphp/test/zend/bad/ext-openssl/018.php.expectf index 673b517fd..a7bc531a3 100644 --- a/hphp/test/zend/bad/ext-openssl/018.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/018.php.expectf @@ -1,5 +1,5 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/021.php.expectf b/hphp/test/zend/bad/ext-openssl/021.php.expectf index f1749833f..8f1db13e3 100644 --- a/hphp/test/zend/bad/ext-openssl/021.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/021.php.expectf @@ -1,23 +1,23 @@ resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL resource(%d) of type (OpenSSL X.509) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/022.php.expectf b/hphp/test/zend/bad/ext-openssl/022.php.expectf index 03e45133d..89c3b86d1 100644 --- a/hphp/test/zend/bad/ext-openssl/022.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/022.php.expectf @@ -1,9 +1,9 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/023.php.expectf b/hphp/test/zend/bad/ext-openssl/023.php.expectf index 88f9bb459..259fd7cca 100644 --- a/hphp/test/zend/bad/ext-openssl/023.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/023.php.expectf @@ -2,14 +2,14 @@ bool(true) bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) true diff --git a/hphp/test/zend/bad/ext-openssl/024.php.expectf b/hphp/test/zend/bad/ext-openssl/024.php.expectf index bd76bebfa..a766962b1 100644 --- a/hphp/test/zend/bad/ext-openssl/024.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/024.php.expectf @@ -1,16 +1,16 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) true true \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/025.php.expectf b/hphp/test/zend/bad/ext-openssl/025.php.expectf index 62464633b..408be36ad 100644 --- a/hphp/test/zend/bad/ext-openssl/025.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/025.php.expectf @@ -1,20 +1,20 @@ bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -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) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) true \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/bug38255.php.expectf b/hphp/test/zend/bad/ext-openssl/bug38255.php.expectf index fbe5fa853..73a4ba2e7 100644 --- a/hphp/test/zend/bad/ext-openssl/bug38255.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/bug38255.php.expectf @@ -1,16 +1,16 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/bug54992.php.expectf b/hphp/test/zend/bad/ext-openssl/bug54992.php.expectf index 432d9c23e..9ff924741 100644 --- a/hphp/test/zend/bad/ext-openssl/bug54992.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/bug54992.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/openssl_decrypt_error.php.expectf b/hphp/test/zend/bad/ext-openssl/openssl_decrypt_error.php.expectf index e17f297e7..e0741d77f 100644 --- a/hphp/test/zend/bad/ext-openssl/openssl_decrypt_error.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/openssl_decrypt_error.php.expectf @@ -1,19 +1,19 @@ -HipHop Warning: %a +HipHop Warning: %s string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM=" string(44) "yof6cPPH4mLee6TOc0YQSrh4dvywMqxGUyjp0lV6+aM=" bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) 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 NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/openssl_encrypt_error.php.expectf b/hphp/test/zend/bad/ext-openssl/openssl_encrypt_error.php.expectf index 4e2d56e80..4d032dbc8 100644 --- a/hphp/test/zend/bad/ext-openssl/openssl_encrypt_error.php.expectf +++ b/hphp/test/zend/bad/ext-openssl/openssl_encrypt_error.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php b/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php new file mode 100644 index 000000000..ba2645c0f --- /dev/null +++ b/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php.expectf b/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php.expectf new file mode 100644 index 000000000..07d931271 --- /dev/null +++ b/hphp/test/zend/bad/ext-openssl/openssl_pbkdf2.php.expectf @@ -0,0 +1,5 @@ +string(40) "0c60c80f961f0e71f3a9b524af6012062fe037a6" +string(40) "ea6c014dc72d6f8ccd1ed92ace1d41f0d8de8957" +string(40) "4b007901b765489abead49d926f721d065a429c1" +string(50) "3d2eec4fe41c849b80c8d83662c0e44a8b291a964cf2f07038" +string(32) "56fa6aa75548099dcc37d7f03425e0c3" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcntl/pcntl_signal.php.expectf b/hphp/test/zend/bad/ext-pcntl/pcntl_signal.php.expectf index 7acfcc505..80c3f5350 100644 --- a/hphp/test/zend/bad/ext-pcntl/pcntl_signal.php.expectf +++ b/hphp/test/zend/bad/ext-pcntl/pcntl_signal.php.expectf @@ -1,11 +1,11 @@ signal dispatched -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ok \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/002.php.expectf b/hphp/test/zend/bad/ext-pcre/002.php.expectf index d4ec69f9a..07aaa0042 100644 --- a/hphp/test/zend/bad/ext-pcre/002.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/002.php.expectf @@ -1,16 +1,18 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" string(12) "a${1b${1c${1" -HipHop Warning: %a +HipHop Warning: %s NULL +Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in hphp/test/zend/bad/ext-pcre/002.phpt on line 12 + Parse error: %s in %s002.php(12) : regexp code on line 1 -HipHop Fatal error: %a +HipHop Fatal error: %s for ($ in %s002.php on line 12 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/004.php.expectf b/hphp/test/zend/bad/ext-pcre/004.php.expectf index 24ce02746..020125d32 100644 --- a/hphp/test/zend/bad/ext-pcre/004.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/004.php.expectf @@ -98,6 +98,8 @@ array(1) { } } } + +Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in hphp/test/zend/bad/ext-pcre/004.phpt on line %d string(9) "hello diff --git a/hphp/test/zend/bad/ext-pcre/bug37911.php.expectf b/hphp/test/zend/bad/ext-pcre/bug37911.php.expectf index 047e99620..42bbaf10c 100644 --- a/hphp/test/zend/bad/ext-pcre/bug37911.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/bug37911.php.expectf @@ -16,5 +16,5 @@ array(3) { [1]=> string(4) "blub" } -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/bug44925.php.expectf b/hphp/test/zend/bad/ext-pcre/bug44925.php.expectf index b8a671f73..cd80c5889 100644 --- a/hphp/test/zend/bad/ext-pcre/bug44925.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/bug44925.php.expectf @@ -19,10 +19,10 @@ array(9) { [8]=> &string(1) "b" } -HipHop Notice: %a +HipHop Notice: %s array(0) { } -HipHop Notice: %a +HipHop Notice: %s array(7) { [0]=> string(1) "1" diff --git a/hphp/test/zend/bad/ext-pcre/grep2.php.expectf b/hphp/test/zend/bad/ext-pcre/grep2.php.expectf index 791aa8241..a3ec5527c 100644 --- a/hphp/test/zend/bad/ext-pcre/grep2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/grep2.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [5]=> diff --git a/hphp/test/zend/bad/ext-pcre/null_bytes.php.expectf b/hphp/test/zend/bad/ext-pcre/null_bytes.php.expectf index 35f595a7f..4c2a957c8 100644 --- a/hphp/test/zend/bad/ext-pcre/null_bytes.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/null_bytes.php.expectf @@ -1,11 +1,11 @@ -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: %a -HipHop Warning: %a \ No newline at end of file +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 +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php.expectf index 36c2c0d71..ff43b4ba7 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_grep_error1.php.expectf @@ -1,23 +1,23 @@ *** Testing preg_grep() : error conditions *** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is /[a-zA-Z]/ @@ -27,6 +27,6 @@ array(2) { [2]=> string(4) "test" } -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_grep_error2.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_grep_error2.php.expectf index 19907bb7f..2f8b9bd41 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_grep_error2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_grep_error2.php.expectf @@ -1,7 +1,7 @@ *** Testing preg_grep() : error conditions *** Arg value is: this is a string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is: Array @@ -11,6 +11,6 @@ array(2) { [1]=> string(10) "a subarray" } -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_all_error.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_all_error.php.expectf index edf4cef2e..c58e4e54e 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_all_error.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_all_error.php.expectf @@ -1,14 +1,14 @@ *** Testing preg_match_all() : error conditions *** -- Testing preg_match_all() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_match_all() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_match_all() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php.expectf index f7d62786b..2be7f7f52 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_all_error1.php.expectf @@ -1,27 +1,27 @@ *** Testing preg_match_all() : error conditions *** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Arg value is Array -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL @@ -40,6 +40,6 @@ array(1) { string(1) "t" } } -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_all_error2.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_all_error2.php.expectf index a04de5d6a..5e811893d 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_all_error2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_all_error2.php.expectf @@ -1,10 +1,10 @@ *** Testing preg_match_all() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL Arg value is: Array -HipHop Warning: %a +HipHop Warning: %s bool(false) NULL diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_all_error3.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_all_error3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_all_error3.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_all_error3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_error.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_error.php.expectf index c4d939f5b..2e4f64846 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_error.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_error.php.expectf @@ -1,14 +1,14 @@ *** Testing preg_match() : error conditions *** -- Testing preg_match() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_match() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_match() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_error1.php.expectf index 53b48cb14..c5cf32801 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_error1.php.expectf @@ -1,26 +1,26 @@ *** Testing preg_match() : error conditions *** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z]/ int(1) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_match_error2.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_match_error2.php.expectf index c1afcf038..f44c90a1c 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_match_error2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_match_error2.php.expectf @@ -4,8 +4,8 @@ Arg value is: this is a string int(1) Arg value is: Array -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_quote_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_quote_error1.php.expectf index d2e222218..7abda6aab 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_quote_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_quote_error1.php.expectf @@ -4,8 +4,8 @@ Arg value is: this is a string string(16) "this is a string" Arg value is: Array -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_replace.php.expectf index b00ffe3e6..6611e1646 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_replace.php.expectf @@ -1,7 +1,7 @@ string(1) "x" string(4) "abcd" string(8) "zaab2k3l" -HipHop Warning: %a +HipHop Warning: %s string(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_callback2.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_replace_callback2.php.expectf index d38f8baf9..f234d32f2 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace_callback2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_replace_callback2.php.expectf @@ -6,7 +6,7 @@ array(3) { [12]=> string(9) "'aa' 'bb'" } -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(7) "'A'rray" diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_callback3.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_replace_callback3.php.expectf index 2b74ecd43..f84b9777d 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace_callback3.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_replace_callback3.php.expectf @@ -1,17 +1,17 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s int(3) -HipHop Warning: %a +HipHop Warning: %s int(3) -HipHop Warning: %a +HipHop Warning: %s int(3) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_callback_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_replace_callback_error1.php.expectf index 972581f48..a68f4c700 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace_callback_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_replace_callback_error1.php.expectf @@ -1,19 +1,19 @@ *** Testing preg_replace_callback() : error conditions *** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is Array diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php.expectf index 168e32043..f263805f6 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_replace_error1.php.expectf @@ -1,19 +1,19 @@ *** Testing preg_replace() : error conditions*** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s NULL Arg value is Array @@ -21,5 +21,4 @@ string(1) "a" Arg value is /[a-zA-Z]/ string(1) "1" - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_split_error.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_split_error.php.expectf index 9b3d90173..0abfd999f 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_split_error.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_split_error.php.expectf @@ -1,14 +1,14 @@ *** Testing preg_split() : error conditions *** -- Testing preg_split() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_split() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing preg_split() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_split_error1.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_split_error1.php.expectf index c48ae5f48..0dcbeaacb 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_split_error1.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_split_error1.php.expectf @@ -1,23 +1,23 @@ *** Testing preg_split() : error conditions *** Arg value is abcdef -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z] -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is [a-zA-Z]/ -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z]/F -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value is /[a-zA-Z]/ @@ -29,5 +29,5 @@ array(3) { [2]=> string(4) " 5 6" } -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_split_error2.php.expectf b/hphp/test/zend/bad/ext-pcre/preg_split_error2.php.expectf index bdfd74acf..67ff3f1b7 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_split_error2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/preg_split_error2.php.expectf @@ -1,8 +1,8 @@ *** Testing preg_split() : error conditions *** Arg value is: Array -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/split.php.expectf b/hphp/test/zend/bad/ext-pcre/split.php.expectf index 8d43f1aaf..ed5caf951 100644 --- a/hphp/test/zend/bad/ext-pcre/split.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/split.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> diff --git a/hphp/test/zend/bad/ext-pcre/split2.php.expectf b/hphp/test/zend/bad/ext-pcre/split2.php.expectf index ba95097f5..949982f27 100644 --- a/hphp/test/zend/bad/ext-pcre/split2.php.expectf +++ b/hphp/test/zend/bad/ext-pcre/split2.php.expectf @@ -283,7 +283,7 @@ array(6) { int(5) } } -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) array(1) { diff --git a/hphp/test/zend/bad/ext-pdo/bug61292.php b/hphp/test/zend/bad/ext-pdo/bug61292.php index 52911eaed..da88d72c2 100644 --- a/hphp/test/zend/bad/ext-pdo/bug61292.php +++ b/hphp/test/zend/bad/ext-pdo/bug61292.php @@ -6,8 +6,15 @@ class Database_SQL extends PDO { function __construct() { + $dsn = getenv('PDOTEST_DSN'); + $user = getenv('PDOTEST_USER'); + $pass = getenv('PDOTEST_PASS'); + + if ($user === false) $user = NULL; + if ($pass === false) $pass = NULL; $options = array(PDO::ATTR_PERSISTENT => TRUE); - parent::__construct(getenv("PDOTEST_DSN"), getenv("PDOTEST_USER"), getenv("PDOTEST_PASS"), $options); + + parent::__construct($dsn, $user, $pass, $options); } var $bar = array(); diff --git a/hphp/test/zend/bad/ext-pdo/bug_38253.php.expectf b/hphp/test/zend/bad/ext-pdo/bug_38253.php.expectf index 1291f67a5..37a27ab78 100644 --- a/hphp/test/zend/bad/ext-pdo/bug_38253.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/bug_38253.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s array(0) { } -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s array(0) { } \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo/bug_43130.php.expectf b/hphp/test/zend/bad/ext-pdo/bug_43130.php.expectf index fee494fa0..97450ca6a 100644 --- a/hphp/test/zend/bad/ext-pdo/bug_43130.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/bug_43130.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo/bug_44173.php.expectf b/hphp/test/zend/bad/ext-pdo/bug_44173.php.expectf index cb1612d2f..a85dbe123 100644 --- a/hphp/test/zend/bad/ext-pdo/bug_44173.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/bug_44173.php.expectf @@ -1,14 +1,14 @@ -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo/pdo_025.php.expectf b/hphp/test/zend/bad/ext-pdo/pdo_025.php.expectf index 9ecb0968f..d4446911e 100644 --- a/hphp/test/zend/bad/ext-pdo/pdo_025.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/pdo_025.php.expectf @@ -47,4 +47,4 @@ object(Test)#%d (3) { string(3) "kji" } ===FAIL=== -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo/pdo_034.php.expectf b/hphp/test/zend/bad/ext-pdo/pdo_034.php.expectf index d53146453..9bad35f63 100644 --- a/hphp/test/zend/bad/ext-pdo/pdo_034.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/pdo_034.php.expectf @@ -14,8 +14,8 @@ array(5) { ["test4"]=> string(1) "4" } -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) array(5) { ["test0"]=> diff --git a/hphp/test/zend/bad/ext-pdo/pdo_036.php b/hphp/test/zend/bad/ext-pdo/pdo_036.php index 3bbc06792..f7bec7d6d 100644 --- a/hphp/test/zend/bad/ext-pdo/pdo_036.php +++ b/hphp/test/zend/bad/ext-pdo/pdo_036.php @@ -1,11 +1,11 @@ newInstance(); -var_dump($x); - $instance = new reflectionclass('pdostatement'); $x = $instance->newInstance(); var_dump($x); +$instance = new reflectionclass('pdorow'); +$x = $instance->newInstance(); +var_dump($x); + ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo/pdo_036.php.expectf b/hphp/test/zend/bad/ext-pdo/pdo_036.php.expectf index ce7d34f12..ee2ee7755 100644 --- a/hphp/test/zend/bad/ext-pdo/pdo_036.php.expectf +++ b/hphp/test/zend/bad/ext-pdo/pdo_036.php.expectf @@ -1,6 +1,5 @@ -object(PDORow)#%d (0) { -} object(PDOStatement)#%d (1) { [%u|b%"queryString"]=> NULL -} \ No newline at end of file +} +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug44327.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug44327.php.expectf index 733b77230..d14cd38f6 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug44327.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug44327.php.expectf @@ -16,5 +16,5 @@ object(PDORow)#%d (2) { } %unicode|string%(19) "SELECT id FROM test" ---------------------------------- -HipHop Notice: %a +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug53551.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug53551.php.expectf index 9bd6e5f9a..6765056ec 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug53551.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug53551.php.expectf @@ -1,5 +1,5 @@ 1 -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> string(5) "23000" @@ -9,7 +9,7 @@ array(3) { string(29) "Column 'count' cannot be null" } 2 -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> string(5) "23000" diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug54929.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug54929.php.expectf index fdbb67424..dbec3f415 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug54929.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug54929.php.expectf @@ -6,7 +6,7 @@ array(1) { ["f1"]=> string(3) "foo" } -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> string(5) "42000" diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php b/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php new file mode 100644 index 000000000..f92213c79 --- /dev/null +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php @@ -0,0 +1,28 @@ +db = new PDO2(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true)); + } else { + $this->db = new PDO3(PDO_MYSQL_TEST_DSN, PDO_MYSQL_TEST_USER, PDO_MYSQL_TEST_PASS, array(PDO::ATTR_PERSISTENT => true)); + } + $this->db->query('SELECT 1')->fetchAll(); + } +} + +$a = new ModelA(true); +$b = new ModelA(false); + +var_dump($a); +var_dump($b); \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php.expectf new file mode 100644 index 000000000..a8301444d --- /dev/null +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug63176.php.expectf @@ -0,0 +1,16 @@ +bool(true) +bool(false) +object(ModelA)#%d (1) { + ["db"]=> + object(PDO2)#%d (1) { + ["transLevel":protected]=> + NULL + } +} +object(ModelA)#%d (1) { + ["db"]=> + object(PDO2)#%d (1) { + ["transLevel":protected]=> + NULL + } +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug_37445.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug_37445.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug_37445.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug_37445.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug_41125.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug_41125.php.expectf index 4ec83465c..6feaed731 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug_41125.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug_41125.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s array(0) { } done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/bug_42499.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/bug_42499.php.expectf index 652db783c..386007135 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/bug_42499.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/bug_42499.php.expectf @@ -6,7 +6,7 @@ array(1) { %unicode|string%(1) "a" } } -HipHop Warning: %a +HipHop Warning: %s Native Prepared Statements... array(1) { [0]=> @@ -15,5 +15,5 @@ array(1) { %unicode|string%(1) "a" } } -HipHop Warning: %a +HipHop Warning: %s done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_options.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_options.php.expectf index 4cb83591a..5f786539c 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_options.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_options.php.expectf @@ -1,13 +1,13 @@ [003] [TODO][CHANGEREQUEST] Please, lets not ignore invalid options and bail out! [003a] Expecting default value for 'PDO::ATTR_EMULATE_PREPARES' of '1'/integer, getAttribute() reports setting ''/boolean [003a] Expecting default value for 'PDO::MYSQL_ATTR_INIT_COMMAND' of ''/string, getAttribute() reports setting ''/boolean -HipHop Warning: %a +HipHop Warning: %s [010] [TODO][CHANGEREQUEST] ATTR_EMULATE_PREPARES should be on -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s [015] PDO::ATTR_EMULATE_PREPARES should be on [016] PDO::MYSQL_ATTR_DIRECT_QUERY should be on -HipHop Warning: %a +HipHop Warning: %s [018] PDO::MYSQL_ATTR_DIRECT_QUERY should be off [021] Execting '1'/boolean got ''/boolean' for options 'PDO::MYSQL_ATTR_LOCAL_INFILE' [023] Execting 'SET @a=1'/string got ''/boolean' for options 'PDO::MYSQL_ATTR_INIT_COMMAND' diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_uri.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_uri.php.expectf index e30b276cd..9718509fd 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_uri.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql___construct_uri.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s [002] URI=uri:file:%spdomuri.tst, DSN=mysql%sdbname=%s, File=%spdomuri.tst (%d bytes, 'mysql%sdbname=%s'), invalid data source URI -HipHop Warning: %a +HipHop Warning: %s [003] URI=uri:file:%spdomuri.tst, DSN=mysql%sdbname=%s, File=%spdomuri.tst (%d bytes, 'mysql%sdbname=letshopeinvalid%s'), chr(0) test, invalid data source URI done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_prefetch.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_prefetch.php.expectf index a0782176f..cfa02de58 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_prefetch.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_prefetch.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_statement_class.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_statement_class.php.expectf index 78533e354..c8a6244a5 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_statement_class.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_attr_statement_class.php.expectf @@ -2,12 +2,12 @@ array(1) { [0]=> %unicode|string%(12) "PDOStatement" } -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 array(2) { [0]=> %unicode|string%(12) "mystatement4" @@ -35,4 +35,4 @@ array(1) { %unicode|string%(1) "a" } } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_class_constants.php b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_class_constants.php index 39c234ae5..e67c17a14 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_class_constants.php +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_class_constants.php @@ -22,6 +22,19 @@ $expected['MYSQL_ATTR_READ_DEFAULT_GROUP'] = true; } + if (extension_loaded('mysqlnd')) { + $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; + } else if (extension_loaded('mysqli')) { + if (mysqli_get_client_version() > 50605) { + $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; + } + } else if (MySQLPDOTest::getClientVersion(MySQLPDOTest::factory()) > 50605) { + /* XXX the MySQL client library version isn't exposed with any + constants, the single possibility is to use the PDO::getAttribute(). + This however will fail with no connection. */ + $expected['MYSQL_ATTR_SERVER_PUBLIC_KEY'] = true; + } + /* TODO diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_commit.php b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_commit.php index de0e0080a..9cfb463b7 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_commit.php +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_commit.php @@ -66,7 +66,8 @@ $db->errorCode(), implode(' ', $db->errorInfo())); } - print "done!"; +exec('DROP TABLE IF EXISTS test_commit'); diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec.php.expectf index 8246f8848..20870212b 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s [016] [42000] 42000 1064 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'THIS IS NOT VALID SQL, I HOPE' at line %d [035] With emulated PS it works but makes no sense given that exec() returns sort of affected rows... done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec_ddl.php b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec_ddl.php index c9dba1677..be2163633 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec_ddl.php +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_exec_ddl.php @@ -67,7 +67,8 @@ $db->errorCode(), implode(' ', $db->errorInfo())); } - print "done!"; + 'HY093', 1 => NULL, @@ -7,8 +7,8 @@ HipHop Warning: %a array(0) { } now the same with emulated PS -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s [005] Execute has failed, 'HY093' array ( 0 => 'HY093', 1 => NULL, diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_load_data.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_load_data.php.expectf index 3913104a6..e0cefa793 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_load_data.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_load_data.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s [004] [0] array ( 0 => 'HY000', 1 => %d, diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_clear_error.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_clear_error.php.expectf index 3f3c3a2e2..6b201125c 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_clear_error.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_clear_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s [003] Execute has failed, '42S22' array ( 0 => '42S22', 1 => 1054, @@ -13,5 +13,5 @@ array(1) { string(4) "row1" } } -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_column.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_column.php.expectf index 7848e6536..1d55ca588 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_column.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_column.php.expectf @@ -5,7 +5,7 @@ array(1) { string(2) "id" } } -HipHop Warning: %a +HipHop Warning: %s array(0) { } done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_dup_named_placeholder.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_dup_named_placeholder.php.expectf index 217eec09b..01c6a33b1 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_dup_named_placeholder.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_dup_named_placeholder.php.expectf @@ -1,5 +1,5 @@ Native... -HipHop Warning: %a +HipHop Warning: %s [003] Execute has failed, 'HY093' array ( 0 => 'HY093', 1 => NULL, @@ -29,7 +29,7 @@ array(1) { } } Native... -HipHop Warning: %a +HipHop Warning: %s [008] Execute has failed, 'HY093' array ( 0 => 'HY093', 1 => NULL, diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_mixed_style.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_mixed_style.php.expectf index 97a857da0..d31a9d98c 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_mixed_style.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_prepare_native_mixed_style.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_closecursor.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_closecursor.php.expectf index 3dbd9a048..a7e169080 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_closecursor.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_closecursor.php.expectf @@ -1,19 +1,19 @@ Testing emulated PS... Buffered... -HipHop Warning: %a +HipHop Warning: %s in = 0 -> id = 1 (integer) / label = 'a' (string) in = 0 -> id = 2 (integer) / label = 'b' (string) Unbuffered... -HipHop Warning: %a +HipHop Warning: %s in = 0 -> id = 1 (integer) / label = 'a' (string) in = 0 -> id = 2 (integer) / label = 'b' (string) Testing native PS... Buffered... -HipHop Warning: %a +HipHop Warning: %s in = 0 -> id = 1 (integer) / label = 'a' (string) in = 0 -> id = 2 (integer) / label = 'b' (string) Unbuffered... -HipHop Warning: %a +HipHop Warning: %s in = 0 -> id = 1 (integer) / label = 'a' (string) in = 0 -> id = 2 (integer) / label = 'b' (string) done! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorcode.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorcode.php.expectf index 192e3574d..75c51f6b4 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorcode.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorcode.php.expectf @@ -1,6 +1,6 @@ Testing emulated PS... -HipHop Warning: %a +HipHop Warning: %s string(5) "42S02" Testing native PS... -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorinfo.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorinfo.php.expectf index 08c1404c1..a083c197e 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorinfo.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_errorinfo.php.expectf @@ -7,7 +7,7 @@ array(3) { [2]=> NULL } -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> %unicode|string%(5) "42S02" @@ -16,7 +16,7 @@ array(3) { [2]=> %unicode|string%(%d) "Table '%s.ihopeitdoesnotexist' doesn't exist" } -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -35,7 +35,7 @@ array(3) { NULL } Testing native PS... -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -45,7 +45,7 @@ array(3) { [2]=> NULL } -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> %unicode|string%(5) "42S02" diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_getcolumnmeta.php b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_getcolumnmeta.php index 624ee21b3..893bbc5e8 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_getcolumnmeta.php +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_getcolumnmeta.php @@ -132,9 +132,9 @@ try { $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false); $is_mysqlnd = MySQLPDOTest::isPDOMySQLnd(); - test_meta($db, 20, 'BIT(8)', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); - test_meta($db, 30, 'TINYINT', -127, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); - test_meta($db, 40, 'TINYINT UNSIGNED', 255, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); + test_meta($db, 20, 'BIT(8)', 1, 'BIT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); + test_meta($db, 30, 'TINYINT', -127, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); + test_meta($db, 40, 'TINYINT UNSIGNED', 255, 'TINY', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); test_meta($db, 50, 'BOOLEAN', 1, NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); test_meta($db, 60, 'SMALLINT', -32768, 'SHORT', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); @@ -178,7 +178,7 @@ try { test_meta($db, 340, 'TIME', '14:37:00', 'TIME', PDO::PARAM_STR); test_meta($db, 350, 'TIMESTAMP', time(), 'TIMESTAMP', PDO::PARAM_STR); test_meta($db, 360, 'DATETIME', '2008-03-23 14:38:00', 'DATETIME', PDO::PARAM_STR); - test_meta($db, 370, 'YEAR', '2008', NULL, ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); + test_meta($db, 370, 'YEAR', '2008', 'YEAR', ($is_mysqlnd) ? PDO::PARAM_INT : PDO::PARAM_STR); test_meta($db, 380, 'CHAR(1)', 'a', 'STRING', PDO::PARAM_STR); test_meta($db, 390, 'CHAR(10)', '0123456789', 'STRING', PDO::PARAM_STR); diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_multiquery.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_multiquery.php.expectf index e8416c2d7..cbc5026b4 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_multiquery.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_multiquery.php.expectf @@ -37,5 +37,5 @@ array(1) { } } Native Prepared Statements... -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_unbuffered_2050.php.expectf b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_unbuffered_2050.php.expectf index aa5b50cc8..50297aa91 100644 --- a/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_unbuffered_2050.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_mysql/pdo_mysql_stmt_unbuffered_2050.php.expectf @@ -19,10 +19,10 @@ array(1) { } } Unbuffered... -HipHop Warning: %a +HipHop Warning: %s array(0) { } -HipHop Warning: %a +HipHop Warning: %s array(0) { } array(1) { diff --git a/hphp/test/zend/bad/ext-pdo_sqlite/bug43831.php.expectf b/hphp/test/zend/bad/ext-pdo_sqlite/bug43831.php.expectf index 4c5276ac3..14c9c7381 100644 --- a/hphp/test/zend/bad/ext-pdo_sqlite/bug43831.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_sqlite/bug43831.php.expectf @@ -4,5 +4,5 @@ object(MyPDO)#%d (0) { } object(MyPDO)#%d (0) { } -HipHop Notice: %a +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_sqlite/pdo_fetch_func_001.php.expectf b/hphp/test/zend/bad/ext-pdo_sqlite/pdo_fetch_func_001.php.expectf index 41d9f7f7f..b656d31f6 100644 --- a/hphp/test/zend/bad/ext-pdo_sqlite/pdo_fetch_func_001.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_sqlite/pdo_fetch_func_001.php.expectf @@ -14,15 +14,15 @@ array(2) { [1]=> %string|unicode%(0) "" } -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) array(2) { [0]=> @@ -36,7 +36,7 @@ array(2) { [1]=> %string|unicode%(4) "2---" } -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -44,5 +44,5 @@ array(2) { [1]=> %string|unicode%(4) "2===" } -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pdo_sqlite/pdo_sqlite_createaggregate_002.php.expectf b/hphp/test/zend/bad/ext-pdo_sqlite/pdo_sqlite_createaggregate_002.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/bad/ext-pdo_sqlite/pdo_sqlite_createaggregate_002.php.expectf +++ b/hphp/test/zend/bad/ext-pdo_sqlite/pdo_sqlite_createaggregate_002.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/10pg_convert_85.php b/hphp/test/zend/bad/ext-pgsql/10pg_convert_85.php index 85dedb760..76588472a 100644 --- a/hphp/test/zend/bad/ext-pgsql/10pg_convert_85.php +++ b/hphp/test/zend/bad/ext-pgsql/10pg_convert_85.php @@ -4,6 +4,7 @@ error_reporting(E_ALL); include 'config.inc'; $db = pg_connect($conn_str); +pg_query($db, "SET standard_conforming_strings = 0"); $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB'); $converted = pg_convert($db, $table_name, $fields); diff --git a/hphp/test/zend/bad/ext-pgsql/12pg_insert_85.php b/hphp/test/zend/bad/ext-pgsql/12pg_insert_85.php index 600ea259d..fd74f29e4 100644 --- a/hphp/test/zend/bad/ext-pgsql/12pg_insert_85.php +++ b/hphp/test/zend/bad/ext-pgsql/12pg_insert_85.php @@ -4,6 +4,8 @@ error_reporting(E_ALL); include 'config.inc'; $db = pg_connect($conn_str); +pg_query($db, "SET standard_conforming_strings = 0"); + $fields = array('num'=>'1234', 'str'=>'AAA', 'bin'=>'BBB'); pg_insert($db, $table_name, $fields) or print "Error in test 1\n"; diff --git a/hphp/test/zend/bad/ext-pgsql/14pg_update_85.php b/hphp/test/zend/bad/ext-pgsql/14pg_update_85.php index d44bef3ba..736b3cce5 100644 --- a/hphp/test/zend/bad/ext-pgsql/14pg_update_85.php +++ b/hphp/test/zend/bad/ext-pgsql/14pg_update_85.php @@ -4,6 +4,8 @@ error_reporting(E_ALL); include 'config.inc'; $db = pg_connect($conn_str); +pg_query($db, "SET standard_conforming_strings = 0"); + $fields = array('num'=>'1234', 'str'=>'ABC', 'bin'=>'XYZ'); $ids = array('num'=>'1234'); diff --git a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea.php b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea.php index cf9dbaa80..16123adda 100644 --- a/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea.php +++ b/hphp/test/zend/bad/ext-pgsql/18pg_escape_bytea.php @@ -3,10 +3,11 @@ include('config.inc'); +$db = pg_connect($conn_str); + $image = file_get_contents(dirname(__FILE__) . '/php.gif'); $esc_image = pg_escape_bytea($image); -$db = pg_connect($conn_str); pg_query($db, 'INSERT INTO '.$table_name.' (num, bin) VALUES (9876, \''.$esc_image.'\');'); $result = pg_query($db, 'SELECT * FROM '.$table_name.' WHERE num = 9876'); $rows = pg_fetch_all($result); diff --git a/hphp/test/zend/bad/ext-pgsql/80_bug36625.php b/hphp/test/zend/bad/ext-pgsql/80_bug36625.php index ba4e2d238..247a1963a 100644 --- a/hphp/test/zend/bad/ext-pgsql/80_bug36625.php +++ b/hphp/test/zend/bad/ext-pgsql/80_bug36625.php @@ -31,4 +31,5 @@ var_dump($found > 0); var_dump(file_exists($tracefile)); ?> -===DONE=== \ No newline at end of file +===DONE===?> + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/bug46408.php b/hphp/test/zend/bad/ext-pgsql/bug46408.php new file mode 100644 index 000000000..7661f1234 --- /dev/null +++ b/hphp/test/zend/bad/ext-pgsql/bug46408.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/bug46408.php.expectf b/hphp/test/zend/bad/ext-pgsql/bug46408.php.expectf new file mode 100644 index 000000000..c67dbfb9b --- /dev/null +++ b/hphp/test/zend/bad/ext-pgsql/bug46408.php.expectf @@ -0,0 +1,2 @@ +3,5 +Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/bug60244.php.expectf b/hphp/test/zend/bad/ext-pgsql/bug60244.php.expectf index 1d9d31874..97fe99e84 100644 --- a/hphp/test/zend/bad/ext-pgsql/bug60244.php.expectf +++ b/hphp/test/zend/bad/ext-pgsql/bug60244.php.expectf @@ -1,10 +1,10 @@ -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) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-pgsql/bug64609.php b/hphp/test/zend/bad/ext-pgsql/bug64609.php new file mode 100644 index 000000000..ffcd4ac0f --- /dev/null +++ b/hphp/test/zend/bad/ext-pgsql/bug64609.php @@ -0,0 +1,17 @@ + 'ok'); +$converted = pg_convert($db, 'test_enum', $fields); + +pg_query("ROLLBACK"); + +var_dump($converted); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/bug64609.php.expectf b/hphp/test/zend/bad/ext-pgsql/bug64609.php.expectf new file mode 100644 index 000000000..8a55e7c3e --- /dev/null +++ b/hphp/test/zend/bad/ext-pgsql/bug64609.php.expectf @@ -0,0 +1,4 @@ +array(1) { + ["a"]=> + string(4) "'ok'" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/pg_delete_001.php.expectf b/hphp/test/zend/bad/ext-pgsql/pg_delete_001.php.expectf index ed22e2afa..ac60a4757 100644 --- a/hphp/test/zend/bad/ext-pgsql/pg_delete_001.php.expectf +++ b/hphp/test/zend/bad/ext-pgsql/pg_delete_001.php.expectf @@ -32,6 +32,6 @@ array(2) { string(1) "2" } } -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pgsql/pg_insert_001.php.expectf b/hphp/test/zend/bad/ext-pgsql/pg_insert_001.php.expectf index 3f5e02370..1ac2c583c 100644 --- a/hphp/test/zend/bad/ext-pgsql/pg_insert_001.php.expectf +++ b/hphp/test/zend/bad/ext-pgsql/pg_insert_001.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s string(47) "INSERT INTO phptests.foo (id,id2) VALUES (1,2);" array(1) { [0]=> diff --git a/hphp/test/zend/bad/ext-pgsql/pg_select_001.php.expectf b/hphp/test/zend/bad/ext-pgsql/pg_select_001.php.expectf index 5c5fa3064..d2f17ec72 100644 --- a/hphp/test/zend/bad/ext-pgsql/pg_select_001.php.expectf +++ b/hphp/test/zend/bad/ext-pgsql/pg_select_001.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) array(1) { [0]=> @@ -9,7 +9,7 @@ array(1) { string(1) "2" } } -HipHop Notice: %a +HipHop Notice: %s bool(false) array(1) { [0]=> diff --git a/hphp/test/zend/bad/ext-posix/posix_access.php b/hphp/test/zend/bad/ext-posix/posix_access.php index d883d303b..ad410a319 100644 --- a/hphp/test/zend/bad/ext-posix/posix_access.php +++ b/hphp/test/zend/bad/ext-posix/posix_access.php @@ -16,7 +16,8 @@ var_dump(posix_access($filename, POSIX_W_OK)); chmod ($filename, 0700); var_dump(posix_access($filename, POSIX_X_OK)); ?> -===DONE=== + -===DONE=== + -===DONE=== + -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/017.php.expectf b/hphp/test/zend/bad/ext-simplexml/017.php.expectf index e6eb06319..c9428855c 100644 --- a/hphp/test/zend/bad/ext-simplexml/017.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/017.php.expectf @@ -20,8 +20,8 @@ person: Joe child: Ann child: person: -HipHop Notice: %a +HipHop Notice: %s child: -HipHop Notice: %a +HipHop Notice: %s child: ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/027.php.expectf b/hphp/test/zend/bad/ext-simplexml/027.php.expectf index 2da8baa19..dd632ad1c 100644 --- a/hphp/test/zend/bad/ext-simplexml/027.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/027.php.expectf @@ -14,7 +14,7 @@ Joe -HipHop Warning: %a +HipHop Warning: %s Jane diff --git a/hphp/test/zend/bad/ext-simplexml/bug37076_1.php.expectf b/hphp/test/zend/bad/ext-simplexml/bug37076_1.php.expectf index 44c7ac544..3a822a92e 100644 --- a/hphp/test/zend/bad/ext-simplexml/bug37076_1.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/bug37076_1.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/bug38347.php.expectf b/hphp/test/zend/bad/ext-simplexml/bug38347.php.expectf index 18e3f5091..9bb74c8b1 100644 --- a/hphp/test/zend/bad/ext-simplexml/bug38347.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/bug38347.php.expectf @@ -1,5 +1,5 @@ SimpleXMLElement Object ( ) -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/bug38406.php.expectf b/hphp/test/zend/bad/ext-simplexml/bug38406.php.expectf index 26374e303..4054bae16 100644 --- a/hphp/test/zend/bad/ext-simplexml/bug38406.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/bug38406.php.expectf @@ -6,6 +6,6 @@ object(SimpleXMLElement)#%d (1) { [0]=> string(9) "something" } -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/bug43221.php.expectf b/hphp/test/zend/bad/ext-simplexml/bug43221.php.expectf index bb3dd5836..3c10a04d1 100644 --- a/hphp/test/zend/bad/ext-simplexml/bug43221.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/bug43221.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s value ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-simplexml/bug51615.php.expectf b/hphp/test/zend/bad/ext-simplexml/bug51615.php.expectf index ac4da9b9a..9b3868af7 100644 --- a/hphp/test/zend/bad/ext-simplexml/bug51615.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/bug51615.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s object(SimpleXMLElement)#%d (3) { ["@attributes"]=> array(2) { diff --git a/hphp/test/zend/bad/ext-simplexml/sxe_003.php.expectf b/hphp/test/zend/bad/ext-simplexml/sxe_003.php.expectf index d2dd30893..654948332 100644 --- a/hphp/test/zend/bad/ext-simplexml/sxe_003.php.expectf +++ b/hphp/test/zend/bad/ext-simplexml/sxe_003.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s ===RESET=== bool(true) string(5) "elem1" diff --git a/hphp/test/zend/bad/ext-soap-bugs/bug31755.php.expectf b/hphp/test/zend/bad/ext-soap-bugs/bug31755.php.expectf index a92b26830..e44136d6b 100644 --- a/hphp/test/zend/bad/ext-soap-bugs/bug31755.php.expectf +++ b/hphp/test/zend/bad/ext-soap-bugs/bug31755.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-soap-bugs/bug34657.php.expectf b/hphp/test/zend/bad/ext-soap-bugs/bug34657.php.expectf index 08d1d97ea..0ef00eef7 100644 --- a/hphp/test/zend/bad/ext-soap-bugs/bug34657.php.expectf +++ b/hphp/test/zend/bad/ext-soap-bugs/bug34657.php.expectf @@ -1,6 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a SoapFault -SOAP-ERROR: Parsing WSDL: Couldn't load from 'http://i_dont_exist.com/some.wsdl'%S +SOAP-ERROR: Parsing WSDL: Couldn't load from 'http://i_dont_exist.com/some.wsdl'%A ok \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-soap-bugs/bug47273.php b/hphp/test/zend/bad/ext-soap-bugs/bug47273.php new file mode 100644 index 000000000..b429e5934 --- /dev/null +++ b/hphp/test/zend/bad/ext-soap-bugs/bug47273.php @@ -0,0 +1,39 @@ + + +EOF; +$request2 = << + +EOF; + +class SoapFaultTest +{ + public function test1() { + // Test #1 + return 'Test #1 exception with some special chars: Äßö'; + } + public function test2() { + // Test #2 + //throw new SoapFault('Server', 'Test #2 exception with some special chars: Äßö'); + throw new Exception('Test #2 exception with some special chars: Äßö'); + } +} + +$server = new SoapServer(null, array( +'uri' => "http://127.0.0.1:8080/test/", +'encoding' => 'ISO-8859-1')); +$server->setClass('SoapFaultTest'); + +try { + $server->handle($request1); +} catch (Exception $e) { + $server->fault("Sender", $e->getMessage()); +} +try { + $server->handle($request2); +} catch (Exception $e) { + $server->fault("Sender", $e->getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-soap-bugs/bug47273.php.expectf b/hphp/test/zend/bad/ext-soap-bugs/bug47273.php.expectf new file mode 100644 index 000000000..e3a5b6057 --- /dev/null +++ b/hphp/test/zend/bad/ext-soap-bugs/bug47273.php.expectf @@ -0,0 +1,4 @@ + +Test #1 exception with some special chars: Äßö + +SenderTest #2 exception with some special chars: Äßö \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-soap-bugs/bug54911.php.expectf b/hphp/test/zend/bad/ext-soap-bugs/bug54911.php.expectf index 4c8a720d6..2d0b93776 100644 --- a/hphp/test/zend/bad/ext-soap-bugs/bug54911.php.expectf +++ b/hphp/test/zend/bad/ext-soap-bugs/bug54911.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %sbug54911.php(4): XSoapClient::__doRequest() #1 [internal function]: XSoapClient->__doRequest(' ", $_POST); +$_REQUEST = array_merge($_REQUEST, $_POST); echo "INPUT: \n"; diff --git a/hphp/test/zend/bad/ext-sockets/mcast_ipv4_send_error.php.expectf b/hphp/test/zend/bad/ext-sockets/mcast_ipv4_send_error.php.expectf index b0bd52261..447a5176e 100644 --- a/hphp/test/zend/bad/ext-sockets/mcast_ipv4_send_error.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/mcast_ipv4_send_error.php.expectf @@ -7,7 +7,7 @@ bool(true) int(0) Setting IP_MULTICAST_TTL with 256 -HipHop Warning: %a +HipHop Warning: %s bool(false) int(1) @@ -16,6 +16,6 @@ bool(true) int(254) Setting IP_MULTICAST_TTL with -1 -HipHop Warning: %a +HipHop Warning: %s bool(false) int(254) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_accept-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_accept-wrongparams.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_accept-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_accept-wrongparams.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_cmsg_credentials.php b/hphp/test/zend/bad/ext-sockets/socket_cmsg_credentials.php new file mode 100644 index 000000000..e632515d8 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_cmsg_credentials.php @@ -0,0 +1,41 @@ + ["test ", "thing", "\n"], +//], 0); +$r = socket_sendto($sends1, $msg = "dread", strlen($msg), 0, $path); +var_dump($r); +checktimeout($s, 500); + +$data = [ + "name" => [], + "buffer_size" => 2000, + "controllen" => socket_cmsg_space(SOL_SOCKET, SCM_CREDENTIALS) +]; +if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); +print_r($data); + +$pid = getmypid(); +var_dump($data['control'][0]['data']['pid'] === $pid); +?> + + [control] => Array + ( + [0] => Array + ( + [level] => %d + [type] => %d + [data] => Array + ( + [pid] => %d + [uid] => %d + [gid] => %d + ) + + ) + + ) + + [iov] => Array + ( + [0] => dread + ) + + [flags] => 0 +) +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php b/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php new file mode 100644 index 000000000..ab9d2dfa6 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_cmsg_rights.php @@ -0,0 +1,43 @@ + [ "path" => $path ], + "iov" => ["test ", "thing", "\n"], + "control" => [ + [ + "level" => SOL_SOCKET, + "type" => SCM_RIGHTS, + "data" => [$sends1, STDIN, STDOUT, STDERR], + ] + ] +], 0); +var_dump($r); +checktimeout($s, 500); + +$data = [ + "name" => [], + "buffer_size" => 2000, + "controllen" => socket_cmsg_space(SOL_SOCKET, SCM_RIGHTS, 3) +]; +var_dump($data); +if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); +print_r($data);?> + + array(0) { + } + ["buffer_size"]=> + int(2000) + ["controllen"]=> + int(32) +} +Array +( + [name] => + [control] => Array + ( + [0] => Array + ( + [level] => %d + [type] => %d + [data] => Array + ( + [0] => Resource id #%d + [1] => Resource id #%d + [2] => Resource id #%d + ) + + ) + + ) + + [iov] => Array + ( + [0] => test thing + + ) + + [flags] => 0 +) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_connect_params.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_connect_params.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_connect_params.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_connect_params.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php.expectf deleted file mode 100644 index cfb6a8593..000000000 --- a/hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php.expectf +++ /dev/null @@ -1 +0,0 @@ -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_listen-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_listen-wrongparams.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_listen-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_create_listen-wrongparams.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_listen_params.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_listen_params.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_listen_params.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_create_listen_params.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_listen_used.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_listen_used.php.expectf index 1a03501da..b1b13579e 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_listen_used.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_create_listen_used.php.expectf @@ -1,4 +1,4 @@ resource(%i) of type (Socket) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams-win32.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams-win32.php.expectf index 88b867944..d8391d726 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams-win32.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams-win32.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams.php.expectf index 5f99194e1..c9e1ae1a6 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_create_pair-wrongparams.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_import_stream-2.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_import_stream-2.php.expectf index 9fea912da..b31df3998 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_import_stream-2.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_import_stream-2.php.expectf @@ -1,17 +1,17 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (stream) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_import_stream-4-win.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_import_stream-4-win.php.expectf index 3e00c77b2..c02d9c523 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_import_stream-4-win.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_import_stream-4-win.php.expectf @@ -15,27 +15,27 @@ stream_set_blocking 1 close stream stream_set_blocking -HipHop Warning: %a +HipHop Warning: %s socket_set_block -HipHop Warning: %a +HipHop Warning: %s in %ssocket_import_stream-4-win.php on line %d socket_get_option -HipHop Warning: %a +HipHop Warning: %s in %ssocket_import_stream-4-win.php on line %d close socket stream_set_blocking -HipHop Warning: %a +HipHop Warning: %s socket_set_block -HipHop Warning: %a +HipHop Warning: %s socket_get_option -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_import_stream-4.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_import_stream-4.php.expectf index 57548b4d5..5a785dfe3 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_import_stream-4.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_import_stream-4.php.expectf @@ -15,25 +15,25 @@ stream_set_blocking 1 close stream stream_set_blocking -HipHop Warning: %a +HipHop Warning: %s socket_set_block -HipHop Warning: %a +HipHop Warning: %s socket_get_option -HipHop Warning: %a +HipHop Warning: %s close socket stream_set_blocking -HipHop Warning: %a +HipHop Warning: %s socket_set_block -HipHop Warning: %a +HipHop Warning: %s socket_get_option -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_listen-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_listen-wrongparams.php.expectf index 24d4d1e18..d38e14d17 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_listen-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_listen-wrongparams.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php b/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php new file mode 100644 index 000000000..d2a394b03 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php @@ -0,0 +1,31 @@ + ["family" => AF_INET6, "addr" => "::1"], + "buffer_size" => 2000, + "controllen" => socket_cmsg_space(IPPROTO_IPV6, IPV6_PKTINFO), +]; +if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); +print_r($data); diff --git a/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php.expectf new file mode 100644 index 000000000..1291c9d44 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_recvmsg.php.expectf @@ -0,0 +1,41 @@ +creating send socket +resource(%d) of type (Socket) +bool(true) +creating receive socket +resource(%d) of type (Socket) +bool(true) +int(14) +Array +( + [name] => Array + ( + [family] => %d + [addr] => ::1 + [port] => 7001 + [flowinfo] => 0 + [scope_id] => 0 + ) + + [control] => Array + ( + [0] => Array + ( + [level] => %d + [type] => %d + [data] => Array + ( + [addr] => ::1 + [ifindex] => %d + ) + + ) + + ) + + [iov] => Array + ( + [0] => testing packet + ) + + [flags] => 0 +) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_select-wrongparams-2.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_select-wrongparams-2.php.expectf index 9bd47764a..337a4359e 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_select-wrongparams-2.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_select-wrongparams-2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php new file mode 100644 index 000000000..ced7f2688 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php @@ -0,0 +1,43 @@ + [ "addr" => "::1", "port" => 3000], + "iov" => ["test ", "thing", "\n"], + "control" => [[ + "level" => IPPROTO_IPV6, + "type" => IPV6_PKTINFO, + "data" => [ + 'addr' => '::1', + 'ifindex' => 1 /* we're assuming loopback is 1. Is this a safe assumption? */ + ], + ]] +], 0); +var_dump($r); +checktimeout($s, 500); + +$data = [ + "name" => ["family" => AF_INET6, "addr" => "::1"], + "buffer_size" => 2000, + "controllen" => socket_cmsg_space(IPPROTO_IPV6, IPV6_PKTINFO) + + socket_cmsg_space(IPPROTO_IPV6, IPV6_TCLASS), +]; +if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); +print_r($data); diff --git a/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php.expectf new file mode 100644 index 000000000..605815e57 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg-win32.php.expectf @@ -0,0 +1,49 @@ +creating send socket +resource(5) of type (Socket) +bool(true) +creating receive socket +resource(6) of type (Socket) +bool(true) +int(11) +Array +( + [name] => Array + ( + [family] => %d + [addr] => ::1 + [port] => 7001 + [flowinfo] => 0 + [scope_id] => 0 + ) + + [control] => Array + ( + [0] => Array + ( + [level] => %d + [type] => %d + [data] => Array + ( + [addr] => ::1 + [ifindex] => %d + ) + + ) + + [1] => Array + ( + [level] => %d + [type] => %d + [data] => 0 + ) + + ) + + [iov] => Array + ( + [0] => test thing + + ) + + [flags] => 0 +) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php new file mode 100644 index 000000000..b77182a08 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php @@ -0,0 +1,40 @@ + [ "addr" => "::1", "port" => 3000], + "iov" => ["test ", "thing", "\n"], + "control" => [[ + "level" => IPPROTO_IPV6, + "type" => IPV6_TCLASS, + "data" => 40, + ]] +], 0); +var_dump($r); +checktimeout($s, 500); + +$data = [ + "name" => ["family" => AF_INET6, "addr" => "::1"], + "buffer_size" => 2000, + "controllen" => socket_cmsg_space(IPPROTO_IPV6, IPV6_PKTINFO) + + socket_cmsg_space(IPPROTO_IPV6, IPV6_TCLASS), +]; +if (!socket_recvmsg($s, $data, 0)) die("recvmsg"); +print_r($data); diff --git a/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php.expectf new file mode 100644 index 000000000..b776b4d99 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_sendrecvmsg_multi_msg.php.expectf @@ -0,0 +1,49 @@ +creating send socket +resource(5) of type (Socket) +bool(true) +creating receive socket +resource(6) of type (Socket) +bool(true) +int(11) +Array +( + [name] => Array + ( + [family] => %d + [addr] => ::1 + [port] => 7001 + [flowinfo] => 0 + [scope_id] => 0 + ) + + [control] => Array + ( + [0] => Array + ( + [level] => %d + [type] => %d + [data] => Array + ( + [addr] => ::1 + [ifindex] => %d + ) + + ) + + [1] => Array + ( + [level] => %d + [type] => %d + [data] => 40 + ) + + ) + + [iov] => Array + ( + [0] => test thing + + ) + + [flags] => 0 +) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php index c84a11b48..597931e3f 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php @@ -6,12 +6,14 @@ if (!socket_set_nonblock($socket)) { die('Unable to set nonblocking mode for socket'); } - socket_recvfrom($socket, $buf, 12, 0, $from, $port); // cause warning + $address = '127.0.0.1'; socket_sendto($socket, '', 1, 0, $address); // cause warning if (!socket_bind($socket, $address, 1223)) { die("Unable to bind to $address:1223"); } + + var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); //false (EAGAIN - no warning) $msg = "Ping!"; $len = strlen($msg); diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php.expectf index e5300281a..5470a7c54 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv4_udp.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +bool(false) +HipHop Warning: %s +HipHop Warning: %s Received Ping! from remote address 127.0.0.1 and remote port 1223 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.php.expectf index 44ed1f4e7..0680bf94f 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp-win32.phpt on line %d -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s Received Ping! from remote address ::1 and remote port 1223 \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php index e67c722f5..a44ecfab7 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php @@ -6,7 +6,7 @@ if (!socket_set_nonblock($socket)) { die('Unable to set nonblocking mode for socket'); } - socket_recvfrom($socket, $buf, 12, 0, $from, $port); // cause warning + var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); // false (EAGAIN, no warning) $address = '::1'; socket_sendto($socket, '', 1, 0, $address); // cause warning if (!socket_bind($socket, $address, 1223)) { diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php.expectf index 5f53c89b6..e115fd7d5 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_ipv6_udp.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +bool(false) +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s Received Ping! from remote address ::1 and remote port 1223 \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sockets/socket_sentto_recvfrom_unix.php b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php similarity index 93% rename from hphp/test/zend/good/ext-sockets/socket_sentto_recvfrom_unix.php rename to hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php index 10aa383b4..e0aa3ec35 100644 --- a/hphp/test/zend/good/ext-sockets/socket_sentto_recvfrom_unix.php +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php @@ -7,7 +7,7 @@ if (!socket_set_nonblock($socket)) { die('Unable to set nonblocking mode for socket'); } - socket_recvfrom($socket, $buf, 12, 0, $from, $port); // cause warning + var_dump(socket_recvfrom($socket, $buf, 12, 0, $from, $port)); //false (EAGAIN, no warning) $address = sprintf("/tmp/%s.sock", uniqid()); if (!socket_bind($socket, $address)) { die("Unable to bind to $address"); diff --git a/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php.expectf new file mode 100644 index 000000000..8511bf74e --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_sentto_recvfrom_unix.php.expectf @@ -0,0 +1,5 @@ +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) +Received Ping! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_block-retval.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_block-retval.php.expectf index 085e32abc..fcf53043d 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_set_block-retval.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_set_block-retval.php.expectf @@ -1,3 +1,3 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_block-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_block-wrongparams.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_set_block-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_set_block-wrongparams.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-retval.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-retval.php.expectf index 085e32abc..fcf53043d 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-retval.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-retval.php.expectf @@ -1,3 +1,3 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-wrongparams.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-wrongparams.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-wrongparams.php.expectf +++ b/hphp/test/zend/bad/ext-sockets/socket_set_nonblock-wrongparams.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php b/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php new file mode 100644 index 000000000..54d774721 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php @@ -0,0 +1,13 @@ + '::1', + "ifindex" => 0 +])); +//Oddly, Linux does not support IPV6_PKTINFO in sockgetopt(). +//See do_ipv6_getsockopt() on the kernel sources +//A work-around with is sort-of possible (with IPV6_2292PKTOPTIONS), +//but not worth it +//var_dump(socket_get_option($s, IPPROTO_IPV6, IPV6_PKTINFO)); diff --git a/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php.expectf b/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php.expectf new file mode 100644 index 000000000..3cbbcaa90 --- /dev/null +++ b/hphp/test/zend/bad/ext-sockets/socket_set_option_in6_pktinfo.php.expectf @@ -0,0 +1,3 @@ +HipHop Warning: %s +bool(false) +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/ArrayObject_unserialize_empty_string.php.expectf b/hphp/test/zend/bad/ext-spl/ArrayObject_unserialize_empty_string.php.expectf index 249cadfa6..8c8eb0004 100644 --- a/hphp/test/zend/bad/ext-spl/ArrayObject_unserialize_empty_string.php.expectf +++ b/hphp/test/zend/bad/ext-spl/ArrayObject_unserialize_empty_string.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): ArrayObject->unserialize('') #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.php.expectf b/hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.php.expectf index a0b009124..ac1b7bfd1 100644 --- a/hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.php.expectf +++ b/hphp/test/zend/bad/ext-spl/DirectoryIterator_empty_constructor.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): DirectoryIterator->__construct('') #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/DirectoryIterator_getBasename_pass_array.php.expectf b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getBasename_pass_array.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/DirectoryIterator_getBasename_pass_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getBasename_pass_array.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/DirectoryIterator_getInode_error.php.expectf b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getInode_error.php.expectf index 685ea20ea..36519f4ac 100644 --- a/hphp/test/zend/bad/ext-spl/DirectoryIterator_getInode_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/DirectoryIterator_getInode_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplFileInfo->getInode() #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php new file mode 100644 index 000000000..4b73edbb9 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php @@ -0,0 +1,8 @@ +add(12,'Offset 12 should not exist')); +} catch (OutOfRangeException $e) { + echo "Exception: ".$e->getMessage()."\n"; +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php.expectf new file mode 100644 index 000000000..a425a9e66 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_invalid_offset.php.expectf @@ -0,0 +1 @@ +Exception: Offset invalid or out of range \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php new file mode 100644 index 000000000..f791a2b24 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php @@ -0,0 +1,4 @@ +add()); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter1.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php new file mode 100644 index 000000000..1174f7729 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php @@ -0,0 +1,4 @@ +add(2)); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_missing_parameter2.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php new file mode 100644 index 000000000..cde8202c3 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php @@ -0,0 +1,8 @@ +add(NULL,2)); +} catch (OutOfRangeException $e) { + echo "Exception: ".$e->getMessage()."\n"; +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php.expectf new file mode 100644 index 000000000..a425a9e66 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_add_null_offset.php.expectf @@ -0,0 +1 @@ +Exception: Offset invalid or out of range \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_array.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_array.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_array.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_float.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_float.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_float.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_float.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_integer.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_integer.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_integer.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_integer.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_null.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_null.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_null.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_bottom_pass_null.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count_param_SplDoublyLinkedList.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count_param_SplDoublyLinkedList.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count_param_SplDoublyLinkedList.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_count_param_SplDoublyLinkedList.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_getIteratorMode_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_getIteratorMode_error.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_getIteratorMode_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_getIteratorMode_error.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_empty-with-parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_empty-with-parameter.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_empty-with-parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_empty-with-parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_isEmpty_not-empty-with-parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetExists_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetExists_invalid_parameter.php.expectf index 5fa2682c1..fb941e588 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetExists_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetExists_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s PASS \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetGet_empty.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_empty.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetGet_empty.php rename to hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_empty.php diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_empty.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_empty.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_empty.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_missing_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_missing_param.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_missing_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_missing_param.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.php.expectf index 2fadda81d..0d63cf6ab 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_array.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.php.expectf index 2c969e6ce..0a0496da1 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetGet_param_string.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s #1 {main} diff --git a/hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php rename to hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php.expectf new file mode 100644 index 000000000..fb941e588 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_invalid_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +PASS \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php rename to hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php.expectf new file mode 100644 index 000000000..fb941e588 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_offsetSet_one_invalid_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +PASS \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_noParams.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_noParams.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_noParams.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_noParams.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_params.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_params.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_params.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_pop_params.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplDoublyLinkedList_push_missing_parameter.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_push_missing_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplDoublyLinkedList_push_missing_parameter.php rename to hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_push_missing_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_push_missing_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_push_missing_parameter.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_push_missing_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_setIteratorMode_param_SplDoublyLinkedList.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_array.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_array.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_array.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_float.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_float.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_float.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_float.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_integer.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_integer.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_integer.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_integer.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_null.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_null.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_null.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_top_pass_null.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php rename to hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplDoublyLinkedList_unshift_missing_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileInfo_getGroup_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileInfo_getGroup_error.php.expectf index 3e5b61f05..6c494ab31 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileInfo_getGroup_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileInfo_getGroup_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplFileInfo->getGroup() #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplFileInfo_getInode_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileInfo_getInode_error.php.expectf index f4e2ccfa3..aa30a0f0f 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileInfo_getInode_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileInfo_getInode_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplFileInfo->getInode() #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplFileInfo_getOwner_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileInfo_getOwner_error.php.expectf index 6d4dc084c..95735f86e 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileInfo_getOwner_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileInfo_getOwner_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplFileInfo->getOwner() #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplFileInfo_getPerms_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileInfo_getPerms_error.php.expectf index 68cafee19..c36e5dc48 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileInfo_getPerms_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileInfo_getPerms_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplFileInfo->getPerms() #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_current_error001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_current_error001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_current_error001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_current_error001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_002.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_002.php.expectf index 7121a2b7d..40ba4e9be 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_002.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_002.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s array(7) { [0]=> int(1) diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_error.php.expectf index e6c951d78..58f51284c 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_fputcsv_error.php.expectf @@ -1,8 +1,8 @@ *** Testing error conditions *** -- Testing fputcsv() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing fputcsv() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplFileObject_fseek_error_001.php b/hphp/test/zend/bad/ext-spl/SplFileObject_fseek_error_001.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplFileObject_fseek_error_001.php rename to hphp/test/zend/bad/ext-spl/SplFileObject_fseek_error_001.php diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fseek_error_001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_fseek_error_001.php.expectf new file mode 100644 index 000000000..faef6b49b --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_fseek_error_001.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_fwrite_error_001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_fwrite_error_001.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_fwrite_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_fwrite_error_001.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_getchildren_error001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_getchildren_error001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_getchildren_error001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_getchildren_error001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_getflags_error002.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_haschildren_error001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_haschildren_error001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_haschildren_error001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_haschildren_error001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_key_error003.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_key_error003.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_key_error003.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_key_error003.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php index ac620084c..1ba8c152b 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php @@ -6,4 +6,5 @@ $fo = new SplFileObject('SplFileObject_rewind_error001.csv'); $fo->rewind( "invalid" ); +unlink('SplFileObject_rewind_error001.csv'); ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_rewind_error001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_seek_error_001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_seek_error_001.php.expectf index b023d0e7e..f3d594424 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_seek_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_seek_error_001.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Can't seek file %s to negative line %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error002.php.expectf b/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error002.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error002.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFileObject_setCsvControl_error002.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_array.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_array.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_array.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_string.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_string.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_string.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray__construct_param_string.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_construct_param_SplFixedArray.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_construct_param_SplFixedArray.php.expectf index e7cb54af2..bbbb0c9b6 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_construct_param_SplFixedArray.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_construct_param_SplFixedArray.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s object(SplFixedArray)#1 (0) { } \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_count_checkParams.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_count_checkParams.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_count_checkParams.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_count_checkParams.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_count_param_int.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_count_param_int.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_count_param_int.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_count_param_int.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_current_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_current_param.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_current_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_current_param.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php rename to hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_001.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php rename to hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_fromArray_invalid_parameter_002.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_getSize_pass_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_getSize_pass_param.php.expectf index 96ec1da1d..96fc31717 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_getSize_pass_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_getSize_pass_param.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s *test* \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_key_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_key_param.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_key_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_key_param.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_next_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_next_param.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_next_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_next_param.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetExists_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetExists_invalid_parameter.php.expectf index 5fa2682c1..fb941e588 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetExists_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetExists_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s PASS \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetGet_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetGet_invalid_parameter.php.expectf index 5fa2682c1..fb941e588 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetGet_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetGet_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s PASS \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_invalid_parameter.php.expectf index 5fa2682c1..fb941e588 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s PASS \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php rename to hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php.expectf new file mode 100644 index 000000000..fb941e588 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetSet_one_invalid_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +PASS \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetUnset_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetUnset_invalid_parameter.php.expectf index 5fa2682c1..fb941e588 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetUnset_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_offsetUnset_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s PASS \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_rewind_param.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_rewind_param.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_rewind_param.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_rewind_param.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php b/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php new file mode 100644 index 000000000..4a882b03b --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php @@ -0,0 +1,25 @@ +prop = 'value'; + +$array[0] = 'foo'; +$array[2] = 42; +$array[3] = $obj; +$array[4] = range(1, 5); + +$ser = serialize($array); +echo "$ser\n"; +$unser = unserialize($ser); + +printf("count: %d\n", count($unser)); +printf("getSize(): %d\n", $unser->getSize()); + +var_dump($unser[0], $unser[1], $unser[2], $unser[3], $unser[4]); + +$unser[4] = 'quux'; +var_dump($unser[4]); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php.expectf new file mode 100644 index 000000000..96a0be239 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_serialize.php.expectf @@ -0,0 +1,23 @@ +O:13:"SplFixedArray":5:{i:0;s:3:"foo";i:1;N;i:2;i:42;i:3;O:8:"stdClass":1:{s:4:"prop";s:5:"value";}i:4;a:5:{i:0;i:1;i:1;i:2;i:2;i:3;i:3;i:4;i:4;i:5;}} +count: 5 +getSize(): 5 +string(3) "foo" +NULL +int(42) +object(stdClass)#4 (1) { + ["prop"]=> + string(5) "value" +} +array(5) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) + [3]=> + int(4) + [4]=> + int(5) +} +string(4) "quux" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_setSize_param_array.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_setSize_param_array.php.expectf index c5c56b747..74e904e4a 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_setSize_param_array.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_setSize_param_array.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s object(SplFixedArray)#1 (2) { [0]=> NULL diff --git a/hphp/test/zend/bad/ext-spl/SplFixedArray_toArray_with-params.php.expectf b/hphp/test/zend/bad/ext-spl/SplFixedArray_toArray_with-params.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/SplFixedArray_toArray_with-params.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplFixedArray_toArray_with-params.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplHeap_count_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplHeap_count_invalid_parameter.php.expectf index 6e7628d38..8b11f242c 100644 --- a/hphp/test/zend/bad/ext-spl/SplHeap_count_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplHeap_count_invalid_parameter.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplHeap_extract_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplHeap_extract_invalid_parameter.php.expectf index 6e7628d38..8b11f242c 100644 --- a/hphp/test/zend/bad/ext-spl/SplHeap_extract_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplHeap_extract_invalid_parameter.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplHeap_insert_invalid_parameter.php b/hphp/test/zend/bad/ext-spl/SplHeap_insert_invalid_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplHeap_insert_invalid_parameter.php rename to hphp/test/zend/bad/ext-spl/SplHeap_insert_invalid_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplHeap_insert_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplHeap_insert_invalid_parameter.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplHeap_insert_invalid_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplHeap_isEmpty_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplHeap_isEmpty_invalid_parameter.php.expectf index 6e7628d38..8b11f242c 100644 --- a/hphp/test/zend/bad/ext-spl/SplHeap_isEmpty_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplHeap_isEmpty_invalid_parameter.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_addAll_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_addAll_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_addAll_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_addAll_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_attach_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_attach_invalid_parameter.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_attach_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_attach_invalid_parameter.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_contains_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_contains_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_contains_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_contains_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_detach_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_detach_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_detach_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_detach_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_offsetGet_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_offsetGet_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_offsetGet_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_offsetGet_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAllExcept_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAllExcept_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAllExcept_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAllExcept_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAll_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAll_invalid_parameter.php.expectf index 2b40cd758..251a20212 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAll_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_removeAll_invalid_parameter.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php b/hphp/test/zend/bad/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php similarity index 100% rename from hphp/test/zend/good/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php rename to hphp/test/zend/bad/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php.expectf new file mode 100644 index 000000000..909755029 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_setInfo_invalid_parameter.php.expectf @@ -0,0 +1,2 @@ +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplObjectStorage_unserialize_invalid_parameter1.php.expectf b/hphp/test/zend/bad/ext-spl/SplObjectStorage_unserialize_invalid_parameter1.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/bad/ext-spl/SplObjectStorage_unserialize_invalid_parameter1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplObjectStorage_unserialize_invalid_parameter1.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplPriorityQueue_extract_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplPriorityQueue_extract_invalid_parameter.php.expectf index 6e7628d38..8b11f242c 100644 --- a/hphp/test/zend/bad/ext-spl/SplPriorityQueue_extract_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplPriorityQueue_extract_invalid_parameter.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplPriorityQueue_insert_invalid_parameter.php.expectf b/hphp/test/zend/bad/ext-spl/SplPriorityQueue_insert_invalid_parameter.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/SplPriorityQueue_insert_invalid_parameter.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplPriorityQueue_insert_invalid_parameter.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/SplTempFileObject_constructor_error.php.expectf b/hphp/test/zend/bad/ext-spl/SplTempFileObject_constructor_error.php.expectf index 719057283..2d48844ef 100644 --- a/hphp/test/zend/bad/ext-spl/SplTempFileObject_constructor_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/SplTempFileObject_constructor_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: SplTempFileObject->__construct('invalid') #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic2.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic2.php.expectf index 8d5ed9372..545b868d0 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic2.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic2.php.expectf @@ -11,8 +11,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: @@ -37,8 +37,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: diff --git a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic3.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic3.php.expectf index 77c756562..76c5461b6 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic3.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic3.php.expectf @@ -11,8 +11,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: @@ -37,8 +37,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: diff --git a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic4.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic4.php.expectf index 9392ebcda..46efd67e0 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic4.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic4.php.expectf @@ -11,9 +11,9 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: @@ -38,8 +38,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: diff --git a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic5.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic5.php.expectf index e4906a154..7d1da2013 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic5.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject___construct_basic5.php.expectf @@ -11,9 +11,9 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: @@ -38,8 +38,8 @@ string(8) "changed2" bool(true) bool(true) - Unset: -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL - After: diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_asort_basic1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_asort_basic1.php.expectf index 065247558..b61d33732 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_asort_basic1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_asort_basic1.php.expectf @@ -11,7 +11,7 @@ object(ArrayObject)#%d (1) { int(4) } } -HipHop Warning: %a +HipHop Warning: %s bool(false) object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_count_basic1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_count_basic1.php.expectf index f1b0ba516..073fd0924 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_count_basic1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_count_basic1.php.expectf @@ -7,7 +7,7 @@ int(99) int(2) int(99) int(1) -HipHop Warning: %a +HipHop Warning: %s NULL ==ArrayIterator== int(99) @@ -18,5 +18,5 @@ int(99) int(2) int(99) int(1) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_exchangeArray_basic3.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_exchangeArray_basic3.php.expectf index c90fabb95..5910c5a86 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_exchangeArray_basic3.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_exchangeArray_basic3.php.expectf @@ -29,7 +29,7 @@ array(2) { --> exchangeArray() with no arg: -HipHop Warning: %a +HipHop Warning: %s object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> object(C)#3 (2) { @@ -55,7 +55,7 @@ array(2) { --> exchangeArray() with bad arg type: Exception:Passed variable is not an array or object, using empty array instead -HipHop Notice: %a +HipHop Notice: %s object(ArrayObject)#3 (1) { ["storage":"ArrayObject":private]=> object(C)#2 (2) { diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_ksort_basic1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_ksort_basic1.php.expectf index f2ee73862..263ab343d 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_ksort_basic1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_ksort_basic1.php.expectf @@ -11,7 +11,7 @@ object(ArrayObject)#%d (1) { int(3) } } -HipHop Warning: %a +HipHop Warning: %s bool(false) object(ArrayObject)#2 (1) { ["storage":"ArrayObject":private]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods1.php.expectf index 97d7e9a85..9756ab4b2 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods1.php.expectf @@ -31,7 +31,7 @@ object(ArrayObject)#2 (1) { --> Read existent, non-existent and dynamic: string(7) "changed" -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "new.changed" Original wrapped object: @@ -99,7 +99,7 @@ object(ArrayObject)#2 (1) { } --> Unset existent, non-existent and dynamic: -HipHop Notice: %a +HipHop Notice: %s Original wrapped object: object(UsesMagic)#1 (3) { ["b"]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods2.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods2.php.expectf index 6adc8eda9..1e725057e 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods2.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods2.php.expectf @@ -31,7 +31,7 @@ object(ArrayObject)#2 (3) { --> Read existent, non-existent and dynamic: string(7) "changed" -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "new.changed" Original wrapped object: diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods3.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods3.php.expectf index 97d7e9a85..9756ab4b2 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods3.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods3.php.expectf @@ -31,7 +31,7 @@ object(ArrayObject)#2 (1) { --> Read existent, non-existent and dynamic: string(7) "changed" -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "new.changed" Original wrapped object: @@ -99,7 +99,7 @@ object(ArrayObject)#2 (1) { } --> Unset existent, non-existent and dynamic: -HipHop Notice: %a +HipHop Notice: %s Original wrapped object: object(UsesMagic)#1 (3) { ["b"]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods4.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods4.php.expectf index 6f8018720..e5540941a 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods4.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods4.php.expectf @@ -33,7 +33,7 @@ object(UsesMagic)#2 (2) { --> Read existent, non-existent and dynamic: string(7) "changed" -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "new.changed" Original wrapped object: @@ -105,7 +105,7 @@ object(UsesMagic)#2 (2) { } --> Unset existent, non-existent and dynamic: -HipHop Notice: %a +HipHop Notice: %s Original wrapped object: object(C)#1 (3) { ["b"]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods6.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods6.php.expectf index fb25258ba..7d8c67d0e 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods6.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_magicMethods6.php.expectf @@ -33,7 +33,7 @@ object(UsesMagic)#2 (2) { --> Read existent, non-existent and dynamic: string(7) "changed" -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "new.changed" Original wrapped object: @@ -105,7 +105,7 @@ object(UsesMagic)#2 (2) { } --> Unset existent, non-existent and dynamic: -HipHop Notice: %a +HipHop Notice: %s Original wrapped object: object(C)#1 (3) { ["b"]=> diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_setFlags_basic1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_setFlags_basic1.php.expectf index e89c45089..f5fbe9ad8 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_setFlags_basic1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_setFlags_basic1.php.expectf @@ -10,7 +10,7 @@ string(21) "array element.changed" --> Remove the array element and try access again: bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s string(8) ".changed" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/arrayObject_setIteratorClass_error1.php.expectf b/hphp/test/zend/bad/ext-spl/arrayObject_setIteratorClass_error1.php.expectf index 6fbaea318..70e73dbb7 100644 --- a/hphp/test/zend/bad/ext-spl/arrayObject_setIteratorClass_error1.php.expectf +++ b/hphp/test/zend/bad/ext-spl/arrayObject_setIteratorClass_error1.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s a=>1 b=>2 c=>3 -HipHop Warning: %a +HipHop Warning: %s a=>1 b=>2 c=>3 diff --git a/hphp/test/zend/bad/ext-spl/array_001.php.expectf b/hphp/test/zend/bad/ext-spl/array_001.php.expectf index cad7e7205..f0b3f7143 100644 --- a/hphp/test/zend/bad/ext-spl/array_001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_001.php.expectf @@ -40,12 +40,12 @@ object(ArrayObject)#%d (1) { } } int(0) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> array(2) { diff --git a/hphp/test/zend/bad/ext-spl/array_010.php.expectf b/hphp/test/zend/bad/ext-spl/array_010.php.expectf index bcd00c318..4b506f105 100644 --- a/hphp/test/zend/bad/ext-spl/array_010.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_010.php.expectf @@ -27,9 +27,9 @@ string(3) "1st" int(1) string(3) "3rd" int(4) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL ===offsetSet=== WRITE 1 @@ -59,8 +59,8 @@ array(6) { [6]=> string(9) "changed 6" } -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(4) { [0]=> string(3) "1st" diff --git a/hphp/test/zend/bad/ext-spl/array_013.php.expectf b/hphp/test/zend/bad/ext-spl/array_013.php.expectf index 6a0bc267b..2658d11bf 100644 --- a/hphp/test/zend/bad/ext-spl/array_013.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_013.php.expectf @@ -10,4 +10,4 @@ zero=>0 one=>1 two=>2 ===Append=== -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/array_015.php.expectf b/hphp/test/zend/bad/ext-spl/array_015.php.expectf index 964b8fca6..744831680 100644 --- a/hphp/test/zend/bad/ext-spl/array_015.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_015.php.expectf @@ -13,7 +13,7 @@ object(ArrayObject)#%d (1) { int(5) } } -HipHop Notice: %a +HipHop Notice: %s int(2) object(ArrayObject)#%d (1) { %s"storage"%s"ArrayObject":private]=> @@ -40,9 +40,9 @@ object(ArrayObject)#%d (1) { } } 1=>2 -HipHop Notice: %a +HipHop Notice: %s 3=>4 -HipHop Notice: %a +HipHop Notice: %s object(ArrayObject)#%d (1) { %s"storage"%s"ArrayObject":private]=> array(0) { diff --git a/hphp/test/zend/bad/ext-spl/array_019.php.expectf b/hphp/test/zend/bad/ext-spl/array_019.php.expectf index 93ecc02dd..95036efd8 100644 --- a/hphp/test/zend/bad/ext-spl/array_019.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_019.php.expectf @@ -2,4 +2,4 @@ int(1) int(2) int(3) int(4) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/array_026.php.expectf b/hphp/test/zend/bad/ext-spl/array_026.php.expectf index 9395c9902..6b3f5cc75 100644 --- a/hphp/test/zend/bad/ext-spl/array_026.php.expectf +++ b/hphp/test/zend/bad/ext-spl/array_026.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s object(ArrayObject)#%d (1) { ["storage":"ArrayObject":private]=> array(1) { diff --git a/hphp/test/zend/bad/ext-spl/bug31346.php.expectf b/hphp/test/zend/bad/ext-spl/bug31346.php.expectf index 5bd1c8ac4..6c5f6f9b4 100644 --- a/hphp/test/zend/bad/ext-spl/bug31346.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug31346.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a +HipHop Notice: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug41828.php.expectf b/hphp/test/zend/bad/ext-spl/bug41828.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-spl/bug41828.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug41828.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug45622.php.expectf b/hphp/test/zend/bad/ext-spl/bug45622.php.expectf index ee335e0d1..eb54baf6d 100644 --- a/hphp/test/zend/bad/ext-spl/bug45622.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug45622.php.expectf @@ -8,7 +8,7 @@ bool(true) --> Remove the array element and try access again: bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL --> Re-add the real property: diff --git a/hphp/test/zend/bad/ext-spl/bug45622b.php.expectf b/hphp/test/zend/bad/ext-spl/bug45622b.php.expectf index efac7eab4..8e9cd3689 100644 --- a/hphp/test/zend/bad/ext-spl/bug45622b.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug45622b.php.expectf @@ -1,6 +1,6 @@ Doesn't trigger __get. -HipHop Notice: %a +HipHop Notice: %s Doesn't trigger __set. Doesn't trigger __unset. -HipHop Notice: %a +HipHop Notice: %s Shouldn't trigger __isset. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug49972.php.expectf b/hphp/test/zend/bad/ext-spl/bug49972.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-spl/bug49972.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug49972.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug52238.php.expectf b/hphp/test/zend/bad/ext-spl/bug52238.php.expectf index 421bb2a7b..23120a321 100644 --- a/hphp/test/zend/bad/ext-spl/bug52238.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug52238.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s: Foo->bar() #1 [internal function]: Foo->getIterator() diff --git a/hphp/test/zend/bad/ext-spl/bug54291.php.expectf b/hphp/test/zend/bad/ext-spl/bug54291.php.expectf index 72ff3ad95..305068d46 100644 --- a/hphp/test/zend/bad/ext-spl/bug54291.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug54291.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): DirectoryIterator->__construct('?/abc') #1 {main} diff --git a/hphp/test/zend/bad/ext-spl/bug61527.php.expectf b/hphp/test/zend/bad/ext-spl/bug61527.php.expectf index 32cd5f7c3..1d576446a 100644 --- a/hphp/test/zend/bad/ext-spl/bug61527.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug61527.php.expectf @@ -1,9 +1,9 @@ NULL NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL int(5) int(5) @@ -13,8 +13,8 @@ NULL NULL NULL bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug62978.php.expectf b/hphp/test/zend/bad/ext-spl/bug62978.php.expectf index 9b3a87e80..ec67ca093 100644 --- a/hphp/test/zend/bad/ext-spl/bug62978.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug62978.php.expectf @@ -1,17 +1,17 @@ -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %sbug62978.php on line %d -HipHop Notice: %a +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug64106.php.expectf b/hphp/test/zend/bad/ext-spl/bug64106.php.expectf index 0136aab3f..2ff4b661d 100644 --- a/hphp/test/zend/bad/ext-spl/bug64106.php.expectf +++ b/hphp/test/zend/bad/ext-spl/bug64106.php.expectf @@ -1 +1 @@ -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/class_implements_variation.php.expectf b/hphp/test/zend/bad/ext-spl/class_implements_variation.php.expectf index 18c3109f0..a8b8a80e6 100644 --- a/hphp/test/zend/bad/ext-spl/class_implements_variation.php.expectf +++ b/hphp/test/zend/bad/ext-spl/class_implements_variation.php.expectf @@ -7,8 +7,8 @@ array(0) { --- testing autoload --- attempting to autoload non-existent -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/class_uses_variation.php.expectf b/hphp/test/zend/bad/ext-spl/class_uses_variation.php.expectf index ab3ba12ac..985f6dd21 100644 --- a/hphp/test/zend/bad/ext-spl/class_uses_variation.php.expectf +++ b/hphp/test/zend/bad/ext-spl/class_uses_variation.php.expectf @@ -7,8 +7,8 @@ array(0) { --- testing autoload --- attempting to autoload non-existent -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/dllist_013.php b/hphp/test/zend/bad/ext-spl/dllist_013.php new file mode 100644 index 000000000..e8659db5f --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/dllist_013.php @@ -0,0 +1,31 @@ +add(2,5); +} catch (OutOfRangeException $e) { + echo "Exception: ".$e->getMessage()."\n"; +} + +$dll->add(0,6); // 6 +$dll->add(0,3); // 3 6 +// Insert in the middle of the DLL +$dll->add(1,4); // 3 4 6 +$dll->add(2,5); // 3 4 5 6 +$dll->unshift(2); // 2 3 5 4 6 +// Insert at the beginning and end of the DLL +$dll->add(0,1); // 1 2 3 4 5 6 +$dll->add(6,7); // 1 2 3 4 5 6 7 + +echo count($dll)."\n"; + +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +echo $dll->pop()."\n"; +?> +===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/dllist_013.php.expectf b/hphp/test/zend/bad/ext-spl/dllist_013.php.expectf new file mode 100644 index 000000000..fe42c0619 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/dllist_013.php.expectf @@ -0,0 +1,10 @@ +Exception: Offset invalid or out of range +7 +7 +6 +5 +4 +3 +2 +1 +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/fileobject_005.php.expectf b/hphp/test/zend/bad/ext-spl/fileobject_005.php.expectf index 09d6a5426..595a8eefc 100644 --- a/hphp/test/zend/bad/ext-spl/fileobject_005.php.expectf +++ b/hphp/test/zend/bad/ext-spl/fileobject_005.php.expectf @@ -1,6 +1,6 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ==DONE== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/fileobject_setmaxlinelen_error002.php b/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error002.php similarity index 100% rename from hphp/test/zend/good/ext-spl/fileobject_setmaxlinelen_error002.php rename to hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error002.php diff --git a/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error002.php.expectf b/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error002.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error002.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error003.php.expectf b/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error003.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error003.php.expectf +++ b/hphp/test/zend/bad/ext-spl/fileobject_setmaxlinelen_error003.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/fixedarray_005.php.expectf b/hphp/test/zend/bad/ext-spl/fixedarray_005.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/fixedarray_005.php.expectf +++ b/hphp/test/zend/bad/ext-spl/fixedarray_005.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/fixedarray_009.php.expectf b/hphp/test/zend/bad/ext-spl/fixedarray_009.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/fixedarray_009.php.expectf +++ b/hphp/test/zend/bad/ext-spl/fixedarray_009.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/fixedarray_015.php.expectf b/hphp/test/zend/bad/ext-spl/fixedarray_015.php.expectf index bf6a809d2..3332e629b 100644 --- a/hphp/test/zend/bad/ext-spl/fixedarray_015.php.expectf +++ b/hphp/test/zend/bad/ext-spl/fixedarray_015.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s Index invalid or out of range Index invalid or out of range Index invalid or out of range diff --git a/hphp/test/zend/bad/ext-spl/heap_isempty_variation_001.php.expectf b/hphp/test/zend/bad/ext-spl/heap_isempty_variation_001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/heap_isempty_variation_001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/heap_isempty_variation_001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/heap_top_variation_001.php.expectf b/hphp/test/zend/bad/ext-spl/heap_top_variation_001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/heap_top_variation_001.php.expectf +++ b/hphp/test/zend/bad/ext-spl/heap_top_variation_001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/iterator_026.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_026.php.expectf index de4650cd0..6250bb9b2 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_026.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_026.php.expectf @@ -2,12 +2,12 @@ hasNext: yes 1=>2 hasNext: yes -HipHop Notice: %a +HipHop Notice: %s 0=>31 hasNext: yes 1=>32 hasNext: yes -HipHop Notice: %a +HipHop Notice: %s 0=>331 hasNext: no 3=>4 diff --git a/hphp/test/zend/bad/ext-spl/iterator_035.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_035.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_035.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_035.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/iterator_044.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_044.php.expectf index cfe6f7e2b..804f048d4 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_044.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_044.php.expectf @@ -1,46 +1,46 @@ Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===0=== int(0) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===1=== object(stdClass)#%d (0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===2=== object(MyFoo)#%d (0) { } bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===3=== NULL bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===4=== int(2) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===5=== string(3) "foo" bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===6=== int(3) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===FILL=== ===0=== @@ -50,9 +50,9 @@ int(0) ===1=== object(stdClass)#1 (0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===2=== object(MyFoo)#2 (0) { @@ -62,7 +62,7 @@ int(1) ===3=== NULL bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===4=== int(2) @@ -75,6 +75,6 @@ int(1) ===6=== int(3) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/iterator_045.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_045.php.expectf index cb0040079..4d23d22d8 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_045.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_045.php.expectf @@ -1,10 +1,10 @@ Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) Exception: MyCachingIterator does not use a full cache (see CachingIterator::__construct) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL MyCachingIterator::testSet() set(0,25) diff --git a/hphp/test/zend/bad/ext-spl/iterator_047.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_047.php.expectf index 50bd22ddc..7875b4c91 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_047.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_047.php.expectf @@ -4,7 +4,7 @@ int(0) int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -HipHop Notice: %a +HipHop Notice: %s MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -13,7 +13,7 @@ int(2) int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -HipHop Notice: %a +HipHop Notice: %s MyRecursiveArrayIterator::hasChildren() int(0) int(30) @@ -36,7 +36,7 @@ int(0) int(0) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -HipHop Notice: %a +HipHop Notice: %s MyRecursiveArrayIterator::hasChildren() int(0) int(10) @@ -45,7 +45,7 @@ int(2) int(2) MyRecursiveArrayIterator::hasChildren() MyRecursiveArrayIterator::getChildren() -HipHop Notice: %a +HipHop Notice: %s MyRecursiveArrayIterator::hasChildren() int(0) int(30) diff --git a/hphp/test/zend/bad/ext-spl/iterator_050.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_050.php.expectf index 2fffee652..fb5500fc1 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_050.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_050.php.expectf @@ -16,7 +16,7 @@ array(3) { [2]=> %s(1) "2" } -HipHop Notice: %a +HipHop Notice: %s int(0) array(2) { [0]=> @@ -38,7 +38,7 @@ array(2) { [1]=> %s(1) "1" } -HipHop Notice: %a +HipHop Notice: %s object(ArrayIterator)#%d (1) { %s"storage"%s"ArrayIterator":private]=> array(9) { diff --git a/hphp/test/zend/bad/ext-spl/iterator_052.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_052.php.expectf index 0b0cf7a95..c29b7656a 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_052.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_052.php.expectf @@ -75,7 +75,7 @@ array(3) { array(0) { } } -HipHop Notice: %a +HipHop Notice: %s bool(true) int(5) array(3) { @@ -202,7 +202,7 @@ array(2) { array(0) { } } -HipHop Notice: %a +HipHop Notice: %s bool(true) int(5) array(2) { diff --git a/hphp/test/zend/bad/ext-spl/iterator_054.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_054.php.expectf index 4b86cb84e..b1819c4c9 100644 --- a/hphp/test/zend/bad/ext-spl/iterator_054.php.expectf +++ b/hphp/test/zend/bad/ext-spl/iterator_054.php.expectf @@ -14,7 +14,7 @@ array(3) { [2]=> string(1) "3" } -HipHop Notice: %a +HipHop Notice: %s int(7) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php b/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php new file mode 100644 index 000000000..a23f45ef2 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php @@ -0,0 +1,14 @@ + 0; + yield 1 => 1; + yield 2.5 => 2; + yield null => 3; + yield [] => 4; + yield new stdClass => 5; +} + +var_dump(iterator_to_array(gen())); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php.expectf b/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php.expectf new file mode 100644 index 000000000..d3e2772ad --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/iterator_to_array_nonscalar_keys.php.expectf @@ -0,0 +1,12 @@ +HipHop Warning: %s +HipHop Warning: %s +array(4) { + ["foo"]=> + int(0) + [1]=> + int(1) + [2]=> + int(2) + [""]=> + int(3) +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/limititerator_seek.php.expectf b/hphp/test/zend/bad/ext-spl/limititerator_seek.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/limititerator_seek.php.expectf +++ b/hphp/test/zend/bad/ext-spl/limititerator_seek.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/multiple_iterator_001.php b/hphp/test/zend/bad/ext-spl/multiple_iterator_001.php index 409d66583..a6c1000c0 100644 --- a/hphp/test/zend/bad/ext-spl/multiple_iterator_001.php +++ b/hphp/test/zend/bad/ext-spl/multiple_iterator_001.php @@ -20,8 +20,8 @@ echo "-- Default flags, MultipleIterator::MIT_NEED_ALL | MultipleIterator::MIT_K var_dump($m->getFlags() === (MultipleIterator::MIT_NEED_ALL | MultipleIterator::MIT_KEYS_NUMERIC)); -foreach($m as $value) { - var_dump($m->key(), $value); +foreach($m as $key => $value) { + var_dump($key, $value); } try { $m->current(); @@ -39,8 +39,8 @@ echo "-- Flags = MultipleIterator::MIT_NEED_ANY | MultipleIterator::MIT_KEYS_NUM $m->setFlags(MultipleIterator::MIT_NEED_ANY | MultipleIterator::MIT_KEYS_NUMERIC); var_dump($m->getFlags() === (MultipleIterator::MIT_NEED_ANY | MultipleIterator::MIT_KEYS_NUMERIC)); -foreach($m as $value) { - var_dump($m->key(), $value); +foreach($m as $key => $value) { + var_dump($key, $value); } echo "-- Default flags, added element --\n"; @@ -48,8 +48,8 @@ echo "-- Default flags, added element --\n"; $m->setFlags(MultipleIterator::MIT_NEED_ALL | MultipleIterator::MIT_KEYS_NUMERIC); $iter2[] = 3; -foreach($m as $value) { - var_dump($m->key(), $value); +foreach($m as $key => $value) { + var_dump($key, $value); } echo "-- Flags |= MultipleIterator::MIT_KEYS_ASSOC, with iterator associated with NULL --\n"; @@ -68,8 +68,8 @@ $m->attachIterator($iter1, "iter1"); $m->attachIterator($iter2, b"iter2"); $m->attachIterator($iter3, 3); -foreach($m as $value) { - var_dump($m->key(), $value); +foreach($m as $key => $value) { + var_dump($key, $value); } echo "-- Associate with invalid value --\n"; @@ -95,8 +95,8 @@ var_dump($m->containsIterator($iter2)); var_dump($m->detachIterator($iter2)); var_dump($m->countIterators()); var_dump($m->containsIterator($iter2)); -foreach($m as $value) { - var_dump($m->key(), $value); +foreach($m as $key => $value) { + var_dump($key, $value); } ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/pqueue_compare_error.php.expectf b/hphp/test/zend/bad/ext-spl/pqueue_compare_error.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/bad/ext-spl/pqueue_compare_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/pqueue_compare_error.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.php.expectf b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.php.expectf index 72ba83d7b..3fd78db43 100644 --- a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_beginchildren_error.php.expectf @@ -1,5 +1,5 @@ NULL -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: MyRecursiveIteratorIterator->beginchildren() #1 %s: RecursiveIteratorIterator->next() diff --git a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.php.expectf b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.php.expectf index a3b36d9b8..b2ed8d4cd 100644 --- a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_callHasChildren_error.php.expectf @@ -1,5 +1,5 @@ NULL -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: MyRecursiveIteratorIterator->callHasChildren() #1 %s: RecursiveIteratorIterator->next() diff --git a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.php.expectf b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.php.expectf index b28584d67..3af0b6939 100644 --- a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_endchildren_error.php.expectf @@ -3,7 +3,7 @@ ===NEXT LOOP=== 1 2 -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: MyRecursiveIteratorIterator->endchildren() #1 %s: RecursiveIteratorIterator->next() diff --git a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.php.expectf b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.php.expectf index 4291e6bf5..45cc00ee0 100644 --- a/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursiveIteratorIterator_nextelement_error.php.expectf @@ -1,5 +1,5 @@ NULL -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: MyRecursiveIteratorIterator->nextelement() #1 %s: RecursiveIteratorIterator->next() diff --git a/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setprefixpart.php.expectf b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setprefixpart.php.expectf index 5754ce0e1..651f80224 100644 --- a/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setprefixpart.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursive_tree_iterator_setprefixpart.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/recursiveiteratoriterator_getsubiterator_error.php.expectf b/hphp/test/zend/bad/ext-spl/recursiveiteratoriterator_getsubiterator_error.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/recursiveiteratoriterator_getsubiterator_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/recursiveiteratoriterator_getsubiterator_error.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/regexIterator_setMode_error.php.expectf b/hphp/test/zend/bad/ext-spl/regexIterator_setMode_error.php.expectf index 4d2e27f23..2c4de3217 100644 --- a/hphp/test/zend/bad/ext-spl/regexIterator_setMode_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/regexIterator_setMode_error.php.expectf @@ -1,4 +1,4 @@ int(0) string(14) "Illegal mode 7" int(0) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/regexiterator_setflags_exception.php.expectf b/hphp/test/zend/bad/ext-spl/regexiterator_setflags_exception.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/regexiterator_setflags_exception.php.expectf +++ b/hphp/test/zend/bad/ext-spl/regexiterator_setflags_exception.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/regexiterator_setpregflags_exception.php.expectf b/hphp/test/zend/bad/ext-spl/regexiterator_setpregflags_exception.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/regexiterator_setpregflags_exception.php.expectf +++ b/hphp/test/zend/bad/ext-spl/regexiterator_setpregflags_exception.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/splDoublyLinkedList_shift_noParams.php.expectf b/hphp/test/zend/bad/ext-spl/splDoublyLinkedList_shift_noParams.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-spl/splDoublyLinkedList_shift_noParams.php.expectf +++ b/hphp/test/zend/bad/ext-spl/splDoublyLinkedList_shift_noParams.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_003.php.expectf b/hphp/test/zend/bad/ext-spl/spl_003.php.expectf index 7dd89f23d..084f29fe8 100644 --- a/hphp/test/zend/bad/ext-spl/spl_003.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_003.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s string(3) "foo" -HipHop Warning: %a +HipHop Warning: %s array(2) { ["b"]=> string(1) "b" @@ -26,8 +26,8 @@ array(0) { bool(false) bool(false) string(3) "aaa" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s array(0) { } array(0) { diff --git a/hphp/test/zend/bad/ext-spl/spl_004.php b/hphp/test/zend/bad/ext-spl/spl_004.php index 040b5f610..93e44b90b 100644 --- a/hphp/test/zend/bad/ext-spl/spl_004.php +++ b/hphp/test/zend/bad/ext-spl/spl_004.php @@ -40,8 +40,8 @@ var_dump(iterator_apply($it, 'test')); echo "===ERRORS===\n"; var_dump(iterator_apply($it, 'test', 1)); -var_dump(iterator_apply($it, 'non_existing_functon')); -var_dump(iterator_apply($it, 'non_existing_functon', NULL, 2)); +var_dump(iterator_apply($it, 'non_existing_function')); +var_dump(iterator_apply($it, 'non_existing_function', NULL, 2)); ?> ===DONE=== diff --git a/hphp/test/zend/bad/ext-spl/spl_004.php.expectf b/hphp/test/zend/bad/ext-spl/spl_004.php.expectf index 4f289fec1..80601b941 100644 --- a/hphp/test/zend/bad/ext-spl/spl_004.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_004.php.expectf @@ -25,7 +25,7 @@ int(4) Error: Argument 3 passed to iterator_apply() must be of the type array, integer given Error: iterator_apply() expects parameter 3 to be array, integer given NULL -Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_functon' not found or invalid function name +Error: iterator_apply() expects parameter 2 to be a valid callback, function 'non_existing_function' not found or invalid function name NULL Error: iterator_apply() expects at most 3 parameters, 4 given NULL diff --git a/hphp/test/zend/bad/ext-spl/spl_005.php.expectf b/hphp/test/zend/bad/ext-spl/spl_005.php.expectf index 2ac43e9b0..0f9b8989d 100644 --- a/hphp/test/zend/bad/ext-spl/spl_005.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_005.php.expectf @@ -1,6 +1,6 @@ string(32) "%s" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_autoload_012.php.expectf b/hphp/test/zend/bad/ext-spl/spl_autoload_012.php.expectf index bfa95c467..48ac80baa 100644 --- a/hphp/test/zend/bad/ext-spl/spl_autoload_012.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_autoload_012.php.expectf @@ -8,7 +8,7 @@ second first autoload_first autoload_second -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: autoload_first('ThisClassDoesNo...') #1 [internal function]: spl_autoload_call('ThisClassDoesNo...') diff --git a/hphp/test/zend/bad/ext-spl/spl_cachingiterator_setFlags_basic.php.expectf b/hphp/test/zend/bad/ext-spl/spl_cachingiterator_setFlags_basic.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/spl_cachingiterator_setFlags_basic.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_cachingiterator_setFlags_basic.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_count_basic.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_count_basic.php.expectf index c54b88e2b..12f746f37 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_count_basic.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_count_basic.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: MyHeap->count() #1 %s count(Object(MyHeap)) diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_count_error.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_count_error.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_count_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_count_error.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_extract_parameter_error.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_extract_parameter_error.php.expectf index f9787e34f..c1952a25a 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_extract_parameter_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_extract_parameter_error.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_insert_basic.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_insert_basic.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_insert_basic.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_insert_basic.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_is_empty_basic.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_is_empty_basic.php.expectf index 9c71268ae..811c53838 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_is_empty_basic.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_is_empty_basic.php.expectf @@ -1,4 +1,4 @@ bool(true) bool(false) bool(true) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_heap_recoverfromcorruption_arguments.php.expectf b/hphp/test/zend/bad/ext-spl/spl_heap_recoverfromcorruption_arguments.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/spl_heap_recoverfromcorruption_arguments.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_heap_recoverfromcorruption_arguments.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_maxheap_compare_basic.php b/hphp/test/zend/bad/ext-spl/spl_maxheap_compare_basic.php similarity index 100% rename from hphp/test/zend/good/ext-spl/spl_maxheap_compare_basic.php rename to hphp/test/zend/bad/ext-spl/spl_maxheap_compare_basic.php diff --git a/hphp/test/zend/bad/ext-spl/spl_maxheap_compare_basic.php.expectf b/hphp/test/zend/bad/ext-spl/spl_maxheap_compare_basic.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/spl_maxheap_compare_basic.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_minheap_compare_error.php b/hphp/test/zend/bad/ext-spl/spl_minheap_compare_error.php similarity index 100% rename from hphp/test/zend/good/ext-spl/spl_minheap_compare_error.php rename to hphp/test/zend/bad/ext-spl/spl_minheap_compare_error.php diff --git a/hphp/test/zend/bad/ext-spl/spl_minheap_compare_error.php.expectf b/hphp/test/zend/bad/ext-spl/spl_minheap_compare_error.php.expectf new file mode 100644 index 000000000..49623a580 --- /dev/null +++ b/hphp/test/zend/bad/ext-spl/spl_minheap_compare_error.php.expectf @@ -0,0 +1,3 @@ +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_pq_top_error_args.php.expectf b/hphp/test/zend/bad/ext-spl/spl_pq_top_error_args.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/spl_pq_top_error_args.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_pq_top_error_args.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_priorityqeue_insert_two_params_error.php.expectf b/hphp/test/zend/bad/ext-spl/spl_priorityqeue_insert_two_params_error.php.expectf index 41ef48819..24b25da2b 100644 --- a/hphp/test/zend/bad/ext-spl/spl_priorityqeue_insert_two_params_error.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_priorityqeue_insert_two_params_error.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/spl_recursiveIteratorIterator_setMaxDepth_parameter_count.php.expectf b/hphp/test/zend/bad/ext-spl/spl_recursiveIteratorIterator_setMaxDepth_parameter_count.php.expectf index 3cbce755b..848606afd 100644 --- a/hphp/test/zend/bad/ext-spl/spl_recursiveIteratorIterator_setMaxDepth_parameter_count.php.expectf +++ b/hphp/test/zend/bad/ext-spl/spl_recursiveIteratorIterator_setMaxDepth_parameter_count.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/splpriorityqueue_extract.php.expectf b/hphp/test/zend/bad/ext-spl/splpriorityqueue_extract.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/splpriorityqueue_extract.php.expectf +++ b/hphp/test/zend/bad/ext-spl/splpriorityqueue_extract.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/splpriorityqueue_setextractflags.php.expectf b/hphp/test/zend/bad/ext-spl/splpriorityqueue_setextractflags.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-spl/splpriorityqueue_setextractflags.php.expectf +++ b/hphp/test/zend/bad/ext-spl/splpriorityqueue_setextractflags.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sqlite3/sqlite3_12_unfinalized_stmt_cleanup.php.expectf b/hphp/test/zend/bad/ext-sqlite3/sqlite3_12_unfinalized_stmt_cleanup.php.expectf index 617e200b6..f281f4495 100644 --- a/hphp/test/zend/bad/ext-sqlite3/sqlite3_12_unfinalized_stmt_cleanup.php.expectf +++ b/hphp/test/zend/bad/ext-sqlite3/sqlite3_12_unfinalized_stmt_cleanup.php.expectf @@ -13,6 +13,6 @@ array(2) { Closing database bool(true) Check db was closed -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sqlite3/sqlite3_enable_exceptions.php.expectf b/hphp/test/zend/bad/ext-sqlite3/sqlite3_enable_exceptions.php.expectf index 16d282b6e..9ee64ccd9 100644 --- a/hphp/test/zend/bad/ext-sqlite3/sqlite3_enable_exceptions.php.expectf +++ b/hphp/test/zend/bad/ext-sqlite3/sqlite3_enable_exceptions.php.expectf @@ -1,8 +1,8 @@ bool(false) no such table: non_existent_table bool(true) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL Closing database bool(true) diff --git a/hphp/test/zend/bad/ext-sqlite3/sqlite3_loadextension_with_wrong_param.php.expectf b/hphp/test/zend/bad/ext-sqlite3/sqlite3_loadextension_with_wrong_param.php.expectf index 68357b99d..55369d6b8 100644 --- a/hphp/test/zend/bad/ext-sqlite3/sqlite3_loadextension_with_wrong_param.php.expectf +++ b/hphp/test/zend/bad/ext-sqlite3/sqlite3_loadextension_with_wrong_param.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sqlite3/sqlite3_prepared_stmt_clear_with_params.php.expectf b/hphp/test/zend/bad/ext-sqlite3/sqlite3_prepared_stmt_clear_with_params.php.expectf index b1054e0e9..30e409c0a 100644 --- a/hphp/test/zend/bad/ext-sqlite3/sqlite3_prepared_stmt_clear_with_params.php.expectf +++ b/hphp/test/zend/bad/ext-sqlite3/sqlite3_prepared_stmt_clear_with_params.php.expectf @@ -2,7 +2,7 @@ Creating Table INSERT into table bool(true) SELECTING results -HipHop Warning: %a +HipHop Warning: %s NULL Closing database bool(true) diff --git a/hphp/test/zend/bad/ext-sqlite3/sqlite3_version_noparam.php.expectf b/hphp/test/zend/bad/ext-sqlite3/sqlite3_version_noparam.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-sqlite3/sqlite3_version_noparam.php.expectf +++ b/hphp/test/zend/bad/ext-sqlite3/sqlite3_version_noparam.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/005.php.expectf b/hphp/test/zend/bad/ext-standard-array/005.php.expectf index 874ffb36c..06c66564b 100644 --- a/hphp/test/zend/bad/ext-standard-array/005.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/005.php.expectf @@ -1,11 +1,11 @@ *** Testing Error Conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL diff --git a/hphp/test/zend/bad/ext-standard-array/009.php b/hphp/test/zend/bad/ext-standard-array/009.php index 31ea97b52..ba4d1cfb0 100644 --- a/hphp/test/zend/bad/ext-standard-array/009.php +++ b/hphp/test/zend/bad/ext-standard-array/009.php @@ -91,7 +91,7 @@ var_dump( current($temp_array, $temp_array) ); var_dump( reset($temp_array, $temp_array) ); var_dump( next($temp_array, $temp_array) ); -// invalid args type, valid arguement: array +// invalid args type, valid argument: array $int_var = 1; $float_var = 1.5; $string = "string"; diff --git a/hphp/test/zend/bad/ext-standard-array/009.php.expectf b/hphp/test/zend/bad/ext-standard-array/009.php.expectf index 04031d684..e90204e00 100644 --- a/hphp/test/zend/bad/ext-standard-array/009.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/009.php.expectf @@ -339,54 +339,54 @@ array(5) { -- Testing variation: when array is unset -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_errors.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_errors.php.expectf index 56cc83a4e..0ec393e96 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_errors.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_errors.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL end \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation.php.expectf index 3e50aee5f..5bee92f7a 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL array(4) { ["ONE"]=> @@ -14,7 +14,7 @@ array(1) { ["one"]=> int(4) } -HipHop Warning: %a +HipHop Warning: %s NULL array(1) { ["ONE"]=> diff --git a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation1.php.expectf index 23376e2b1..0758cce1b 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation1.php.expectf @@ -1,71 +1,71 @@ *** Testing array_change_key_case() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- @@ -73,30 +73,30 @@ array(0) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation2.php.expectf index 3409e5d24..fd60b5b98 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_change_key_case_variation2.php.expectf @@ -151,27 +151,27 @@ array(3) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- diff --git a/hphp/test/zend/bad/ext-standard-array/array_chunk_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_chunk_variation2.php.expectf index 7b5d076a0..b716aa76a 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_chunk_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_chunk_variation2.php.expectf @@ -30,11 +30,11 @@ array(1) { } -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- @@ -67,75 +67,75 @@ array(1) { } -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- @@ -177,11 +177,11 @@ array(2) { } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- @@ -223,66 +223,66 @@ array(2) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_chunk_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_chunk_variation3.php.expectf index 0098d663d..5cac7550a 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_chunk_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_chunk_variation3.php.expectf @@ -166,7 +166,7 @@ array(1) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- diff --git a/hphp/test/zend/bad/ext-standard-array/array_combine_error2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_combine_error2.php.expectf index 1be7e2ab9..dc4ea0360 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_combine_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_combine_error2.php.expectf @@ -5,14 +5,14 @@ array(0) { } -- Testing array_combine() function with empty array for $keys argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing array_combine() function with empty array for $values argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing array_combine() function by passing array with unequal number of elements -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_combine_variation3.php b/hphp/test/zend/bad/ext-standard-array/array_combine_variation3.php index 528c72e55..18f4e02cd 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_combine_variation3.php +++ b/hphp/test/zend/bad/ext-standard-array/array_combine_variation3.php @@ -26,7 +26,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << int(1) @@ -59,13 +59,13 @@ array(3) { [2]=> int(3) } -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s array(2) { ["sub_array1"]=> array(3) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_fill_keys_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_fill_keys_variation1.php.expectf index 4f620ddf6..9fe64641f 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_fill_keys_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_fill_keys_variation1.php.expectf @@ -17,7 +17,7 @@ array(4) { } -- Testing array_fill_keys() function with mixed array -- -HipHop Notice: %a +HipHop Notice: %s array(7) { ["Resource id #%d"]=> string(6) "simple" diff --git a/hphp/test/zend/bad/ext-standard-array/array_fill_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_fill_variation1.php.expectf index b662375cd..cbbc8b7d5 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_fill_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_fill_variation1.php.expectf @@ -36,19 +36,19 @@ array(2) { int(100) } -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- array(2) { @@ -93,19 +93,19 @@ array(2) { int(100) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- array(2) { @@ -122,6 +122,6 @@ array(2) { int(100) } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_fill_variation1_64bit.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_fill_variation1_64bit.php.expectf index 638cdb4a6..5315a07c4 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_fill_variation1_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_fill_variation1_64bit.php.expectf @@ -36,19 +36,19 @@ array(2) { int(100) } -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- array(2) { @@ -93,19 +93,19 @@ array(2) { int(100) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- array(2) { @@ -122,6 +122,6 @@ array(2) { int(100) } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_fill_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_fill_variation2.php.expectf index 11ea44a7f..62790df64 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_fill_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_fill_variation2.php.expectf @@ -8,7 +8,7 @@ array(2) { int(100) } -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- array(5) { @@ -24,31 +24,31 @@ array(5) { int(100) } -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- array(1) { @@ -56,7 +56,7 @@ array(1) { int(100) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- array(1) { @@ -64,27 +64,27 @@ array(1) { int(100) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_filter.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_filter.php.expectf index 7e31c1842..1501d1e47 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_filter.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_filter.php.expectf @@ -46,10 +46,10 @@ array(2) { } array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL == DONE == \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_filter_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_filter_error.php.expectf index 0a6a769b5..9df271b44 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_filter_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_filter_error.php.expectf @@ -1,11 +1,11 @@ *** Testing array_filter() : error conditions *** -- Testing array_filter() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_filter() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_filter() function with incorrect callback -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_filter_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_filter_variation2.php.expectf index ae8b9f5e3..c9f198e50 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_filter_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_filter_variation2.php.expectf @@ -1,86 +1,86 @@ *** Testing array_filter() : usage variations - unexpected values for 'callback' function*** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_filter_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_filter_variation9.php.expectf index 956fe8e33..c09ec8b62 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_filter_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_filter_variation9.php.expectf @@ -31,8 +31,8 @@ array(8) { [7]=> NULL } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_flip_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_flip_variation1.php.expectf index 02e8903e2..dcf7c1b48 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_flip_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_flip_variation1.php.expectf @@ -1,71 +1,71 @@ *** Testing array_flip() : usage variations - unexpected values for 'input' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation1.php.expectf index 28ae21927..00a79df82 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation1.php.expectf @@ -1,146 +1,146 @@ *** Testing array_intersect_assoc() : Passing non-array values to $arr1 argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation2.php.expectf index c0a145079..e753bbd49 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation2.php.expectf @@ -1,146 +1,146 @@ *** Testing array_intersect_assoc() : Passing non-array values to $arr2 argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php index cae72a60e..b8405053f 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_assoc_variation3.php @@ -28,7 +28,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << array(4) { @@ -30,14 +30,14 @@ array(2) { } } - With more arguments - -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s array(2) { [0]=> array(4) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_error.php.expectf index c2c7cc246..3543db5ab 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_error.php.expectf @@ -1,16 +1,16 @@ *** Testing array_intersect_uassoc() : error conditions *** -- Testing array_intersect_uassoc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_uassoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_uassoc() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation4.php.expectf index 543c6be06..acc990697 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation4.php.expectf @@ -1,122 +1,122 @@ *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation9.php.expectf index bef2e73ef..d666870ed 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_uassoc_variation9.php.expectf @@ -1,9 +1,9 @@ *** Testing array_intersect_uassoc() : usage variation *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_error.php.expectf index 223512102..da4a3bb59 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_error.php.expectf @@ -1,14 +1,14 @@ *** Testing array_intersect_ukey() : error conditions *** -- Testing array_intersect_ukey() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_ukey() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_ukey() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation3.php.expectf index ff68ad4d9..fc7cf0df5 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation3.php.expectf @@ -1,146 +1,146 @@ *** Testing array_intersect_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation8.php.expectf index cf9b6ef4a..1c31ea583 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_ukey_variation8.php.expectf @@ -1,9 +1,9 @@ *** Testing array_intersect_ukey() : usage variation *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation1.php.expectf index 496c93b5c..51548df0b 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation1.php.expectf @@ -1,146 +1,146 @@ *** Testing array_intersect() : Passing non-array values to $arr1 argument *** -- Iterator 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation2.php.expectf index c6c02390b..14a4dee1e 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation2.php.expectf @@ -1,146 +1,146 @@ *** Testing array_intersect() : Passing non-array values to $arr2 argument *** -- Iterator 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php index 81c9f21e2..f22a3fd07 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php +++ b/hphp/test/zend/bad/ext-standard-array/array_intersect_variation3.php @@ -27,7 +27,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << array(4) { @@ -62,34 +62,34 @@ array(4) { } } - With more arguments - -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s array(4) { [0]=> array(4) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_key_exists.php b/hphp/test/zend/bad/ext-standard-array/array_key_exists.php index 35c3fbde6..d88f04a58 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_key_exists.php +++ b/hphp/test/zend/bad/ext-standard-array/array_key_exists.php @@ -111,7 +111,7 @@ var_dump(array_key_exists("print_member", $key_check_obj)); // not found, its a var_dump(array_key_exists("arr", $key_check_obj)); //found, public member var_dump(array_key_exists("var", $key_check_obj->arr)); //found, key is in member array -/* error condition, first arguemnt as object */ +/* error condition, first argument as object */ var_dump( array_key_exists($key_check_obj, $key_check_obj) ); echo "Done\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_key_exists.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_key_exists.php.expectf index 41e6b1123..ab6e63363 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_key_exists.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_key_exists.php.expectf @@ -127,25 +127,25 @@ bool(false) bool(true) *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing operation on objects *** @@ -155,6 +155,6 @@ bool(true) bool(false) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_key_exists_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_key_exists_variation2.php.expectf index f3d8f9590..f69f06a32 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_key_exists_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_key_exists_variation2.php.expectf @@ -1,100 +1,100 @@ *** Testing array_key_exists() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_keys_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_keys_error.php.expectf index 060ddec2e..e8e61cebc 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_keys_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_keys_error.php.expectf @@ -1,15 +1,15 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s array(3) { [0]=> int(0) diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_001.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_001.php.expectf index a87606986..a8c5ba622 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_001.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s string(17) "exception caught!" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_object1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_object1.php.expectf index e523f8973..7e615d040 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_object1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_object1.php.expectf @@ -12,17 +12,17 @@ array(2) { -- simple class with private variable and method -- SimpleClassPri::add -HipHop Warning: %a +HipHop Warning: %s NULL -- simple class with protected variable and method -- SimpleClassPro::mul -HipHop Warning: %a +HipHop Warning: %s NULL -- class without members -- EmptyClass -HipHop Warning: %a +HipHop Warning: %s NULL -- abstract class -- @@ -60,10 +60,10 @@ array(2) { int(4) } StaticClass::cube -HipHop Warning: %a +HipHop Warning: %s NULL StaticClass::retVal -HipHop Warning: %a +HipHop Warning: %s NULL -- class implementing an interface -- InterClass::square diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_variation14.php.expectf index 23917bb43..1ab3507e9 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_variation14.php.expectf @@ -69,9 +69,9 @@ array(2) { int(2) } -- with empty string -- -HipHop Warning: %a +HipHop Warning: %s NULL -- with empty array -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_variation15.php.expectf index 0fa4d7182..0233d7b15 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_variation15.php.expectf @@ -1,4 +1,4 @@ *** Testing array_map() : non existent 'callback' function *** -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation16.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_variation16.php.expectf index dd9e218b8..e86e7df3f 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation16.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_variation16.php.expectf @@ -1,26 +1,26 @@ *** Testing array_map() : non-permmited built-in functions *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation17.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_variation17.php.expectf index db4116c23..f5263d39b 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation17.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_variation17.php.expectf @@ -1,82 +1,82 @@ *** Testing array_map() : unexpected values for 'callback' argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_map_variation4.php.expectf index ecc066373..8d81d8864 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_map_variation4.php.expectf @@ -1,8 +1,8 @@ *** Testing array_map() : associative array with diff. keys for 'arr1' argument *** -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -- Iteration 1 -- array(0) { } diff --git a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation1.php.expectf index 1987645c1..37cad8aee 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation1.php.expectf @@ -2,193 +2,193 @@ -- Iteration 1 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -- With default argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation2.php.expectf index 5cb23ba5a..d7d59b95f 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation2.php.expectf @@ -1,98 +1,98 @@ *** Testing array_merge_recursive() : Passing non array values to $arr2 argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php index c88b71756..4f8a5b796 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php +++ b/hphp/test/zend/bad/ext-standard-array/array_merge_recursive_variation3.php @@ -27,7 +27,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << @@ -67,8 +67,8 @@ array(4) { [3]=> float(2) } -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_pad_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_pad_variation1.php.expectf index e589685ca..636e54539 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_pad_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_pad_variation1.php.expectf @@ -1,146 +1,146 @@ *** Testing array_pad() : passing non array values to $input argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_pad_variation6.php b/hphp/test/zend/bad/ext-standard-array/array_pad_variation6.php index da5f93769..ba8e469db 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_pad_variation6.php +++ b/hphp/test/zend/bad/ext-standard-array/array_pad_variation6.php @@ -28,7 +28,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << diff --git a/hphp/test/zend/bad/ext-standard-array/array_rand.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_rand.php.expectf index 639c4005e..6d567b4e7 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_rand.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_rand.php.expectf @@ -1,15 +1,15 @@ -HipHop Warning: %a +HipHop Warning: %s NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(3) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/array_rand_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_rand_variation2.php.expectf index 3b336513f..acb65fa84 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_rand_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_rand_variation2.php.expectf @@ -1,18 +1,18 @@ *** Testing array_rand() : unexpected values for 'num_req' parameter *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- int(%d) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- @@ -40,68 +40,68 @@ array(10) { } -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- int(%d) -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- int(%d) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_replace.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_replace.php.expectf index f61818ca5..4294a6c40 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_replace.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_replace.php.expectf @@ -58,7 +58,7 @@ array(5) { } } -- Testing array_replace_recursive() w/ endless recusrsion -- -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> array(1) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation1.php.expectf index c78a2d3af..8b32f9e25 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation1.php.expectf @@ -1,194 +1,194 @@ *** Testing array_reverse() : usage variations - unexpected values for 'array' argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation2.php.expectf index 955438c86..fddb0109e 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation2.php.expectf @@ -135,19 +135,19 @@ array(6) { string(5) "green" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- array(6) { @@ -270,7 +270,7 @@ array(6) { string(5) "green" } -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- array(6) { @@ -303,6 +303,6 @@ array(6) { string(5) "green" } -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation4.php.expectf index 1003f2e28..baf47d734 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_reverse_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_reverse_variation4.php.expectf @@ -1,8 +1,8 @@ *** Testing array_reverse() : usage variations *** -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -- Iteration 1 -- - default argument - array(0) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_search1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_search1.php.expectf index 93be42ca8..2e7e7c561 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_search1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_search1.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(1) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-array/array_search_errors.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_search_errors.php.expectf index ce59dd700..f65487876 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_search_errors.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_search_errors.php.expectf @@ -1,12 +1,12 @@ *** Testing error conditions of array_search() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_search_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_search_variation3.php.expectf index 6999d29d5..9a058ca3d 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_search_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_search_variation3.php.expectf @@ -4,9 +4,9 @@ string(5) "three" int(5) *** Testing objects with array_search() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(1) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_slice.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_slice.php.expectf index 08d6ab84f..649fad0d6 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_slice.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_slice.php.expectf @@ -1,17 +1,17 @@ *** Output for Zero Argument *** -HipHop Warning: %a +HipHop Warning: %s *** Output for Single array Argument *** -HipHop Warning: %a +HipHop Warning: %s *** Output for invalid number of Arguments *** -HipHop Warning: %a +HipHop Warning: %s *** Output for scalar Argument *** -HipHop Warning: %a +HipHop Warning: %s *** Output for string Argument *** -HipHop Warning: %a +HipHop Warning: %s *** Iteration 1 *** diff --git a/hphp/test/zend/bad/ext-standard-array/array_slice_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_slice_variation2.php.expectf index a3a1496c1..f4367c7fc 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_slice_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_slice_variation2.php.expectf @@ -159,27 +159,27 @@ array(4) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- diff --git a/hphp/test/zend/bad/ext-standard-array/array_slice_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_slice_variation4.php.expectf index 0b8b69c91..a753bd183 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_slice_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_slice_variation4.php.expectf @@ -171,7 +171,7 @@ array(3) { } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- @@ -205,7 +205,7 @@ array(3) { } -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- diff --git a/hphp/test/zend/bad/ext-standard-array/array_splice_errors.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_splice_errors.php.expectf index b0ce0fdd4..d94f05868 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_splice_errors.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_splice_errors.php.expectf @@ -1,12 +1,12 @@ *** Testing error conditions of array_splice() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_error.php.expectf index 2f3623b96..8b9985dc5 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_udiff_assoc() : error conditions *** -- Testing array_udiff_assoc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_udiff_assoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation3.php.expectf index e0bfff8b9..a0ed34e42 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_udiff_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation4.php.expectf index 15533abbb..42d0512b4 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_assoc_variation4.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_error.php.expectf index 87763175c..c98fe67f9 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_udiff() : error conditions *** -- Testing array_udiff() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_udiff() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_error.php.expectf index fe1667839..b67ec1cc8 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_udiff_uassoc() : error conditions *** -- Testing array_udiff_uassoc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_udiff_uassoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation3.php.expectf index 308264fde..119459308 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_udiff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation4.php.expectf index 308264fde..119459308 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation4.php.expectf @@ -1,118 +1,118 @@ *** Testing array_udiff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation5.php.expectf index 6d3d2bc23..c44886f86 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_uassoc_variation5.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_variation3.php.expectf index ab37b2880..b83e1b374 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_udiff() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_udiff_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_udiff_variation4.php.expectf index ada893c1a..20026ded3 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_udiff_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_udiff_variation4.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_error.php.expectf index 8c93e7ddf..c45265747 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_uintersect_assoc() : error conditions *** -- Testing array_uintersect_assoc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_uintersect_assoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_variation3.php.expectf index 40e2024aa..1b3629892 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_assoc_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_error.php.expectf index 56c828653..d4fa9e04d 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_uintersect() : error conditions *** -- Testing array_uintersect() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_uintersect() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_error.php.expectf index 6657e5a41..0c50934fe 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_uintersect_uassoc() : error conditions *** -- Testing array_uintersect_uassoc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_uintersect_uassoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation3.php.expectf index eb6d5ebf1..8d7ce3022 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation4.php.expectf index eb6d5ebf1..8d7ce3022 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation4.php.expectf @@ -1,118 +1,118 @@ *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation6.php.expectf index 2a7e43781..9542da057 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_uassoc_variation6.php.expectf @@ -5,9 +5,9 @@ array(0) { } -- comparison function taking too many parameters -- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(0) { } diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation3.php.expectf index 33e498b51..97b8baaeb 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation3.php.expectf @@ -1,118 +1,118 @@ *** Testing array_uintersect() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation5.php.expectf index 22568ddbd..fb4cbc39f 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_uintersect_variation5.php.expectf @@ -5,9 +5,9 @@ array(0) { } -- comparison function taking too many parameters -- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(0) { } diff --git a/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php b/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php index 0b2da35ba..9041288da 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/array_unique_variation2.php @@ -26,7 +26,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << diff --git a/hphp/test/zend/bad/ext-standard-array/array_unique_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_unique_variation8.php.expectf index ccc0748c6..700f0a34c 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unique_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_unique_variation8.php.expectf @@ -1,18 +1,18 @@ *** Testing array_unique() : two dimensional array for $input argument *** -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> array(4) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_unshift.php.expectf index f5497976a..14b929525 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unshift.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_unshift.php.expectf @@ -3,7 +3,7 @@ array(1) { [0]=> string(0) "" } -HipHop Warning: %a +HipHop Warning: %s NULL array(1) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation1.php.expectf index e1e399dce..35900659b 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation1.php.expectf @@ -1,196 +1,196 @@ *** Testing array_unshift() : unexpected values for $array argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL int(0) -HipHop Warning: %a +HipHop Warning: %s NULL int(0) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL int(1) -HipHop Warning: %a +HipHop Warning: %s NULL int(1) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL int(12345) -HipHop Warning: %a +HipHop Warning: %s NULL int(12345) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL int(-2345) -HipHop Warning: %a +HipHop Warning: %s NULL int(-2345) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL float(10.5) -HipHop Warning: %a +HipHop Warning: %s NULL float(10.5) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL float(-10.5) -HipHop Warning: %a +HipHop Warning: %s NULL float(-10.5) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL float(123456789000) -HipHop Warning: %a +HipHop Warning: %s NULL float(123456789000) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL float(1.23456789E-9) -HipHop Warning: %a +HipHop Warning: %s NULL float(1.23456789E-9) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL float(0.5) -HipHop Warning: %a +HipHop Warning: %s NULL float(0.5) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL string(6) "string" -HipHop Warning: %a +HipHop Warning: %s NULL string(6) "string" -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL string(6) "string" -HipHop Warning: %a +HipHop Warning: %s NULL string(6) "string" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL string(11) "hello world" -HipHop Warning: %a +HipHop Warning: %s NULL string(11) "hello world" -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL object(classA)#1 (0) { } -HipHop Warning: %a +HipHop Warning: %s NULL object(classA)#1 (0) { } -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s NULL resource(%d) of type (stream) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation4.php.expectf index e37ce4c54..60ecc0abe 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation4.php.expectf @@ -1,8 +1,8 @@ *** Testing array_unshift() : associative array with different keys *** -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -- Iteration 1 -- int(1) array(1) { diff --git a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php index 7a2e2a6b6..d68c665bc 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php +++ b/hphp/test/zend/bad/ext-standard-array/array_unshift_variation9.php @@ -30,7 +30,7 @@ the lazy dog This is a double quoted string EOT; -// heredoc with diferent whitespaces +// heredoc with different whitespaces $diff_whitespaces = << @@ -17,7 +17,7 @@ array(2) { } Sort flag = SORT_STRING -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -27,7 +27,7 @@ array(2) { } Sort flag = SORT_NUMERIC -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php b/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php index 07d68afb4..3a3d9d17e 100644 --- a/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php @@ -67,7 +67,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of arsort() -// when $flag arugment is supplied with different values from $unexpected_values +// when $flag argument is supplied with different values from $unexpected_values echo "\n-- Testing arsort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php.expectf index ae3a0414a..15d9c4647 100644 --- a/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/arsort_variation2.php.expectf @@ -122,7 +122,7 @@ array(3) { int(2) } -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -133,7 +133,7 @@ array(3) { int(45) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -144,7 +144,7 @@ array(3) { int(45) } -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -155,7 +155,7 @@ array(3) { int(45) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -166,7 +166,7 @@ array(3) { int(45) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -177,7 +177,7 @@ array(3) { int(45) } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -188,7 +188,7 @@ array(3) { int(45) } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -199,7 +199,7 @@ array(3) { int(45) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> diff --git a/hphp/test/zend/bad/ext-standard-array/asort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/asort_error.php.expectf index 18470a745..799473afb 100644 --- a/hphp/test/zend/bad/ext-standard-array/asort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/asort_error.php.expectf @@ -1,13 +1,13 @@ *** Testing asort() : error conditions *** -- Testing asort() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing asort() function with more than expected no. of arguments -- Sort flag = SORT_REGULAR -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -17,7 +17,7 @@ array(2) { } Sort flag = SORT_STRING -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -27,7 +27,7 @@ array(2) { } Sort flag = SORT_NUMERIC -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/asort_variation2.php b/hphp/test/zend/bad/ext-standard-array/asort_variation2.php index e1bddab38..854ef42dc 100644 --- a/hphp/test/zend/bad/ext-standard-array/asort_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/asort_variation2.php @@ -67,7 +67,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of asort() -// when $flag arugment is supplied with different values from $unexpected_values +// when $flag argument is supplied with different values from $unexpected_values echo "\n-- Testing asort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-array/asort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/asort_variation2.php.expectf index 4a24cb11f..0ab1bc1c0 100644 --- a/hphp/test/zend/bad/ext-standard-array/asort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/asort_variation2.php.expectf @@ -122,7 +122,7 @@ array(3) { int(45) } -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -133,7 +133,7 @@ array(3) { int(45) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -144,7 +144,7 @@ array(3) { int(45) } -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -155,7 +155,7 @@ array(3) { int(45) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -166,7 +166,7 @@ array(3) { int(45) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -177,7 +177,7 @@ array(3) { int(45) } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -188,7 +188,7 @@ array(3) { int(45) } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> @@ -199,7 +199,7 @@ array(3) { int(45) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [1]=> diff --git a/hphp/test/zend/bad/ext-standard-array/bug35821.php.expectf b/hphp/test/zend/bad/ext-standard-array/bug35821.php.expectf index 13690f5a9..d2bdcdc20 100644 --- a/hphp/test/zend/bad/ext-standard-array/bug35821.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/bug35821.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Fatal error: %a +HipHop Warning: %s +HipHop Fatal error: %s Stack trace: #0 %s(%d): Element->ThrowException() #1 [internal function]: Element::CallBack(Object(Element)) diff --git a/hphp/test/zend/bad/ext-standard-array/bug42177.php.expectf b/hphp/test/zend/bad/ext-standard-array/bug42177.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-standard-array/bug42177.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/bug42177.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/bug43495.php.expectf b/hphp/test/zend/bad/ext-standard-array/bug43495.php.expectf index 354edaff8..c545a90e5 100644 --- a/hphp/test/zend/bad/ext-standard-array/bug43495.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/bug43495.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/bug61058.php.expectf b/hphp/test/zend/bad/ext-standard-array/bug61058.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-standard-array/bug61058.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/bug61058.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/compact_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/compact_variation1.php.expectf index 9c7415597..35b380ff8 100644 --- a/hphp/test/zend/bad/ext-standard-array/compact_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/compact_variation1.php.expectf @@ -1,13 +1,13 @@ *** Testing compact() : usage variations - arrays containg references *** -HipHop Warning: %a +HipHop Warning: %s array(1) { ["a"]=> int(1) } -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(2) { ["a"]=> int(1) diff --git a/hphp/test/zend/bad/ext-standard-array/count_recursive.php.expectf b/hphp/test/zend/bad/ext-standard-array/count_recursive.php.expectf index 4346c565d..4225495e1 100644 --- a/hphp/test/zend/bad/ext-standard-array/count_recursive.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/count_recursive.php.expectf @@ -83,16 +83,16 @@ For mode '' count is => int(3) For mode '' count is => int(3) -- Testing error conditions -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/count_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/count_variation2.php.expectf index ae2483fe9..9f2cad890 100644 --- a/hphp/test/zend/bad/ext-standard-array/count_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/count_variation2.php.expectf @@ -46,27 +46,27 @@ int(5) int(3) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- @@ -76,6 +76,6 @@ int(3) int(3) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/count_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/count_variation3.php.expectf index d37ce383e..da358cf57 100644 --- a/hphp/test/zend/bad/ext-standard-array/count_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/count_variation3.php.expectf @@ -4,6 +4,6 @@ int(4) -- $mode = 1: -- -HipHop Warning: %a +HipHop Warning: %s int(12) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/current_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/current_variation1.php.expectf index e9003967c..9b2b56c5f 100644 --- a/hphp/test/zend/bad/ext-standard-array/current_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/current_variation1.php.expectf @@ -1,97 +1,97 @@ *** Testing current() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/each.php.expectf b/hphp/test/zend/bad/ext-standard-array/each.php.expectf index b3d32dafb..cf1fb38db 100644 Binary files a/hphp/test/zend/bad/ext-standard-array/each.php.expectf and b/hphp/test/zend/bad/ext-standard-array/each.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-array/each_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/each_variation1.php.expectf index 99025e012..4f2c3d0e0 100644 --- a/hphp/test/zend/bad/ext-standard-array/each_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/each_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing each() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/end_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/end_variation1.php.expectf index eae70547c..bff1622ce 100644 --- a/hphp/test/zend/bad/ext-standard-array/end_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/end_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing end() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- string(12) "hello, world" -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/extract_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/extract_error.php.expectf index ae5847dd7..78fce9414 100644 --- a/hphp/test/zend/bad/ext-standard-array/extract_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/extract_error.php.expectf @@ -1,17 +1,17 @@ *** Testing Error Conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/in_array_errors.php.expectf b/hphp/test/zend/bad/ext-standard-array/in_array_errors.php.expectf index 291cb5d9d..2420d679c 100644 --- a/hphp/test/zend/bad/ext-standard-array/in_array_errors.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/in_array_errors.php.expectf @@ -1,12 +1,12 @@ *** Testing error conditions of in_array() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/in_array_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-array/in_array_variation3.php.expectf index f9935ccae..ff2437700 100644 --- a/hphp/test/zend/bad/ext-standard-array/in_array_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/in_array_variation3.php.expectf @@ -4,9 +4,9 @@ bool(true) bool(true) *** Testing objects with in_array() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/key_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/key_variation1.php.expectf index 8254ca9ab..7a89768d2 100644 --- a/hphp/test/zend/bad/ext-standard-array/key_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/key_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing key() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- string(4) "var1" -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/krsort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/krsort_error.php.expectf index 569c69999..6b8c2eaf3 100644 --- a/hphp/test/zend/bad/ext-standard-array/krsort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/krsort_error.php.expectf @@ -1,13 +1,13 @@ *** Testing krsort() : error conditions *** -- Testing krsort() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing krsort() function with more than expected no. of arguments -- - Sort flag = SORT_REGULAR - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> @@ -17,7 +17,7 @@ array(2) { } - Sort flag = SORT_STRING - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> @@ -27,7 +27,7 @@ array(2) { } - Sort flag = SORT_NUMERIC - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> diff --git a/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php b/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php index 53d128968..8bd03ebc6 100644 --- a/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php @@ -66,7 +66,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php.expectf index 324b6ea4a..2813cbb38 100644 --- a/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/krsort_variation2.php.expectf @@ -122,7 +122,7 @@ array(3) { int(2) } -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -133,7 +133,7 @@ array(3) { int(45) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -144,7 +144,7 @@ array(3) { int(45) } -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -155,7 +155,7 @@ array(3) { int(45) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -166,7 +166,7 @@ array(3) { int(45) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -177,7 +177,7 @@ array(3) { int(45) } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -188,7 +188,7 @@ array(3) { int(45) } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -199,7 +199,7 @@ array(3) { int(45) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> diff --git a/hphp/test/zend/bad/ext-standard-array/ksort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/ksort_error.php.expectf index fa0ad6f2d..100710f50 100644 --- a/hphp/test/zend/bad/ext-standard-array/ksort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/ksort_error.php.expectf @@ -1,13 +1,13 @@ *** Testing ksort() : error conditions *** -- Testing ksort() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing ksort() function with more than expected no. of arguments -- - Sort flag = SORT_REGULAR - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> @@ -17,7 +17,7 @@ array(2) { } - Sort flag = SORT_STRING - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> @@ -27,7 +27,7 @@ array(2) { } - Sort flag = SORT_NUMERIC - -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [1]=> diff --git a/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php b/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php index 7f03beaa0..d143e55c6 100644 --- a/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php @@ -66,7 +66,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when 'sort_flags' arugment is supplied with different values +// when 'sort_flags' argument is supplied with different values echo "\n-- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php.expectf index 97a7a2d74..93e1cca10 100644 --- a/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/ksort_variation2.php.expectf @@ -122,7 +122,7 @@ array(3) { int(45) } -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -133,7 +133,7 @@ array(3) { int(45) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -144,7 +144,7 @@ array(3) { int(45) } -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -155,7 +155,7 @@ array(3) { int(45) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -166,7 +166,7 @@ array(3) { int(45) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -177,7 +177,7 @@ array(3) { int(45) } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -188,7 +188,7 @@ array(3) { int(45) } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> @@ -199,7 +199,7 @@ array(3) { int(45) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [10]=> diff --git a/hphp/test/zend/bad/ext-standard-array/max_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/max_error.php.expectf index 16d5a6708..753561599 100644 --- a/hphp/test/zend/bad/ext-standard-array/max_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/max_error.php.expectf @@ -1,9 +1,9 @@ *** Testing Error Conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/min_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/min_error.php.expectf index 16d5a6708..753561599 100644 --- a/hphp/test/zend/bad/ext-standard-array/min_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/min_error.php.expectf @@ -1,9 +1,9 @@ *** Testing Error Conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/natcasesort_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/natcasesort_variation1.php.expectf index b8f97f4dd..09d86d945 100644 --- a/hphp/test/zend/bad/ext-standard-array/natcasesort_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/natcasesort_variation1.php.expectf @@ -1,101 +1,101 @@ *** Testing natcasesort() : usage variation *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(true) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/next_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/next_variation1.php.expectf index 81f4e540d..30b18ff2d 100644 --- a/hphp/test/zend/bad/ext-standard-array/next_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/next_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing next() : variation *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/prev_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/prev_variation1.php.expectf index 2836f64ca..ded24e479 100644 --- a/hphp/test/zend/bad/ext-standard-array/prev_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/prev_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing prev() : variation *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/reset_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/reset_variation1.php.expectf index 444454f6d..693bb675b 100644 --- a/hphp/test/zend/bad/ext-standard-array/reset_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/reset_variation1.php.expectf @@ -1,100 +1,100 @@ *** Testing reset() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/rsort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/rsort_error.php.expectf index 595b33488..bdf007418 100644 --- a/hphp/test/zend/bad/ext-standard-array/rsort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/rsort_error.php.expectf @@ -1,11 +1,11 @@ *** Testing rsort() : error conditions *** -- Testing rsort() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing rsort() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/rsort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/rsort_variation2.php.expectf index a1503f294..1c24116f9 100644 --- a/hphp/test/zend/bad/ext-standard-array/rsort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/rsort_variation2.php.expectf @@ -226,7 +226,7 @@ array(5) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -242,7 +242,7 @@ array(5) { } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -258,7 +258,7 @@ array(5) { } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -274,7 +274,7 @@ array(5) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -290,7 +290,7 @@ array(5) { } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -306,7 +306,7 @@ array(5) { } -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> @@ -352,7 +352,7 @@ array(5) { } -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(5) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/shuffle_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/shuffle_error.php.expectf index d224cdfb7..7554f853a 100644 --- a/hphp/test/zend/bad/ext-standard-array/shuffle_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/shuffle_error.php.expectf @@ -1,11 +1,11 @@ *** Testing shuffle() : error conditions *** -- Testing shuffle() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing shuffle() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- original input array -- diff --git a/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php b/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php index 3531eecc3..f5ad6e46a 100644 --- a/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php +++ b/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php @@ -51,7 +51,7 @@ $values = array ( /* 20 */ $fp ); -// loop through the each element of the $values array for 'var' arugment +// loop through the each element of the $values array for 'var' argument // and check the functionality of sizeof() $counter = 1; foreach($values as $value) diff --git a/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php.expectf index 93b476808..9547ba1ac 100644 --- a/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/sizeof_variation4.php.expectf @@ -2,262 +2,262 @@ --- Testing sizeof() for all kinds of unset variables in default, Normal and Recursive Modes --- -- Iteration 1 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 2 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 3 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 4 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 5 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 6 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 7 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 8 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 9 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 10 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 11 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 12 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 13 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 14 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 15 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 16 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 17 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 18 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 19 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 20 -- Default Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_NORMAL Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) COUNT_RECURSIVE Mode: -HipHop Notice: %a +HipHop Notice: %s int(0) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/sizeof_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-array/sizeof_variation5.php.expectf index 4d85e6dc6..6821f9ae1 100644 --- a/hphp/test/zend/bad/ext-standard-array/sizeof_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/sizeof_variation5.php.expectf @@ -31,23 +31,23 @@ int(6) -- Iteration 15 -- int(6) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- int(6) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/sort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/sort_error.php.expectf index ca7150f51..357f2b8d8 100644 --- a/hphp/test/zend/bad/ext-standard-array/sort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/sort_error.php.expectf @@ -1,13 +1,13 @@ *** Testing sort() : error conditions *** -- Testing sort() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing sort() function with more than expected no. of arguments -- Sort flag = SORT_REGULAR -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -17,7 +17,7 @@ array(2) { } Sort flag = SORT_STRING -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> @@ -27,7 +27,7 @@ array(2) { } Sort flag = SORT_NUMERIC -HipHop Warning: %a +HipHop Warning: %s bool(false) array(2) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/sort_variation2.php b/hphp/test/zend/bad/ext-standard-array/sort_variation2.php index 0fd76de45..1fb2fddde 100644 --- a/hphp/test/zend/bad/ext-standard-array/sort_variation2.php +++ b/hphp/test/zend/bad/ext-standard-array/sort_variation2.php @@ -66,7 +66,7 @@ $unexpected_values = array( ); // loop though each element of the array and check the working of sort() -// when $flag arugment is supplied with different values +// when $flag argument is supplied with different values echo "\n-- Testing sort() by supplying different unexpected values for 'flag' argument --\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-array/sort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/sort_variation2.php.expectf index 5d1a78049..77406fce7 100644 --- a/hphp/test/zend/bad/ext-standard-array/sort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/sort_variation2.php.expectf @@ -122,7 +122,7 @@ array(3) { int(45) } -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -133,7 +133,7 @@ array(3) { int(45) } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -144,7 +144,7 @@ array(3) { int(45) } -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -155,7 +155,7 @@ array(3) { int(45) } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -166,7 +166,7 @@ array(3) { int(45) } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -177,7 +177,7 @@ array(3) { int(45) } -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -188,7 +188,7 @@ array(3) { int(45) } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> @@ -199,7 +199,7 @@ array(3) { int(45) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) array(3) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_error.php b/hphp/test/zend/bad/ext-standard-array/uasort_error.php index dbd6ff3ae..005504dcc 100644 --- a/hphp/test/zend/bad/ext-standard-array/uasort_error.php +++ b/hphp/test/zend/bad/ext-standard-array/uasort_error.php @@ -47,7 +47,7 @@ var_dump( uasort($array_arg) ); echo "-- Testing uasort() function with non-existent compare function --\n"; var_dump( uasort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "-- Testing uasort() function with non-existent compare function and extra argument --\n"; var_dump( uasort($array_arg, 'non_existent', $extra_arg) ); diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_error.php.expectf b/hphp/test/zend/bad/ext-standard-array/uasort_error.php.expectf index 49cbfdeec..07fc856b0 100644 --- a/hphp/test/zend/bad/ext-standard-array/uasort_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uasort_error.php.expectf @@ -1,17 +1,17 @@ *** Testing uasort() : error conditions *** -- Testing uasort() function with Zero argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uasort() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uasort() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uasort() function with non-existent compare function -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uasort() function with non-existent compare function and extra argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/uasort_variation1.php.expectf index f05c70df3..cd9a01c96 100644 --- a/hphp/test/zend/bad/ext-standard-array/uasort_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uasort_variation1.php.expectf @@ -1,68 +1,68 @@ *** Testing uasort() : unexpected values for 'array_arg' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/uasort_variation2.php.expectf index 9686bccd2..f2199345a 100644 --- a/hphp/test/zend/bad/ext-standard-array/uasort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uasort_variation2.php.expectf @@ -1,86 +1,86 @@ *** Testing uasort() : Unexpected values in place of comparison function *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/uasort_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-array/uasort_variation8.php.expectf index cb2045ea3..c48cbb3f2 100644 --- a/hphp/test/zend/bad/ext-standard-array/uasort_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uasort_variation8.php.expectf @@ -28,9 +28,9 @@ array(5) { string(6) "orange" } -- Testing uasort() with language construct as 'cmp_function' -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uasort() with language construct as 'cmp_function' -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/uksort_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/uksort_variation1.php.expectf index b895fc4f4..e5701bc5c 100644 --- a/hphp/test/zend/bad/ext-standard-array/uksort_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uksort_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing uksort() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/uksort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/uksort_variation2.php.expectf index e39321dcd..f782d4d46 100644 --- a/hphp/test/zend/bad/ext-standard-array/uksort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/uksort_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing uksort() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/unexpected_array_mod_bug.php.expectf b/hphp/test/zend/bad/ext-standard-array/unexpected_array_mod_bug.php.expectf index 354edaff8..c545a90e5 100644 --- a/hphp/test/zend/bad/ext-standard-array/unexpected_array_mod_bug.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/unexpected_array_mod_bug.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/usort_error2.php b/hphp/test/zend/bad/ext-standard-array/usort_error2.php index c3c3ebfa3..d6c369bc7 100644 --- a/hphp/test/zend/bad/ext-standard-array/usort_error2.php +++ b/hphp/test/zend/bad/ext-standard-array/usort_error2.php @@ -33,7 +33,7 @@ $extra_arg = 10; echo "\n-- Testing usort() function with non-existent compare function --\n"; var_dump( usort($array_arg, 'non_existent') ); -// With non existent comparison function and extra arguemnt +// With non existent comparison function and extra argument echo "\n-- Testing usort() function with non-existent compare function and extra argument --\n"; var_dump( usort($array_arg, 'non_existent', $extra_arg) ); ?> diff --git a/hphp/test/zend/bad/ext-standard-array/usort_error2.php.expectf b/hphp/test/zend/bad/ext-standard-array/usort_error2.php.expectf index 22be0030b..4adf2a1fd 100644 --- a/hphp/test/zend/bad/ext-standard-array/usort_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/usort_error2.php.expectf @@ -1,10 +1,10 @@ *** Testing usort() : error conditions *** -- Testing usort() function with non-existent compare function -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing usort() function with non-existent compare function and extra argument -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/usort_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-array/usort_variation1.php.expectf index cc2b10338..ee2047336 100644 --- a/hphp/test/zend/bad/ext-standard-array/usort_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/usort_variation1.php.expectf @@ -1,101 +1,101 @@ *** Testing usort() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- bool(true) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/usort_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-array/usort_variation2.php.expectf index 8960e12e1..2132fa006 100644 --- a/hphp/test/zend/bad/ext-standard-array/usort_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/usort_variation2.php.expectf @@ -1,114 +1,114 @@ *** Testing usort() : usage variation *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/usort_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-array/usort_variation8.php.expectf index e6d550b3f..0dcbdfedc 100644 --- a/hphp/test/zend/bad/ext-standard-array/usort_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-array/usort_variation8.php.expectf @@ -31,10 +31,10 @@ array(5) { } -- Testing usort() with language construct as 'cmp_function' -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing usort() with language construct as 'cmp_function' -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/forward_static_call_002.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/forward_static_call_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/forward_static_call_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/forward_static_call_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_class_error_001.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/get_class_error_001.php.expectf index aacd6929b..c5485e836 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/get_class_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/get_class_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing get_class() : error conditions *** -- Testing get_class() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_class_variation_001.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/get_class_variation_001.php.expectf index 53eb893c4..5d2bb07df 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/get_class_variation_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/get_class_variation_001.php.expectf @@ -1,108 +1,108 @@ *** Testing get_class() : usage variations *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s Arg value: 0 (type: integer) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 1 (type: integer) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 12345 (type: integer) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: -2345 (type: integer) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 10.5 (type: double) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: -10.5 (type: double) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 101234567000 (type: double) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 1.07654321E-9 (type: double) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 0.5 (type: double) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: Array (type: array) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: Array (type: array) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: Array (type: array) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: Array (type: array) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: Array (type: array) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: NULL) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: NULL) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 1 (type: boolean) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: boolean) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: 1 (type: boolean) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: boolean) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: string) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: string) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: string (type: string) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: string (type: string) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: NULL) -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value: (type: NULL) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_class_vars_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/get_class_vars_variation1.php.expectf index 3f7d67f49..8ae388540 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/get_class_vars_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/get_class_vars_variation1.php.expectf @@ -28,19 +28,19 @@ bool(false) bool(false) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -71,7 +71,7 @@ bool(false) bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- diff --git a/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation1.php.expectf index 1becf90eb..1ce5bdc20 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation1.php.expectf @@ -28,19 +28,19 @@ bool(false) bool(false) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -71,7 +71,7 @@ bool(false) bool(false) --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- diff --git a/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation2.php.expectf index e9fb6b614..8168b3465 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/interface_exists_variation2.php.expectf @@ -28,19 +28,19 @@ bool(false) bool(false) --empty array-- -HipHop Warning: %a +HipHop Warning: %s NULL --int indexed array-- -HipHop Warning: %a +HipHop Warning: %s NULL --associative array-- -HipHop Warning: %a +HipHop Warning: %s NULL --nested arrays-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- @@ -80,11 +80,11 @@ bool(false) bool(false) --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- diff --git a/hphp/test/zend/bad/ext-standard-class_object/is_subclass_of_error_001.php.expectf b/hphp/test/zend/bad/ext-standard-class_object/is_subclass_of_error_001.php.expectf index 3ec117960..c8c84e83f 100644 --- a/hphp/test/zend/bad/ext-standard-class_object/is_subclass_of_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-class_object/is_subclass_of_error_001.php.expectf @@ -1,17 +1,17 @@ *** Testing is_subclass_of() : error conditions *** -- Testing is_subclass_of() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing is_subclass_of() function with more than typo style invalid 3rd argument -- bool(false) -- Testing is_subclass_of() function with more than invalid 3rd argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing is_subclass_of() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/chdir_basic.php b/hphp/test/zend/bad/ext-standard-dir/chdir_basic.php similarity index 98% rename from hphp/test/zend/good/ext-standard-dir/chdir_basic.php rename to hphp/test/zend/bad/ext-standard-dir/chdir_basic.php index b4140ee3f..53cfa4414 100644 --- a/hphp/test/zend/good/ext-standard-dir/chdir_basic.php +++ b/hphp/test/zend/bad/ext-standard-dir/chdir_basic.php @@ -30,7 +30,8 @@ echo "\n-- Testing chdir() with relative paths: --\n"; var_dump(chdir($level_two_dir_name)); var_dump(getcwd()); ?> -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/closedir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/closedir_variation2.php.expectf index 30a32bb0f..a46821159 100644 --- a/hphp/test/zend/bad/ext-standard-dir/closedir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/closedir_variation2.php.expectf @@ -5,7 +5,7 @@ NULL Directory Handle: resource(%d) of type (Unknown) -- Close directory handle second time: -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Directory Handle: resource(%d) of type (Unknown) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/closedir_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-dir/closedir_variation3.php.expectf index 36fa23fbf..950c37e2b 100644 --- a/hphp/test/zend/bad/ext-standard-dir/closedir_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/closedir_variation3.php.expectf @@ -4,7 +4,7 @@ resource(%d) of type (stream) -- Try to close the file pointer using closedir() -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Check file pointer: -- diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_basic.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_basic.php.expectf index e08b0aa4e..59171c8da 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_basic.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_basic.php.expectf @@ -26,6 +26,6 @@ object(Directory)#%d (2) { } Test read after closing the dir: -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_error.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_error.php.expectf index 80fa2ea29..1091ac3db 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_error.php.expectf @@ -1,10 +1,10 @@ *** Testing dir() : error conditions *** -- Testing dir() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing dir() function with one more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation1.php.expectf index f9ea998b3..d209b64b1 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation1.php.expectf @@ -1,23 +1,23 @@ *** Testing dir() : unexpected values for $directory argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- @@ -27,14 +27,14 @@ bool(false) bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- @@ -53,14 +53,14 @@ bool(false) bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation2.php.expectf index 56db7950c..27b0470a2 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation2.php.expectf @@ -1,114 +1,114 @@ *** Testing dir() : unexpected values for $context argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation5.php.expectf index 7853a937b..e6ade1a22 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation5.php.expectf @@ -1,4 +1,4 @@ *** Testing dir() : open a file instead of a directory *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation6.php.expectf index 21f6141e2..aa79a6275 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation6.php.expectf @@ -1,8 +1,8 @@ *** Testing dir() : open a non-existent directory *** -- opening previously removed directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- opening non-existent directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation7.php.expectf index f8c92a5a3..951005039 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation7.php.expectf @@ -1,8 +1,8 @@ *** Testing dir() : remove execute permission from the parent dir *** -- After restricting 1st level parent directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- After restricting parent directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation8.php.expectf index e87205a54..48fc7a041 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation8.php.expectf @@ -1,12 +1,12 @@ *** Testing dir() : checking with wildcard characters *** -- wildcard = '*' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- wildcard = '?' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/dir_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-dir/dir_variation9.php.expectf index fe7de0896..0a29ca311 100644 --- a/hphp/test/zend/bad/ext-standard-dir/dir_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/dir_variation9.php.expectf @@ -27,12 +27,12 @@ object(Directory)#%d (2) { } -- With invalid paths -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/getcwd_basic.php b/hphp/test/zend/bad/ext-standard-dir/getcwd_basic.php similarity index 96% rename from hphp/test/zend/good/ext-standard-dir/getcwd_basic.php rename to hphp/test/zend/bad/ext-standard-dir/getcwd_basic.php index 8dec84ffe..90ac8044c 100644 --- a/hphp/test/zend/good/ext-standard-dir/getcwd_basic.php +++ b/hphp/test/zend/bad/ext-standard-dir/getcwd_basic.php @@ -18,7 +18,8 @@ var_dump(getcwd()); chdir($directory); var_dump(getcwd()); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/getcwd_basic.php.expectf b/hphp/test/zend/bad/ext-standard-dir/getcwd_basic.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-dir/getcwd_basic.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/getcwd_basic.php.expectf diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_basic.php b/hphp/test/zend/bad/ext-standard-dir/opendir_basic.php index 2f69b3df8..47424cd97 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_basic.php +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_basic.php @@ -36,7 +36,8 @@ var_dump($dh1); closedir($dh2); var_dump($dh2); ?> -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/opendir_error1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/opendir_error1.php.expectf similarity index 83% rename from hphp/test/zend/good/ext-standard-dir/opendir_error1.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/opendir_error1.php.expectf index 85214798d..f492b98fd 100644 --- a/hphp/test/zend/good/ext-standard-dir/opendir_error1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing opendir() : error conditions *** -- Testing opendir() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing opendir() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_error2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/opendir_error2.php.expectf index 068b75aee..68a745ef9 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_error2.php.expectf @@ -1,10 +1,10 @@ *** Testing opendir() : error conditions *** -- Pass a non-existent absolute path: -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Pass a non-existent relative path: -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php b/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php index c2f15521d..30d7fc588 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php @@ -101,7 +101,8 @@ foreach($inputs as $input) { fclose($fp); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php.expectf index dd4186fcd..45c7fe1f5 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation1.php.expectf @@ -1,39 +1,39 @@ *** Testing opendir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- @@ -43,14 +43,14 @@ bool(false) bool(false) -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- bool(false) -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- @@ -63,14 +63,14 @@ bool(false) bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- resource(%d) of type (stream) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- @@ -86,6 +86,6 @@ bool(false) bool(false) -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php b/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php index 47fa1fa0a..7bb824633 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php @@ -100,7 +100,8 @@ foreach($inputs as $input) { fclose($fp); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php.expectf index cfae80771..6fd1522ba 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing opendir() : usage variation *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s resource(%d) of type (stream) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation3.php b/hphp/test/zend/bad/ext-standard-dir/opendir_variation3.php index a205dd158..f28997ca5 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation3.php +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation3.php @@ -28,7 +28,8 @@ if ($dh1 !== $dh2) { closedir($dh1); closedir($dh2); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/opendir_variation4.php b/hphp/test/zend/bad/ext-standard-dir/opendir_variation4.php index f3fa039d3..7fcbb2ab2 100644 --- a/hphp/test/zend/bad/ext-standard-dir/opendir_variation4.php +++ b/hphp/test/zend/bad/ext-standard-dir/opendir_variation4.php @@ -66,7 +66,8 @@ function clean_dh($dh){ unset($dh); } ?> -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_error.php b/hphp/test/zend/bad/ext-standard-dir/readdir_error.php index acaaae95e..402c7998d 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_error.php +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_error.php @@ -24,7 +24,8 @@ var_dump( readdir($dir_handle, $extra_arg) ); // close the handle so can remove dir in CLEAN section closedir($dir_handle); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_error.php.expectf b/hphp/test/zend/bad/ext-standard-dir/readdir_error.php.expectf index b56850037..01cf794c0 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_error.php.expectf @@ -1,6 +1,6 @@ *** Testing readdir() : error conditions *** -- Testing readdir() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/readdir_variation1.php.expectf index c6e142bd9..267148998 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing readdir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/readdir_variation2.php b/hphp/test/zend/bad/ext-standard-dir/readdir_variation2.php similarity index 97% rename from hphp/test/zend/good/ext-standard-dir/readdir_variation2.php rename to hphp/test/zend/bad/ext-standard-dir/readdir_variation2.php index a89db28f6..45d578466 100644 --- a/hphp/test/zend/good/ext-standard-dir/readdir_variation2.php +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_variation2.php @@ -30,7 +30,8 @@ foreach($entries as $entry) { var_dump($entry); } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/readdir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/readdir_variation2.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-dir/readdir_variation2.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/readdir_variation2.php.expectf diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_variation3.php b/hphp/test/zend/bad/ext-standard-dir/readdir_variation3.php index 80eda722a..c069b455e 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_variation3.php +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_variation3.php @@ -40,7 +40,8 @@ delete_files($path_sub, 2); closedir($dir_handle); ?> -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/readdir_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-dir/readdir_variation4.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-dir/readdir_variation4.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/readdir_variation4.php.expectf diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_variation5.php b/hphp/test/zend/bad/ext-standard-dir/readdir_variation5.php index 1533fde1f..ff75705f5 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_variation5.php +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_variation5.php @@ -55,7 +55,8 @@ foreach($permission_values as $perm) { $iterator++; } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/readdir_variation6.php b/hphp/test/zend/bad/ext-standard-dir/readdir_variation6.php index fc5ef2dff..b74f426a4 100644 --- a/hphp/test/zend/bad/ext-standard-dir/readdir_variation6.php +++ b/hphp/test/zend/bad/ext-standard-dir/readdir_variation6.php @@ -52,7 +52,8 @@ delete_files($dir_path, 3, "readdir_variation6"); closedir($dir_handle1); closedir(); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/rewinddir_basic.php b/hphp/test/zend/bad/ext-standard-dir/rewinddir_basic.php index 95b538a8f..402e5014a 100644 --- a/hphp/test/zend/bad/ext-standard-dir/rewinddir_basic.php +++ b/hphp/test/zend/bad/ext-standard-dir/rewinddir_basic.php @@ -54,7 +54,8 @@ closedir($dh2); delete_files($dir_path1, 1); delete_files($dir_path2, 1, 'file', 2); ?> -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/rewinddir_error.php.expectf b/hphp/test/zend/bad/ext-standard-dir/rewinddir_error.php.expectf similarity index 87% rename from hphp/test/zend/good/ext-standard-dir/rewinddir_error.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/rewinddir_error.php.expectf index e06351060..1aa7e0e6d 100644 --- a/hphp/test/zend/good/ext-standard-dir/rewinddir_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/rewinddir_error.php.expectf @@ -1,6 +1,6 @@ *** Testing rewinddir() : error conditions *** -- Testing rewinddir() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php index e000fbfe9..0d1ad4d6b 100644 --- a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php +++ b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php @@ -22,7 +22,8 @@ closedir($dir_handle); echo "\n-- Call to rewinddir() --\n"; var_dump(rewinddir($dir_handle)); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php.expectf index 0bf0b856b..788f11ee9 100644 --- a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation2.php.expectf @@ -5,6 +5,6 @@ resource(%d) of type (stream) string(%d) "%s" -- Call to rewinddir() -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation3.php.expectf index f755c197f..494b0006d 100644 --- a/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/rewinddir_variation3.php.expectf @@ -2,7 +2,7 @@ -- Open a file using fopen -- resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Check if rewinddir() has repositioned the file pointer -- diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_basic.php b/hphp/test/zend/bad/ext-standard-dir/scandir_basic.php index 153b27ddf..268a54023 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_basic.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_basic.php @@ -28,7 +28,8 @@ var_dump(scandir($directory, $sorting_order, $context)); delete_files($directory, 3); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/scandir_error1.php b/hphp/test/zend/bad/ext-standard-dir/scandir_error1.php similarity index 97% rename from hphp/test/zend/good/ext-standard-dir/scandir_error1.php rename to hphp/test/zend/bad/ext-standard-dir/scandir_error1.php index 32d5e39c0..921400aa4 100644 --- a/hphp/test/zend/good/ext-standard-dir/scandir_error1.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_error1.php @@ -23,7 +23,8 @@ $context = stream_context_create(); $extra_arg = 10; var_dump( scandir($dir, $sorting_order, $context, $extra_arg) ); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/scandir_error1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_error1.php.expectf similarity index 83% rename from hphp/test/zend/good/ext-standard-dir/scandir_error1.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/scandir_error1.php.expectf index 4e02788bd..869865f19 100644 --- a/hphp/test/zend/good/ext-standard-dir/scandir_error1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing scandir() : error conditions *** -- Testing scandir() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing scandir() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_error2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_error2.php.expectf index cf777ce08..dae5004da 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_error2.php.expectf @@ -1,12 +1,12 @@ *** Testing scandir() : error conditions *** -- Pass scandir() an absolute path that does not exist -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Pass scandir() a relative path that does not exist -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_variation1.php.expectf index 3354a2834..b352f4b11 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation1.php.expectf @@ -1,117 +1,117 @@ *** Testing scandir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- 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: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation10.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation10.php index 3cd6560b2..fe3d2b9d5 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation10.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation10.php @@ -37,7 +37,8 @@ var_dump(in_array('file2.tmp', $files)); delete_files($dir, 2); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php index 87c16be6e..67e0011ef 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php @@ -93,7 +93,8 @@ foreach($inputs as $input) { fclose($fp); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php.expectf index 0aa1bad5c..7e4d7a356 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation2.php.expectf @@ -121,31 +121,31 @@ array(2) { } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- @@ -165,6 +165,6 @@ array(2) { } -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php index e1b98fc81..ef3b93e4a 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php @@ -94,7 +94,8 @@ foreach($inputs as $input) { fclose($fp); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php.expectf index b062ad00c..174833257 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation3.php.expectf @@ -1,103 +1,103 @@ *** Testing scandir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s array(2) { [0]=> string(1) "." diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation4.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation4.php index 41f808043..077f502ef 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation4.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation4.php @@ -55,7 +55,8 @@ var_dump(scandir('../../level_one')); @delete_files($level_one_dir_path, 2, 'level_one'); @delete_files($level_two_dir_path, 2, 'level_two'); ?> -===DONE=== + -===DONE=== + -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/scandir_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_variation7.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-dir/scandir_variation7.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/scandir_variation7.php.expectf diff --git a/hphp/test/zend/good/ext-standard-dir/scandir_variation8.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation8.php similarity index 98% rename from hphp/test/zend/good/ext-standard-dir/scandir_variation8.php rename to hphp/test/zend/bad/ext-standard-dir/scandir_variation8.php index 136ff4780..9ba1976e0 100644 --- a/hphp/test/zend/good/ext-standard-dir/scandir_variation8.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation8.php @@ -62,7 +62,8 @@ foreach ($content as $file_name) { @unlink($dir_path . $file_name); } ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/scandir_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-dir/scandir_variation8.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-standard-dir/scandir_variation8.php.expectf rename to hphp/test/zend/bad/ext-standard-dir/scandir_variation8.php.expectf diff --git a/hphp/test/zend/bad/ext-standard-dir/scandir_variation9.php b/hphp/test/zend/bad/ext-standard-dir/scandir_variation9.php index 7aa15a8ae..79a4b0e8d 100644 --- a/hphp/test/zend/bad/ext-standard-dir/scandir_variation9.php +++ b/hphp/test/zend/bad/ext-standard-dir/scandir_variation9.php @@ -28,7 +28,8 @@ foreach($ints as $sorting_order) { delete_files($dir, 2); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_basic_001.php.expectf b/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_basic_001.php.expectf index 965a73348..bb8fa4006 100644 --- a/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_basic_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_basic_001.php.expectf @@ -39,5 +39,5 @@ Class [ class Directory ] { Cannot instantiate a valid Directory directly: object(Directory)#%d (0) { } -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_error_001.php.expectf b/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_error_001.php.expectf index 0f7d3755e..36c3c5a73 100644 --- a/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-directory/DirectoryClass_error_001.php.expectf @@ -1,23 +1,23 @@ --> Try all methods with bad handle: -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --> Try all methods with no handle: -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) --> Try all methods with wrong number of args: -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/005_error.php b/hphp/test/zend/bad/ext-standard-file/005_error.php index eaf1ebd27..5e0283054 100644 --- a/hphp/test/zend/bad/ext-standard-file/005_error.php +++ b/hphp/test/zend/bad/ext-standard-file/005_error.php @@ -20,7 +20,7 @@ echo "*** Testing error conditions ***\n"; echo "\n-- Testing with Non-existing files --"; -/* Both invalid argumetns */ +/* Both invalid arguments */ var_dump( fileatime("/no/such/file/or/dir") ); var_dump( filemtime("/no/such/file/or/dir") ); var_dump( filectime("/no/such/file/or/dir") ); diff --git a/hphp/test/zend/bad/ext-standard-file/005_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/005_error.php.expectf index d8c407b5e..8cb45ec8a 100644 --- a/hphp/test/zend/bad/ext-standard-file/005_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/005_error.php.expectf @@ -1,49 +1,49 @@ *** Testing error conditions *** -- Testing with Non-existing files -- -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 NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing No.of arguments less than expected -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing No.of arguments greater than expected -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/005_variation2-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/005_variation2-win32.php.expectf index d5a7853cd..f6da06856 100644 --- a/hphp/test/zend/bad/ext-standard-file/005_variation2-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/005_variation2-win32.php.expectf @@ -18,31 +18,31 @@ -- File ' ' -- -- File access time is => -HipHop Warning: %a +HipHop Warning: %s -- File modification time is => -HipHop Warning: %a +HipHop Warning: %s -- inode change time is => -HipHop Warning: %a +HipHop Warning: %s -- File '|' -- -- File access time is => -HipHop Warning: %a +HipHop Warning: %s -- File modification time is => -HipHop Warning: %a +HipHop Warning: %s -- inode change time is => -HipHop Warning: %a +HipHop Warning: %s *** testing touch ***bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/006_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/006_error.php.expectf index 76a6ba5c1..a853a4928 100644 --- a/hphp/test/zend/bad/ext-standard-file/006_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/006_error.php.expectf @@ -1,28 +1,28 @@ *** Testing error conditions for fileperms(), chmod() *** -HipHop Warning: %a +HipHop Warning: %s bool(false) 100%d44 -HipHop Warning: %a +HipHop Warning: %s bool(false) 40755 -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/006_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/006_variation2.php.expectf index 7dc978142..439c53727 100644 --- a/hphp/test/zend/bad/ext-standard-file/006_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/006_variation2.php.expectf @@ -57,31 +57,31 @@ bool(true) bool(true) 43567 -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL 103567 -HipHop Warning: %a +HipHop Warning: %s NULL 43567 -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL 103567 -HipHop Warning: %a +HipHop Warning: %s NULL 43567 -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL 103567 -HipHop Warning: %a +HipHop Warning: %s NULL 43567 -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL 103567 -HipHop Warning: %a +HipHop Warning: %s NULL 43567 *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_basic.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_basic.php.expectf index 9efb06005..f5b78b929 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_basic.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_basic.php.expectf @@ -6,9 +6,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'wb' -- @@ -17,9 +17,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'wt' -- @@ -28,9 +28,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'w+' -- @@ -39,9 +39,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'w+b' -- @@ -50,9 +50,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'w+t' -- @@ -61,9 +61,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'r' -- @@ -72,9 +72,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'rb' -- @@ -83,9 +83,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'rt' -- @@ -94,9 +94,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'r+' -- @@ -105,9 +105,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'r+b' -- @@ -116,9 +116,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'r+t' -- @@ -127,9 +127,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'a' -- @@ -138,9 +138,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'ab' -- @@ -149,9 +149,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'at' -- @@ -160,9 +160,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'a+' -- @@ -171,9 +171,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'a+t' -- @@ -182,9 +182,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'a+b' -- @@ -193,9 +193,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration with mode 'x' -- @@ -204,9 +204,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) @@ -216,9 +216,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) @@ -228,9 +228,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) @@ -240,9 +240,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) @@ -252,9 +252,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) @@ -264,9 +264,9 @@ int(0) bool(false) bool(true) resource(%d) of type (Unknown) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) resource(%d) of type (Unknown) diff --git a/hphp/test/zend/bad/ext-standard-file/007_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_error.php.expectf index b9a2f40a5..577a9718e 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_error.php.expectf @@ -1,80 +1,80 @@ *** Testing error conditions for fopen(), fclsoe() & feof() *** -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) -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fopen(), fclose() & feof() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 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) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation1.php b/hphp/test/zend/bad/ext-standard-file/007_variation1.php index 29a088778..41ff18ba3 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation1.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation1.php @@ -32,6 +32,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation10.php b/hphp/test/zend/bad/ext-standard-file/007_variation10.php index ca21d572a..720027a45 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation10.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation10.php @@ -27,13 +27,14 @@ echo "*** Test fopen() & fclose() functions: with 'r+t' mode ***\n"; $file_handle = fopen($file, "r+t"); //opening the file in "r+t" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the end of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation11-win32.php b/hphp/test/zend/bad/ext-standard-file/007_variation11-win32.php index 5f9565d17..6dddae76f 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation11-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation11-win32.php @@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions: with 'wt' mode ***\n"; $file_handle = fopen($file, "wt"); //opening the file "wt" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation11.php b/hphp/test/zend/bad/ext-standard-file/007_variation11.php index 5f9565d17..6dddae76f 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation11.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation11.php @@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions: with 'wt' mode ***\n"; $file_handle = fopen($file, "wt"); //opening the file "wt" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wt") ); //Opening the non-existing file in "wt" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation12-win32.php b/hphp/test/zend/bad/ext-standard-file/007_variation12-win32.php index 56ca5e121..025c2087a 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation12-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation12-win32.php @@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions: with 'w+t' mode ***\n"; $file_handle = fopen($file, "w+t"); //opening the file "w+t" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation12.php b/hphp/test/zend/bad/ext-standard-file/007_variation12.php index 56ca5e121..025c2087a 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation12.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation12.php @@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions: with 'w+t' mode ***\n"; $file_handle = fopen($file, "w+t"); //opening the file "w+t" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+t") ); //Opening the non-existing file in "w+t" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation13-win32.php b/hphp/test/zend/bad/ext-standard-file/007_variation13-win32.php index daf20c3bd..3b1ae7d64 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation13-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation13-win32.php @@ -37,7 +37,8 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation13.php b/hphp/test/zend/bad/ext-standard-file/007_variation13.php index daf20c3bd..3b1ae7d64 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation13.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation13.php @@ -37,7 +37,8 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "at") ); //Opening the non-existing file in "at" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation14.php b/hphp/test/zend/bad/ext-standard-file/007_variation14.php index 654e0c7f8..de4679a51 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation14.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation14.php @@ -36,7 +36,8 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+t") ); //Opening the non-existing file in "a+t" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation15.php b/hphp/test/zend/bad/ext-standard-file/007_variation15.php index 87512c4d6..7a2ba8a8f 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation15.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation15.php @@ -25,15 +25,16 @@ echo "*** Test fopen() & fclose() functions: with 'xt' mode ***\n"; $file_handle = fopen($file, "xt"); //opening the non-existing file in "xt" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xt"); //Opening the existing data file in 'xt' mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation15.php.expectf index 00e9f1a09..5525fd9a5 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation15.php.expectf @@ -8,5 +8,5 @@ string(0) "" int(0) bool(true) %unicode|string%(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation16.php b/hphp/test/zend/bad/ext-standard-file/007_variation16.php index ac719eb5c..849f76c88 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation16.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation16.php @@ -25,7 +25,7 @@ echo "*** Test fopen() & fclose() functions: with 'x+t' mode ***\n"; $file_handle = fopen($file, "x+t"); //opening the non-existing file in "x+t" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -34,6 +34,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+t"); //Opening the existing data file in "x+t" mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation16.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation16.php.expectf index 0dea74126..cecb0d4a7 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation16.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation16.php.expectf @@ -10,5 +10,5 @@ mnopqrst uvwxyz int(37) bool(true) string(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation17.php b/hphp/test/zend/bad/ext-standard-file/007_variation17.php index 6c6256452..39a3f4179 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation17.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation17.php @@ -32,6 +32,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation18.php b/hphp/test/zend/bad/ext-standard-file/007_variation18.php index 98a05f98e..e6eb49f65 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation18.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation18.php @@ -27,13 +27,14 @@ echo "*** Test fopen() & fclose() functions: with 'r+b' mode ***\n"; $file_handle = fopen($file, "r+b"); //opening the file in "r+b" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the end of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation19.php b/hphp/test/zend/bad/ext-standard-file/007_variation19.php index f49281612..aed8f844a 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation19.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation19.php @@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions: with 'wb' mode ***\n"; $file_handle = fopen($file, "wb"); //opening the file "wb" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "wb") ); //Opening the non-existing file in "wb" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation2.php b/hphp/test/zend/bad/ext-standard-file/007_variation2.php index 0032488fd..37ab6f3aa 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation2.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation2.php @@ -27,13 +27,14 @@ echo "*** Test fopen() & fclose() functions: with 'r+' mode ***\n"; $file_handle = fopen($file, "r+"); //opening the file in "r+" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the end of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation20.php b/hphp/test/zend/bad/ext-standard-file/007_variation20.php index 77afb4f96..5960e8249 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation20.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation20.php @@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions: with 'w+b' mode ***\n"; $file_handle = fopen($file, "w+b"); //opening the file "w+b" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+b") ); //Opening the non-existing file in "w+b" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation21.php b/hphp/test/zend/bad/ext-standard-file/007_variation21.php index 256d83d3a..e836b90eb 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation21.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation21.php @@ -37,7 +37,8 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "ab") ); //Opening the non-existing file in "ab" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation22.php b/hphp/test/zend/bad/ext-standard-file/007_variation22.php index 26eb4f9ca..061fbf17a 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation22.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation22.php @@ -36,7 +36,8 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+b") ); //Opening the non-existing file in "a+b" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation23.php b/hphp/test/zend/bad/ext-standard-file/007_variation23.php index 3201c6c67..63b74160b 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation23.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation23.php @@ -25,15 +25,16 @@ echo "*** Test fopen() & fclose() functions: with 'xb' mode ***\n"; $file_handle = fopen($file, "xb"); //opening the non-existing file in "xb" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "xb"); //Opening the existing data file in 'xb' mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation23.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation23.php.expectf index 398172243..6ae006f35 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation23.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation23.php.expectf @@ -8,5 +8,5 @@ string(0) "" int(0) bool(true) %unicode|string%(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation24.php b/hphp/test/zend/bad/ext-standard-file/007_variation24.php index 23efaf968..90fee0342 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation24.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation24.php @@ -25,7 +25,7 @@ echo "*** Test fopen() & fclose() functions: with 'x+b' mode ***\n"; $file_handle = fopen($file, "x+b"); //opening the non-existing file in "x+b" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -34,6 +34,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+b"); //Opening the existing data file in "x+b" mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation24.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation24.php.expectf index 29c19eece..de5274bea 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation24.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation24.php.expectf @@ -10,5 +10,5 @@ mnopqrst uvwxyz int(37) bool(true) string(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation3.php b/hphp/test/zend/bad/ext-standard-file/007_variation3.php index 928fc337c..fd99eed20 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation3.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation3.php @@ -28,12 +28,12 @@ echo "*** Test fopen() & fclose() functions: with 'w' mode ***\n"; $file_handle = fopen($file, "w"); //opening the file "w" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w") ); //Opening the non-existing file in "w" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation4.php b/hphp/test/zend/bad/ext-standard-file/007_variation4.php index 2fbf7f2dc..4f46508a7 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation4.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation4.php @@ -28,7 +28,7 @@ echo "*** Test fopen() & fclose() functions: with 'w+' mode ***\n"; $file_handle = fopen($file, "w+"); //opening the file "w+" mode var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -45,7 +45,8 @@ clearstatcache(); unlink($file); //Deleting the file fclose( fopen($file, "w+") ); //Opening the non-existing file in "w+" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation5.php b/hphp/test/zend/bad/ext-standard-file/007_variation5.php index fb765a2f5..36257f527 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation5.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation5.php @@ -37,7 +37,8 @@ var_dump( filesize($file) ); //Check that data hasn't over written; Expected: Si unlink($file); //Deleting the file fclose( fopen($file, "a") ); //Opening the non-existing file in "a" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation6.php b/hphp/test/zend/bad/ext-standard-file/007_variation6.php index 04b252833..a98305baf 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation6.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation6.php @@ -36,7 +36,8 @@ var_dump( get_resource_type($file_handle) ); //Check whether resource is lost a unlink($file); //Deleting the file fclose( fopen($file, "a+") ); //Opening the non-existing file in "a+" mode, which will be created -var_dump( file_exists($file) ); //Check for the existance of file -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation7.php b/hphp/test/zend/bad/ext-standard-file/007_variation7.php index 8bc10afc8..c428c6055 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation7.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation7.php @@ -25,15 +25,16 @@ echo "*** Test fopen() & fclose() functions: with 'x' mode ***\n"; $file_handle = fopen($file, "x"); //opening the non-existing file in "x" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); var_dump( fread($file_handle, 100) ); //Check for read operation; fails; expected: empty string -var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the begining of the file +var_dump( ftell($file_handle) ); //File pointer position after read operation, expected at the beginning of the file var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x"); //Opening the existing data file in 'x' mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation7.php.expectf index 98998541c..4324522b8 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation7.php.expectf @@ -8,5 +8,5 @@ string(0) "" int(0) bool(true) %unicode|string%(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation8.php b/hphp/test/zend/bad/ext-standard-file/007_variation8.php index db8c4560f..3ce8bce1d 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation8.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation8.php @@ -25,7 +25,7 @@ echo "*** Test fopen() & fclose() functions: with 'x+' mode ***\n"; $file_handle = fopen($file, "x+"); //opening the non-existing file in "x+" mode, file will be created var_dump($file_handle); //Check for the content of handle var_dump( get_resource_type($file_handle) ); //Check for the type of resource -var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the begining of the file +var_dump( ftell($file_handle) ); //Initial file pointer position, expected at the beginning of the file var_dump( fwrite($file_handle, $string) ); //Check for write operation; passes; expected:size of the $string var_dump( ftell($file_handle) ); //File pointer position after write operation, expected at the end of the file rewind($file_handle); @@ -34,6 +34,7 @@ var_dump( ftell($file_handle) ); //File pointer position after read operation, var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation $file_handle = fopen($file, "x+"); //Opening the existing data file in "x+" mode to check for the warning message -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/007_variation8.php.expectf index ec6823a6a..1e85583ca 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/007_variation8.php.expectf @@ -10,5 +10,5 @@ mnopqrst uvwxyz int(37) bool(true) string(7) "Unknown" -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/007_variation9.php b/hphp/test/zend/bad/ext-standard-file/007_variation9.php index 4beb3aace..7bc0d31e4 100644 --- a/hphp/test/zend/bad/ext-standard-file/007_variation9.php +++ b/hphp/test/zend/bad/ext-standard-file/007_variation9.php @@ -32,6 +32,7 @@ var_dump( fread($file_handle, 100) ); //Check for read operation var_dump( fwrite($file_handle, $string) ); //Check for write operation; fails; expected: 0 bytes var_dump( fclose($file_handle) ); //Check for close operation on the file handle var_dump( get_resource_type($file_handle) ); //Check whether resource is lost after close operation -echo "*** Done ***\n"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/basename-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/basename-win32.php.expectf index 761eb3038..d7b0fd418 100644 --- a/hphp/test/zend/bad/ext-standard-file/basename-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/basename-win32.php.expectf @@ -174,22 +174,22 @@ string(0) "" string(0) "" *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/basename.php.expectf b/hphp/test/zend/bad/ext-standard-file/basename.php.expectf index 8ba955593..e8d8f22ba 100644 Binary files a/hphp/test/zend/bad/ext-standard-file/basename.php.expectf and b/hphp/test/zend/bad/ext-standard-file/basename.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-file/bug35740.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug35740.php.expectf index 2aff820c1..b06a092fd 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug35740.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug35740.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/bug38450_2.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug38450_2.php.expectf index 1007e6239..43306b2e2 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug38450_2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug38450_2.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Fatal error: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Fatal error: %s Stack trace: #0 [internal function]: VariableStream->__construct() #1 %s(%d): fopen('var://myvar', 'r+') diff --git a/hphp/test/zend/bad/ext-standard-file/bug38450_3.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug38450_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug38450_3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug38450_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/bug39863.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug39863.php.expectf index 8a656dc03..bc4c711f9 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug39863.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug39863.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s PASS ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/bug41693.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug41693.php.expectf index 1eef429bb..b31181d89 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug41693.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug41693.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/bug45303.php.expectf b/hphp/test/zend/bad/ext-standard-file/bug45303.php.expectf index 088b08fbe..ae78eef64 100644 --- a/hphp/test/zend/bad/ext-standard-file/bug45303.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/bug45303.php.expectf @@ -1,3 +1,3 @@ resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s int(-1) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/chgrp.php.expectf b/hphp/test/zend/bad/ext-standard-file/chgrp.php.expectf index f7a332747..f2d6e75a4 100644 --- a/hphp/test/zend/bad/ext-standard-file/chgrp.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/chgrp.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ALIVE \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/chmod_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/chmod_error.php.expectf index 76589ad37..60961cb43 100644 --- a/hphp/test/zend/bad/ext-standard-file/chmod_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/chmod_error.php.expectf @@ -1,12 +1,12 @@ *** Testing chmod() : error conditions *** -- Testing chmod() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing chmod() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/chmod_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/chmod_variation2.php.expectf index b11618490..805728a4f 100644 --- a/hphp/test/zend/bad/ext-standard-file/chmod_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/chmod_variation2.php.expectf @@ -5,7 +5,7 @@ bool(true) chmod() on a path containing .. with invalid directories bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) 777 diff --git a/hphp/test/zend/bad/ext-standard-file/chown.php.expectf b/hphp/test/zend/bad/ext-standard-file/chown.php.expectf index f7a332747..f2d6e75a4 100644 --- a/hphp/test/zend/bad/ext-standard-file/chown.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/chown.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ALIVE \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_error.php.expectf index 52e4b9609..8fe15c473 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_error.php.expectf @@ -1,10 +1,10 @@ *** Testing copy() function: error conditions -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation11.php.expectf index 6a2cd0b5d..c2ee07769 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation11.php.expectf @@ -3,7 +3,7 @@ Size of source before copy operation => int(300) Size of destination before copy operation => int(%d) -- Now applying copy() operation -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation12-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation12-win32.php.expectf index b5aa2534e..98386596c 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation12-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation12-win32.php.expectf @@ -1,5 +1,5 @@ *** Test copy() function: Trying to create a copy of an existing dir *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) int(0) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation12.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation12.php.expectf index d450bca02..fd9ec3dff 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation12.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation12.php.expectf @@ -1,8 +1,8 @@ *** Test copy() function: Trying to create a copy of an existing dir *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) int(%d) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation13.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation13.php.expectf index 6a332ee7f..97ec504fa 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation13.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation13.php.expectf @@ -1,6 +1,6 @@ *** Test copy() function: Trying to copy dir to file *** *** Testing copy() in copying dir to file *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation14.php.expectf index 99132ca3d..dcc0dd0bd 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation14.php.expectf @@ -1,10 +1,10 @@ *** Test copy() function: Trying to create a copy of non-existing source in existing destination *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) *** Test copy() function: Trying to create copy of an existing source in non-existing destination *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) int(1500) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation15.php.expectf index 05eefc170..db92ce06c 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation15.php.expectf @@ -1,5 +1,5 @@ *** Test copy() function: Trying to create a copy of file in a dir which doesn't have write permissions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) int(300) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation16-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation16-win32.php.expectf index 8607f1dc0..3b4aab04b 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation16-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation16-win32.php.expectf @@ -47,7 +47,7 @@ Size of destination file => int(3500) -- Iteration 7 -- Size of source file => int(3500) Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation17.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation17.php.expectf index ce4746a91..ae5ce6a68 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation17.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation17.php.expectf @@ -2,16 +2,16 @@ bool(true) bool(true) int(1500) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation2-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation2-win32.php.expectf index 1452fe711..4e6f58c9d 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation2-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation2-win32.php.expectf @@ -32,13 +32,13 @@ Size of destination file => int(1500) -- Iteration 5 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) -- Iteration 6 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) @@ -65,7 +65,7 @@ Size of destination file => int(1500) -- Iteration 10 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) @@ -106,7 +106,7 @@ Size of destination file => int(1500) -- Iteration 16 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation3-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation3-win32.php.expectf index 35affbc10..029cc0619 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation3-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation3-win32.php.expectf @@ -18,13 +18,13 @@ Size of destination file => int(1500) -- Iteration 3 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) -- Iteration 4 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation4.php.expectf index 85d6b13f9..0adfc1f87 100644 Binary files a/hphp/test/zend/bad/ext-standard-file/copy_variation4.php.expectf and b/hphp/test/zend/bad/ext-standard-file/copy_variation4.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation5-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation5-win32.php.expectf index 0c488ee20..49b69460f 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation5-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation5-win32.php.expectf @@ -22,6 +22,6 @@ Existence of destination file => bool(true) Destination file name => %s/CopY.TMP Size of source file => int(1500) Size of destination file => int(1500) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation6-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation6-win32.php.expectf index 7d5871aac..fd3a3183d 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation6-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation6-win32.php.expectf @@ -46,7 +46,7 @@ Size of destination file => int(0) -- Iteration 7 -- Copy operation => -HipHop Warning: %a +HipHop Warning: %s bool(false) Existence of destination file => bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/copy_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-file/copy_variation9.php.expectf index 42f5a4c92..8e82b7d86 100644 --- a/hphp/test/zend/bad/ext-standard-file/copy_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/copy_variation9.php.expectf @@ -8,7 +8,7 @@ int(1500) -- Without write permissions -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) int(1500) diff --git a/hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.php.expectf index 69169d488..22ca70934 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.php.expectf @@ -1,22 +1,22 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.phpt on line %d bool(false) -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.phpt on line %d bool(false) -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.phpt on line %d bool(false) -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_free_space_error-win32.phpt on line %d bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/disk_free_space_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_free_space_error.php.expectf index f7e950684..56a400f1f 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_free_space_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_free_space_error.php.expectf @@ -1,15 +1,15 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) float(%d) float(%d) diff --git a/hphp/test/zend/bad/ext-standard-file/disk_free_space_variation.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_free_space_variation.php.expectf index 97ff8c01a..27d20ff39 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_free_space_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_free_space_variation.php.expectf @@ -39,27 +39,27 @@ float(%d) float(%d) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --- Done --- \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.php.expectf index 19f7f3a58..ef6c29189 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.php.expectf @@ -1,12 +1,12 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.phpt on line %d bool(false) -HipHop Warning: %a +HipHop Warning: %s in hphp/test/zend/bad/ext-standard-file/disk_total_space_error-win32.phpt on line %d bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/disk_total_space_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_total_space_error.php.expectf index f361c7d76..631677bf8 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_total_space_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_total_space_error.php.expectf @@ -1,9 +1,9 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) float(%d) diff --git a/hphp/test/zend/bad/ext-standard-file/disk_total_space_variation.php.expectf b/hphp/test/zend/bad/ext-standard-file/disk_total_space_variation.php.expectf index afe194292..aedb7616d 100644 --- a/hphp/test/zend/bad/ext-standard-file/disk_total_space_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/disk_total_space_variation.php.expectf @@ -30,19 +30,19 @@ float(%d) float(%d) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing with Binary Input *** float(%d) diff --git a/hphp/test/zend/bad/ext-standard-file/fflush_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fflush_error.php.expectf index 853684358..1d391c74c 100644 --- a/hphp/test/zend/bad/ext-standard-file/fflush_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fflush_error.php.expectf @@ -1,28 +1,28 @@ *** Testing error conditions *** -- Testing fflush(): with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fflush(): with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fflush(): with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetc_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetc_error.php.expectf index bc58cbfb7..cf800e247 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetc_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetc_error.php.expectf @@ -1,27 +1,27 @@ *** Testing error conditions *** -- Testing fgetc() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetc() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetc() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetc_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetc_variation2.php.expectf index 717a5628e..f68b33d30 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetc_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetc_variation2.php.expectf @@ -1,9 +1,9 @@ *** Testing fgetc() : usage variations *** -- Testing fgetc() with closed handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetc() with unset handle -- -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetc_variation3.php b/hphp/test/zend/bad/ext-standard-file/fgetc_variation3.php index 0c180cede..345d1eca9 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetc_variation3.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetc_variation3.php @@ -27,7 +27,7 @@ foreach ($file_modes as $file_mode ) { $data = "fgetc_variation test"; fwrite($file_handle, $data); - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_error.php.expectf index 53a6b8be1..d04afba77 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_error.php.expectf @@ -1,39 +1,39 @@ *** Testing error conditions *** -- Testing fgetcsv() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing fgetcsv() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing fgetcsv() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation1.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation1.php index 589255d43..f1df5c347 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation1.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation1.php @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation11.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation11.php index b1950415f..fcf8c03fd 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation11.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation11.php @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php index 582f0181f..e72898cf5 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php.expectf index e461c266f..130395f3f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation12.php.expectf @@ -1,8 +1,8 @@ *** Testing fgetcsv() : with two chars as enclosure & delimiter *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -11,8 +11,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -21,8 +21,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -31,8 +31,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -41,8 +41,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -51,8 +51,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -61,8 +61,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -71,8 +71,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -81,8 +81,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -91,8 +91,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -101,8 +101,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -111,8 +111,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -121,8 +121,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -131,8 +131,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -141,8 +141,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -151,8 +151,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -161,8 +161,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -171,8 +171,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -181,8 +181,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -191,8 +191,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -201,8 +201,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -211,8 +211,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -221,8 +221,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -231,8 +231,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -241,8 +241,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -251,8 +251,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -261,8 +261,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -271,8 +271,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -281,8 +281,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -291,8 +291,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -301,8 +301,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -311,8 +311,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -321,8 +321,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -331,8 +331,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -341,8 +341,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -351,8 +351,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -361,8 +361,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -371,8 +371,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -381,8 +381,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -391,8 +391,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -401,8 +401,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -411,8 +411,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -421,8 +421,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -431,8 +431,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -441,8 +441,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -451,8 +451,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -461,8 +461,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -471,8 +471,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -481,8 +481,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -491,8 +491,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -501,8 +501,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -511,8 +511,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -521,8 +521,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -531,8 +531,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -541,8 +541,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -551,8 +551,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -561,8 +561,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -571,8 +571,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -581,8 +581,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -591,8 +591,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -601,8 +601,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -611,8 +611,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -621,8 +621,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -631,8 +631,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -641,8 +641,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -651,8 +651,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -661,8 +661,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -671,8 +671,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -681,8 +681,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -691,8 +691,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -701,8 +701,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -711,8 +711,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation17.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation17.php index bde54371e..98fdfdb55 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation17.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation17.php @@ -52,7 +52,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php index d8f3f9c79..8047449e2 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php @@ -53,7 +53,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php.expectf index f85e7e759..7650736d1 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation19.php.expectf @@ -1,7 +1,7 @@ *** Testing fgetcsv() : with default enclosure & delimiter of two chars *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -10,7 +10,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -19,7 +19,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -28,7 +28,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -37,7 +37,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -46,7 +46,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -55,7 +55,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -64,7 +64,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -73,7 +73,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -82,7 +82,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -91,7 +91,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -100,7 +100,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -109,7 +109,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -118,7 +118,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -127,7 +127,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water,fruit" @@ -136,7 +136,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -145,7 +145,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -154,7 +154,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -163,7 +163,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -172,7 +172,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -181,7 +181,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -190,7 +190,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -199,7 +199,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -208,7 +208,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -217,7 +217,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -226,7 +226,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -235,7 +235,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -244,7 +244,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -253,7 +253,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -262,7 +262,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(11) "water fruit" @@ -271,7 +271,7 @@ int(12) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -280,7 +280,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -289,7 +289,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -298,7 +298,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -307,7 +307,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -316,7 +316,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -325,7 +325,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -334,7 +334,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -343,7 +343,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -352,7 +352,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -361,7 +361,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -370,7 +370,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -379,7 +379,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -388,7 +388,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -397,7 +397,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(13) "water "fruit"" @@ -406,7 +406,7 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -415,7 +415,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -424,7 +424,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -433,7 +433,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -442,7 +442,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -451,7 +451,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -460,7 +460,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -469,7 +469,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -478,7 +478,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -487,7 +487,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -496,7 +496,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -505,7 +505,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -514,7 +514,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -523,7 +523,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -532,7 +532,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(19) "water\"fruit"\"air"" @@ -541,7 +541,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -550,7 +550,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -559,7 +559,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -568,7 +568,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -577,7 +577,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -586,7 +586,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -595,7 +595,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -604,7 +604,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -613,7 +613,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -622,7 +622,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -631,7 +631,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -640,7 +640,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -649,7 +649,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -658,7 +658,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" @@ -667,7 +667,7 @@ int(20) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a +HipHop Notice: %s array(1) { [0]=> string(17) "water\"fruit"\"""" diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation2.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation2.php index ca2f09ee4..7f5fa3055 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation2.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation2.php @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php index 6c0903563..e5269132c 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php.expectf index 87a5db10d..18cef9e12 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation24.php.expectf @@ -1,8 +1,8 @@ *** Testing fgetcsv() : with two chars as enclosure & delimiter *** -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -11,8 +11,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -21,8 +21,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -31,8 +31,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -41,8 +41,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -51,8 +51,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(13) ""water",fruit" @@ -61,8 +61,8 @@ int(14) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -71,8 +71,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -81,8 +81,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -91,8 +91,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -101,8 +101,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -111,8 +111,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) ""water","fruit"" @@ -121,8 +121,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -131,8 +131,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -141,8 +141,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -151,8 +151,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -161,8 +161,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -171,8 +171,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "^water^ ^fruit^" @@ -181,8 +181,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -191,8 +191,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -201,8 +201,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -211,8 +211,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -221,8 +221,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -231,8 +231,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "&water&:&fruit&" @@ -241,8 +241,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -251,8 +251,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -261,8 +261,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -271,8 +271,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -281,8 +281,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -291,8 +291,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(15) "=water===fruit=" @@ -301,8 +301,8 @@ int(16) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -311,8 +311,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -321,8 +321,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -331,8 +331,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -341,8 +341,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -351,8 +351,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(17) "-water--fruit-air" @@ -361,8 +361,8 @@ int(18) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -371,8 +371,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -381,8 +381,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -391,8 +391,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -401,8 +401,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -411,8 +411,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(21) "-water---fruit---air-" @@ -421,8 +421,8 @@ int(22) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -431,8 +431,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -441,8 +441,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -451,8 +451,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -461,8 +461,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," @@ -471,8 +471,8 @@ int(24) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(1) { [0]=> string(23) "&""""&:&"&:,:":&,&:,,,," diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php index 5051b5d5e..5f3522351 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php.expectf index 06dacb977..688ab842f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation25.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with negative length value *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php index 24a787bb5..ac672e71b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php.expectf index 06dacb977..688ab842f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation27.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with negative length value *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php index d021edaea..a8b31ee45 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php.expectf index 06dacb977..688ab842f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation28.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with negative length value *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation6.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation6.php index 4a07fa76b..19a816678 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation6.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation6.php @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation7.php b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation7.php index 234fdc2db..0bb29cdf0 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation7.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation7.php @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgets_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgets_error.php.expectf index d4cc67b32..62a531dc8 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgets_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgets_error.php.expectf @@ -1,38 +1,38 @@ *** Testing error conditions *** -- Testing fgets() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgets() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgets() with invalid length arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -- Testing fgets() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgets() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgets_variation1.php b/hphp/test/zend/bad/ext-standard-file/fgets_variation1.php index b5b50d841..78b418cf3 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgets_variation1.php +++ b/hphp/test/zend/bad/ext-standard-file/fgets_variation1.php @@ -26,7 +26,7 @@ foreach ($file_modes as $file_mode ) { $data = "fgets_variation test"; fwrite($file_handle, $data); - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgets_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgets_variation2.php.expectf index c5022f23c..3cee55e96 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgets_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgets_variation2.php.expectf @@ -1,14 +1,14 @@ *** Testing fgets() : usage variations *** -- Testing fgets() with closed handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgets() with unset handle -- -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgets_variation3.php b/hphp/test/zend/bad/ext-standard-file/fgets_variation3.php index dcbec4586..0d7e56786 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgets_variation3.php +++ b/hphp/test/zend/bad/ext-standard-file/fgets_variation3.php @@ -33,7 +33,7 @@ foreach($file_modes as $file_mode) { } echo "-- fgets() with default length, file pointer at 0 --\n"; - // get the file pointer to begining of the file + // get the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); @@ -42,7 +42,7 @@ foreach($file_modes as $file_mode) { var_dump( feof($file_handle) ); // enusre if eof set echo "-- fgets() with length = 23, Expected: 22 chars, file pointer at 0 --\n"; - // get the file pointer to begining of the file + // get the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetss.php.expectf index 1deac5327..4438b617b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetss.php.expectf @@ -30,10 +30,10 @@ string(2) " " string(9) "some anot" string(9) "her text " -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_basic2-win32.php b/hphp/test/zend/bad/ext-standard-file/fgetss_basic2-win32.php index c075952cb..6995a26f2 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_basic2-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_basic2-win32.php @@ -39,7 +39,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_basic2.php b/hphp/test/zend/bad/ext-standard-file/fgetss_basic2.php index 3371a33fc..8d45ff429 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_basic2.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_basic2.php @@ -37,7 +37,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fgetss_error.php.expectf index 3a917acdf..a23d2ffcd 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_error.php.expectf @@ -1,38 +1,38 @@ *** Testing error conditions *** -- Testing fgetss() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetss() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetss() with invalid length arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -- Testing fgetss() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fgetss() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation1-win32.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation1-win32.php index dc3fcd48e..00217b499 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation1-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation1-win32.php @@ -47,7 +47,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation1.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation1.php index 871ce8eee..4be6cac0a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation1.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation1.php @@ -43,7 +43,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation2.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation2.php index d757e783d..3296db726 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation2.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation2.php @@ -41,7 +41,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation3-win32.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation3-win32.php index b53acf9dd..481a7a602 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation3-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation3-win32.php @@ -46,7 +46,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); var_dump( filesize($filename) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation3.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation3.php index 4d6326e32..88a8b9d6b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation3.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation3.php @@ -42,7 +42,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file rewind($file_handle); var_dump( ftell($file_handle) ); var_dump( filesize($filename) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation4.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation4.php index 785e23413..0f1ff51d7 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation4.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation4.php @@ -39,7 +39,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetss_variation5-win32.php b/hphp/test/zend/bad/ext-standard-file/fgetss_variation5-win32.php index a3471cf4b..8c5a6bfb3 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetss_variation5-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/fgetss_variation5-win32.php @@ -43,7 +43,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/bad/ext-standard-file/file_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_error.php.expectf index 170982dfb..d774c34a5 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_error.php.expectf @@ -1,13 +1,13 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(0) { } -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Done --- \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_get_contents_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_get_contents_error.php.expectf index b6fa2fea4..afa4909cd 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_get_contents_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_get_contents_error.php.expectf @@ -1,16 +1,16 @@ *** Testing error conditions *** -- Testing with Non-existing file -- -HipHop Warning: %a +HipHop Warning: %s -- Testing No.of arguments less than expected -- -HipHop Warning: %a +HipHop Warning: %s -- Testing No.of arguments greater than expected -- -HipHop Warning: %a +HipHop Warning: %s -- Testing for invalid negative maxlen values -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_get_contents_file_put_contents_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_get_contents_file_put_contents_error.php.expectf index 7027851db..e064bbb7f 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_get_contents_file_put_contents_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_get_contents_file_put_contents_error.php.expectf @@ -1,19 +1,19 @@ *** Testing error conditions *** -- Testing with Non-existing file -- -HipHop Warning: %a +HipHop Warning: %s -- Testing No.of arguments less than expected -- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -- Testing No.of arguments greater than expected -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -- Testing for invalid negative maxlen values -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation7-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation7-win32.php.expectf index db6a146ae..d122155c0 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation7-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation7-win32.php.expectf @@ -13,11 +13,11 @@ string(%d) "contents read" string(%d) "contents read" -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -33,7 +33,7 @@ string(%d) "contents read" string(%d) "contents read" -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- diff --git a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8-win32.php.expectf index 9a3990e5d..31148a877 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8-win32.php.expectf @@ -1,42 +1,42 @@ *** Testing file_get_contents() : variation *** -- Filename: -1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: TRUE -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: FALSE -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: NULL -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: "" -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: " " -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: \0 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Filename: array() -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Filename: /no/such/file/dir -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Filename: php/php -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8.php.expectf index 34b9b4c44..3e7e9051e 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_get_contents_variation8.php.expectf @@ -1,33 +1,33 @@ *** Testing file_get_contents() : variation *** -- Iteration 0 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_put_contents.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_put_contents.php.expectf index 541fcbc84..4ed1fffe5 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_put_contents.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_put_contents.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) int(15) -HipHop Warning: %a +HipHop Warning: %s int(6) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation7-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation7-win32.php.expectf index 663d1e8bb..3628d7f22 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation7-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation7-win32.php.expectf @@ -13,11 +13,11 @@ Data written correctly Data written correctly -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s No data written -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s No data written -- Iteration 7 -- @@ -33,7 +33,7 @@ Data written correctly Data written correctly -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s No data written -- Iteration 12 -- diff --git a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8-win32.php.expectf index 94a52be94..7e711e6f2 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8-win32.php.expectf @@ -7,34 +7,34 @@ 9 bytes written to: 1 -- Filename: FALSE -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: FALSE -- Filename: NULL -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: NULL -- Filename: "" -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: "" -- Filename: " " -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: " " -- Filename: \0 -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: \0 -- Filename: array() -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: array() -- Filename: /no/such/file/dir -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: /no/such/file/dir -- Filename: php/php -- -HipHop Warning: %a +HipHop Warning: %s Failed to write data to: php/php ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8.php.expectf index ada9e0ccd..1aec234bf 100644 Binary files a/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8.php.expectf and b/hphp/test/zend/bad/ext-standard-file/file_put_contents_variation8.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-file/file_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_variation6.php.expectf index 3874564d0..93bbd1bf9 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_variation6.php.expectf @@ -214,21 +214,21 @@ array(3) { [2]=> string(6) "Line 3" } -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) -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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/file_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/file_variation8-win32.php.expectf index 54960d280..73011e8be 100644 --- a/hphp/test/zend/bad/ext-standard-file/file_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/file_variation8-win32.php.expectf @@ -25,11 +25,11 @@ array(1) { } -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -57,7 +57,7 @@ array(1) { } -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- diff --git a/hphp/test/zend/bad/ext-standard-file/filegroup_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/filegroup_error.php.expectf index 271b379b9..5f19bad76 100644 --- a/hphp/test/zend/bad/ext-standard-file/filegroup_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filegroup_error.php.expectf @@ -1,13 +1,13 @@ *** Testing filegroup(): error conditions *** -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 NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filegroup_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/filegroup_variation2.php.expectf index 01325d8bd..51289b3d8 100644 --- a/hphp/test/zend/bad/ext-standard-file/filegroup_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filegroup_variation2.php.expectf @@ -1,18 +1,18 @@ *** Testing Invalid file types *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filegroup_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/filegroup_variation3.php.expectf index 42cbe9d3b..f874a41ef 100644 --- a/hphp/test/zend/bad/ext-standard-file/filegroup_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filegroup_variation3.php.expectf @@ -2,23 +2,23 @@ - Iteration 1 - int(%d) - Iteration 2 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 3 - int(%d) - Iteration 4 - int(%d) - Iteration 5 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 6 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 7 - -HipHop Warning: %a +HipHop Warning: %s NULL - Iteration 8 - -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_error.php b/hphp/test/zend/bad/ext-standard-file/fileinode_error.php index 9edd35ce0..9da6dfabb 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileinode_error.php +++ b/hphp/test/zend/bad/ext-standard-file/fileinode_error.php @@ -13,10 +13,10 @@ var_dump( fileinode("/no/such/file/dir") ); var_dump( fileinode("string") ); var_dump( fileinode(100) ); -/* No.of argumetns less than expected */ +/* No.of arguments less than expected */ var_dump( fileinode() ); -/* No.of argumetns greater than expected */ +/* No.of arguments greater than expected */ var_dump( fileinode(__FILE__, "string") ); echo "\n*** Done ***"; diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileinode_error.php.expectf index 3d1b41ea7..5fa7fd43b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileinode_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileinode_error.php.expectf @@ -1,13 +1,13 @@ *** Testing error conditions of fileinode() *** -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 NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileinode_variation2.php.expectf index 01325d8bd..51289b3d8 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileinode_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileinode_variation2.php.expectf @@ -1,18 +1,18 @@ *** Testing Invalid file types *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileinode_variation3.php.expectf index 4edc7e102..bb4560f0e 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileinode_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileinode_variation3.php.expectf @@ -2,23 +2,23 @@ - Iteration 1 - int(%i) - Iteration 2 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 3 - int(%i) - Iteration 4 - int(%i) - Iteration 5 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 6 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 7 - -HipHop Warning: %a +HipHop Warning: %s NULL - Iteration 8 - -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileowner_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileowner_error.php.expectf index 27a19b179..8bb3864ee 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileowner_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileowner_error.php.expectf @@ -1,13 +1,13 @@ *** Testing fileowner(): error conditions *** -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 NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileowner_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileowner_variation2.php.expectf index 01325d8bd..51289b3d8 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileowner_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileowner_variation2.php.expectf @@ -1,18 +1,18 @@ *** Testing Invalid file types *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileowner_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileowner_variation3.php.expectf index fee797ef1..ba929684e 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileowner_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileowner_variation3.php.expectf @@ -2,23 +2,23 @@ - Iteration 1 - int(%d) - Iteration 2 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 3 - int(%d) - Iteration 4 - int(%d) - Iteration 5 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 6 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 7 - -HipHop Warning: %a +HipHop Warning: %s NULL - Iteration 8 - -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileperms_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileperms_variation2.php.expectf index 01325d8bd..51289b3d8 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileperms_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileperms_variation2.php.expectf @@ -1,18 +1,18 @@ *** Testing Invalid file types *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileperms_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/fileperms_variation3.php.expectf index 1ac17ac98..31268e658 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileperms_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fileperms_variation3.php.expectf @@ -2,23 +2,23 @@ - Iteration 1 - int(%d) - Iteration 2 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 3 - int(%d) - Iteration 4 - int(%d) - Iteration 5 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 6 - -HipHop Warning: %a +HipHop Warning: %s bool(false) - Iteration 7 - -HipHop Warning: %a +HipHop Warning: %s NULL - Iteration 8 - -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filesize_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/filesize_error.php.expectf index a6abc9f45..6f8f8875e 100644 --- a/hphp/test/zend/bad/ext-standard-file/filesize_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filesize_error.php.expectf @@ -1,11 +1,11 @@ *** Testing filesize(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filesize_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-file/filesize_variation5.php.expectf index 50865ddee..5be4b50f6 100644 --- a/hphp/test/zend/bad/ext-standard-file/filesize_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filesize_variation5.php.expectf @@ -2,8 +2,8 @@ bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filestat.php.expectf b/hphp/test/zend/bad/ext-standard-file/filestat.php.expectf index 5110ffe8d..708ca315e 100644 --- a/hphp/test/zend/bad/ext-standard-file/filestat.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filestat.php.expectf @@ -13,14 +13,14 @@ int(%d) int(%d) int(%d) int(%d) -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) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/filetype_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/filetype_error.php.expectf index d91a74a5e..ff260265d 100644 --- a/hphp/test/zend/bad/ext-standard-file/filetype_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/filetype_error.php.expectf @@ -1,8 +1,8 @@ *** Testing error conditions *** -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 *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/flock.php.expectf b/hphp/test/zend/bad/ext-standard-file/flock.php.expectf index a0041f61d..e850713ef 100644 --- a/hphp/test/zend/bad/ext-standard-file/flock.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/flock.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) @@ -17,6 +17,6 @@ int(0) bool(true) int(0) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/flock_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/flock_error.php.expectf index 3bc84f73f..97b62f288 100644 --- a/hphp/test/zend/bad/ext-standard-file/flock_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/flock_error.php.expectf @@ -1,49 +1,49 @@ *** Testing error conditions *** --- Iteration 0 --- -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Iteration 1 --- -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Iteration 2 --- -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Iteration 3 --- -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Iteration 4 --- -HipHop Warning: %a +HipHop Warning: %s NULL --- Iteration 5 --- -HipHop Warning: %a +HipHop Warning: %s NULL --- Iteration 6 --- -HipHop Warning: %a +HipHop Warning: %s NULL --- Iteration 7 --- -HipHop Warning: %a +HipHop Warning: %s NULL --- Iteration 8 --- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fnmatch_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fnmatch_error.php.expectf index 673f45e58..dd7a04569 100644 --- a/hphp/test/zend/bad/ext-standard-file/fnmatch_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fnmatch_error.php.expectf @@ -1,15 +1,15 @@ *** Testing error conditions for fnmatch() *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fnmatch_variation.php.expectf b/hphp/test/zend/bad/ext-standard-file/fnmatch_variation.php.expectf index 33db0e792..34259733d 100644 --- a/hphp/test/zend/bad/ext-standard-file/fnmatch_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fnmatch_variation.php.expectf @@ -46,10 +46,10 @@ bool(false) -- Iteration 22 -- bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) @@ -124,63 +124,63 @@ bool(true) --- With Strings --- -- Iteration 0 -- bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) bool(false) -- Iteration 5 -- bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) @@ -282,7 +282,7 @@ bool(true) bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) @@ -290,7 +290,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) @@ -298,28 +298,28 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) bool(false) @@ -327,7 +327,7 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/fopen_variation10-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/fopen_variation10-win32.php.expectf index a3ab1ab97..70bf05f55 100644 --- a/hphp/test/zend/bad/ext-standard-file/fopen_variation10-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fopen_variation10-win32.php.expectf @@ -7,27 +7,27 @@ file in root file in root --c-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --\-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --/-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --c:fopen10.tmpdirTwo-- file in fopen10.tmpdirTwo --c:adir-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --c:\/-- file in root @@ -45,7 +45,7 @@ file in fopen10.tmpdirTwo file in fopen10.tmpDir --/sortout-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fopen_variation11-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/fopen_variation11-win32.php.expectf index b4403295e..3b8502d37 100644 --- a/hphp/test/zend/bad/ext-standard-file/fopen_variation11-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fopen_variation11-win32.php.expectf @@ -7,27 +7,27 @@ file in root file in root --c-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --\-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --/-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --c:fopen11.tmpdirTwo-- file in fopen11.tmpdirTwo --c:adir-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s --c:\/-- file in root @@ -45,7 +45,7 @@ file in fopen11.tmpdirTwo file in fopen11.tmpDir --/sortout-- -HipHop Warning: %a +HipHop Warning: %s file not opened for read -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fopen_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-file/fopen_variation14.php.expectf index 238617e7f..ec2e8d210 100644 --- a/hphp/test/zend/bad/ext-standard-file/fopen_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fopen_variation14.php.expectf @@ -1,26 +1,26 @@ *** Testing fopen() : variation *** --- READ: file://fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- READ: file://../fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- diff --git a/hphp/test/zend/bad/ext-standard-file/fopen_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-file/fopen_variation15.php.expectf index eca46f9c2..ad6c112be 100644 --- a/hphp/test/zend/bad/ext-standard-file/fopen_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fopen_variation15.php.expectf @@ -1,26 +1,26 @@ *** Testing fopen() : variation *** --- READ: file://fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- READ: file://../fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp --- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- diff --git a/hphp/test/zend/bad/ext-standard-file/fpassthru_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fpassthru_error.php.expectf index b932579bc..d963022cc 100644 --- a/hphp/test/zend/bad/ext-standard-file/fpassthru_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fpassthru_error.php.expectf @@ -1,10 +1,10 @@ *** Test error conditions of fpassthru() function *** -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_002.php.expectf b/hphp/test/zend/bad/ext-standard-file/fputcsv_002.php.expectf index 7121a2b7d..40ba4e9be 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fputcsv_002.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s array(7) { [0]=> int(1) diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fputcsv_error.php.expectf index 11927b71f..f5c86de83 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fputcsv_error.php.expectf @@ -1,39 +1,39 @@ *** Testing error conditions *** -- Testing fputcsv() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing fputcsv() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing fputcsv() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation13.php.expectf b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation13.php.expectf index e56fb98fc..e90f8b628 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation13.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation13.php.expectf @@ -1,7 +1,7 @@ *** Testing fputcsv() : with default enclosure & delimiter of two chars *** -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -9,7 +9,7 @@ string(12) "water,fruit " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -17,7 +17,7 @@ string(12) "water,fruit " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -25,7 +25,7 @@ string(%d) "water,fruit " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -33,7 +33,7 @@ string(12) "water,fruit " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -41,7 +41,7 @@ string(12) "water,fruit " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -49,7 +49,7 @@ string(%d) "water,fruit " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -57,7 +57,7 @@ string(12) "water,fruit " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -65,7 +65,7 @@ string(12) "water,fruit " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -73,7 +73,7 @@ string(%d) "water,fruit " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -81,7 +81,7 @@ string(12) "water,fruit " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -89,7 +89,7 @@ string(12) "water,fruit " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(12) int(12) bool(false) @@ -97,7 +97,7 @@ string(%d) "water,fruit " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -105,7 +105,7 @@ string(20) """"water"",""fruit" " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -113,7 +113,7 @@ string(20) """"water"",""fruit" " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -121,7 +121,7 @@ string(%d) """"water"",""fruit" " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -129,7 +129,7 @@ string(20) """"water"",""fruit" " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -137,7 +137,7 @@ string(20) """"water"",""fruit" " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -145,7 +145,7 @@ string(%d) """"water"",""fruit" " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -153,7 +153,7 @@ string(20) """"water"",""fruit" " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -161,7 +161,7 @@ string(20) """"water"",""fruit" " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -169,7 +169,7 @@ string(%d) """"water"",""fruit" " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -177,7 +177,7 @@ string(20) """"water"",""fruit" " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -185,7 +185,7 @@ string(20) """"water"",""fruit" " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(20) int(20) bool(false) @@ -193,7 +193,7 @@ string(%d) """"water"",""fruit" " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -201,7 +201,7 @@ string(22) """"water"",""fruit""" " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -209,7 +209,7 @@ string(22) """"water"",""fruit""" " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -217,7 +217,7 @@ string(%d) """"water"",""fruit""" " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -225,7 +225,7 @@ string(22) """"water"",""fruit""" " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -233,7 +233,7 @@ string(22) """"water"",""fruit""" " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -241,7 +241,7 @@ string(%d) """"water"",""fruit""" " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -249,7 +249,7 @@ string(22) """"water"",""fruit""" " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -257,7 +257,7 @@ string(22) """"water"",""fruit""" " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -265,7 +265,7 @@ string(%d) """"water"",""fruit""" " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -273,7 +273,7 @@ string(22) """"water"",""fruit""" " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -281,7 +281,7 @@ string(22) """"water"",""fruit""" " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -289,7 +289,7 @@ string(%d) """"water"",""fruit""" " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -297,7 +297,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -305,7 +305,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -313,7 +313,7 @@ string(%d) ""^water^ ^fruit^" " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -321,7 +321,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -329,7 +329,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -337,7 +337,7 @@ string(%d) ""^water^ ^fruit^" " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -345,7 +345,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -353,7 +353,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -361,7 +361,7 @@ string(%d) ""^water^ ^fruit^" " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -369,7 +369,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -377,7 +377,7 @@ string(18) ""^water^ ^fruit^" " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -385,7 +385,7 @@ string(%d) ""^water^ ^fruit^" " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -393,7 +393,7 @@ string(16) "&water&:&fruit& " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -401,7 +401,7 @@ string(16) "&water&:&fruit& " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -409,7 +409,7 @@ string(%d) "&water&:&fruit& " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -417,7 +417,7 @@ string(16) "&water&:&fruit& " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -425,7 +425,7 @@ string(16) "&water&:&fruit& " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -433,7 +433,7 @@ string(%d) "&water&:&fruit& " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -441,7 +441,7 @@ string(16) "&water&:&fruit& " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -449,7 +449,7 @@ string(16) "&water&:&fruit& " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -457,7 +457,7 @@ string(%d) "&water&:&fruit& " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -465,7 +465,7 @@ string(16) "&water&:&fruit& " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -473,7 +473,7 @@ string(16) "&water&:&fruit& " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -481,7 +481,7 @@ string(%d) "&water&:&fruit& " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -489,7 +489,7 @@ string(16) "=water===fruit= " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -497,7 +497,7 @@ string(16) "=water===fruit= " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -505,7 +505,7 @@ string(%d) "=water===fruit= " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -513,7 +513,7 @@ string(16) "=water===fruit= " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -521,7 +521,7 @@ string(16) "=water===fruit= " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -529,7 +529,7 @@ string(%d) "=water===fruit= " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -537,7 +537,7 @@ string(16) "=water===fruit= " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -545,7 +545,7 @@ string(16) "=water===fruit= " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -553,7 +553,7 @@ string(%d) "=water===fruit= " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -561,7 +561,7 @@ string(16) "=water===fruit= " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -569,7 +569,7 @@ string(16) "=water===fruit= " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(16) int(16) bool(false) @@ -577,7 +577,7 @@ string(%d) "=water===fruit= " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -585,7 +585,7 @@ string(18) "-water--fruit-air " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -593,7 +593,7 @@ string(18) "-water--fruit-air " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -601,7 +601,7 @@ string(%d) "-water--fruit-air " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -609,7 +609,7 @@ string(18) "-water--fruit-air " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -617,7 +617,7 @@ string(18) "-water--fruit-air " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -625,7 +625,7 @@ string(%d) "-water--fruit-air " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -633,7 +633,7 @@ string(18) "-water--fruit-air " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -641,7 +641,7 @@ string(18) "-water--fruit-air " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -649,7 +649,7 @@ string(%d) "-water--fruit-air " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -657,7 +657,7 @@ string(18) "-water--fruit-air " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -665,7 +665,7 @@ string(18) "-water--fruit-air " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(18) int(18) bool(false) @@ -673,7 +673,7 @@ string(%d) "-water--fruit-air " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -681,7 +681,7 @@ string(22) "-water---fruit---air- " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -689,7 +689,7 @@ string(22) "-water---fruit---air- " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -697,7 +697,7 @@ string(%d) "-water---fruit---air- " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -705,7 +705,7 @@ string(22) "-water---fruit---air- " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -713,7 +713,7 @@ string(22) "-water---fruit---air- " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -721,7 +721,7 @@ string(%d) "-water---fruit---air- " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -729,7 +729,7 @@ string(22) "-water---fruit---air- " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -737,7 +737,7 @@ string(22) "-water---fruit---air- " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -745,7 +745,7 @@ string(%d) "-water---fruit---air- " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -753,7 +753,7 @@ string(22) "-water---fruit---air- " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -761,7 +761,7 @@ string(22) "-water---fruit---air- " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(22) int(22) bool(false) @@ -769,7 +769,7 @@ string(%d) "-water---fruit---air- " -- file opened in r+ -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -777,7 +777,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in r+b -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -785,7 +785,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in r+t -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -793,7 +793,7 @@ string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in a+ -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -801,7 +801,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in a+b -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -809,7 +809,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in a+t -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -817,7 +817,7 @@ string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in w+ -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -825,7 +825,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in w+b -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -833,7 +833,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in w+t -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -841,7 +841,7 @@ string(%d) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in x+ -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -849,7 +849,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in x+b -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) @@ -857,7 +857,7 @@ string(32) ""&""""""""&:&""&:,:"":&,&:,,,," " -- file opened in x+t -- -HipHop Notice: %a +HipHop Notice: %s int(32) int(32) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation14.php.expectf index cad203c57..e906059fa 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation14.php.expectf @@ -1,216 +1,216 @@ *** Testing fputcsv() : with enclosure & delimiter of two chars and file opened in read mode *** -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in r -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rb -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) string(0) "" -- file opened in rt -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation9.php.expectf index 0060d5f4a..476b317db 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fputcsv_variation9.php.expectf @@ -1,8 +1,8 @@ *** Testing fputcsv() : with two chars as enclosure & delimiter *** -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -10,8 +10,8 @@ string(12) "water,fruit " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -19,8 +19,8 @@ string(12) "water,fruit " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -28,8 +28,8 @@ string(%d) "water,fruit " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -37,8 +37,8 @@ string(12) "water,fruit " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -46,8 +46,8 @@ string(12) "water,fruit " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -55,8 +55,8 @@ string(%d) "water,fruit " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -64,8 +64,8 @@ string(12) "water,fruit " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -73,8 +73,8 @@ string(12) "water,fruit " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -82,8 +82,8 @@ string(%d) "water,fruit " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -91,8 +91,8 @@ string(12) "water,fruit " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -100,8 +100,8 @@ string(12) "water,fruit " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(12) int(12) bool(false) @@ -109,8 +109,8 @@ string(%d) "water,fruit " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -118,8 +118,8 @@ string(15) ""water","fruit " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -127,8 +127,8 @@ string(15) ""water","fruit " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -136,8 +136,8 @@ string(%d) ""water","fruit " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -145,8 +145,8 @@ string(15) ""water","fruit " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -154,8 +154,8 @@ string(15) ""water","fruit " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -163,8 +163,8 @@ string(%d) ""water","fruit " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -172,8 +172,8 @@ string(15) ""water","fruit " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -181,8 +181,8 @@ string(15) ""water","fruit " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -190,8 +190,8 @@ string(%d) ""water","fruit " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -199,8 +199,8 @@ string(15) ""water","fruit " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -208,8 +208,8 @@ string(15) ""water","fruit " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(15) int(15) bool(false) @@ -217,8 +217,8 @@ string(%d) ""water","fruit " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -226,8 +226,8 @@ string(16) ""water","fruit" " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -235,8 +235,8 @@ string(16) ""water","fruit" " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -244,8 +244,8 @@ string(%d) ""water","fruit" " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -253,8 +253,8 @@ string(16) ""water","fruit" " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -262,8 +262,8 @@ string(16) ""water","fruit" " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -271,8 +271,8 @@ string(%d) ""water","fruit" " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -280,8 +280,8 @@ string(16) ""water","fruit" " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -289,8 +289,8 @@ string(16) ""water","fruit" " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -298,8 +298,8 @@ string(%d) ""water","fruit" " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -307,8 +307,8 @@ string(16) ""water","fruit" " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -316,8 +316,8 @@ string(16) ""water","fruit" " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -325,8 +325,8 @@ string(%d) ""water","fruit" " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -334,8 +334,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -343,8 +343,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -352,8 +352,8 @@ string(%d) "%^water^ ^fruit^% " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -361,8 +361,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -370,8 +370,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -379,8 +379,8 @@ string(%d) "%^water^ ^fruit^% " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -388,8 +388,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -397,8 +397,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -406,8 +406,8 @@ string(%d) "%^water^ ^fruit^% " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -415,8 +415,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -424,8 +424,8 @@ string(18) "%^water^ ^fruit^% " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -433,8 +433,8 @@ string(%d) "%^water^ ^fruit^% " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -442,8 +442,8 @@ string(16) "&water&:&fruit& " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -451,8 +451,8 @@ string(16) "&water&:&fruit& " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -460,8 +460,8 @@ string(%d) "&water&:&fruit& " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -469,8 +469,8 @@ string(16) "&water&:&fruit& " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -478,8 +478,8 @@ string(16) "&water&:&fruit& " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -487,8 +487,8 @@ string(%d) "&water&:&fruit& " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -496,8 +496,8 @@ string(16) "&water&:&fruit& " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -505,8 +505,8 @@ string(16) "&water&:&fruit& " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -514,8 +514,8 @@ string(%d) "&water&:&fruit& " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -523,8 +523,8 @@ string(16) "&water&:&fruit& " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -532,8 +532,8 @@ string(16) "&water&:&fruit& " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -541,8 +541,8 @@ string(%d) "&water&:&fruit& " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -550,8 +550,8 @@ string(16) "=water===fruit= " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -559,8 +559,8 @@ string(16) "=water===fruit= " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -568,8 +568,8 @@ string(%d) "=water===fruit= " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -577,8 +577,8 @@ string(16) "=water===fruit= " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -586,8 +586,8 @@ string(16) "=water===fruit= " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -595,8 +595,8 @@ string(%d) "=water===fruit= " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -604,8 +604,8 @@ string(16) "=water===fruit= " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -613,8 +613,8 @@ string(16) "=water===fruit= " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -622,8 +622,8 @@ string(%d) "=water===fruit= " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -631,8 +631,8 @@ string(16) "=water===fruit= " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -640,8 +640,8 @@ string(16) "=water===fruit= " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(16) int(16) bool(false) @@ -649,8 +649,8 @@ string(%d) "=water===fruit= " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -658,8 +658,8 @@ string(18) "-water--fruit-air " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -667,8 +667,8 @@ string(18) "-water--fruit-air " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -676,8 +676,8 @@ string(%d) "-water--fruit-air " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -685,8 +685,8 @@ string(18) "-water--fruit-air " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -694,8 +694,8 @@ string(18) "-water--fruit-air " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -703,8 +703,8 @@ string(%d) "-water--fruit-air " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -712,8 +712,8 @@ string(18) "-water--fruit-air " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -721,8 +721,8 @@ string(18) "-water--fruit-air " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -730,8 +730,8 @@ string(%d) "-water--fruit-air " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -739,8 +739,8 @@ string(18) "-water--fruit-air " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -748,8 +748,8 @@ string(18) "-water--fruit-air " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(18) int(18) bool(false) @@ -757,8 +757,8 @@ string(%d) "-water--fruit-air " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -766,8 +766,8 @@ string(22) "-water---fruit---air- " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -775,8 +775,8 @@ string(22) "-water---fruit---air- " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -784,8 +784,8 @@ string(%d) "-water---fruit---air- " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -793,8 +793,8 @@ string(22) "-water---fruit---air- " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -802,8 +802,8 @@ string(22) "-water---fruit---air- " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -811,8 +811,8 @@ string(%d) "-water---fruit---air- " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -820,8 +820,8 @@ string(22) "-water---fruit---air- " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -829,8 +829,8 @@ string(22) "-water---fruit---air- " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -838,8 +838,8 @@ string(%d) "-water---fruit---air- " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -847,8 +847,8 @@ string(22) "-water---fruit---air- " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -856,8 +856,8 @@ string(22) "-water---fruit---air- " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(22) int(22) bool(false) @@ -865,8 +865,8 @@ string(%d) "-water---fruit---air- " -- file opened in r+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -874,8 +874,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in r+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -883,8 +883,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in r+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -892,8 +892,8 @@ string(%d) "&""""&:&"&:,:":&,&:,,,, " -- file opened in a+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -901,8 +901,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in a+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -910,8 +910,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in a+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -919,8 +919,8 @@ string(%d) "&""""&:&"&:,:":&,&:,,,, " -- file opened in w+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -928,8 +928,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in w+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -937,8 +937,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in w+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -946,8 +946,8 @@ string(%d) "&""""&:&"&:,:":&,&:,,,, " -- file opened in x+ -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -955,8 +955,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in x+b -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) @@ -964,8 +964,8 @@ string(24) "&""""&:&"&:,:":&,&:,,,, " -- file opened in x+t -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(24) int(24) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fread_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fread_error.php.expectf index 712522bb3..fa5771245 100644 --- a/hphp/test/zend/bad/ext-standard-file/fread_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fread_error.php.expectf @@ -1,40 +1,40 @@ *** Testing error conditions *** -- Testing fread() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fread() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fread() with invalid length arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fread() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fwrite() with closed/unset file handle -- -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf.php.expectf index 817f9aa00..98bcf2657 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf.php.expectf @@ -1,24 +1,24 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(0) NULL int(1) string(4) "data" -HipHop Warning: %a +HipHop Warning: %s int(-1) string(4) "data" NULL -HipHop Warning: %a +HipHop Warning: %s int(-1) array(0) { } array(0) { } -HipHop Warning: %a +HipHop Warning: %s int(-1) array(0) { } @@ -27,6 +27,6 @@ array(0) { bool(false) array(0) { } -HipHop Warning: %a +HipHop Warning: %s int(-1) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_error.php.expectf index 298869c70..32738a77c 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_error.php.expectf @@ -1,25 +1,25 @@ *** Testing fscanf() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s array(0) { } array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation10.php.expectf index 29cd9616a..a0bea2536 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation10.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation11.php.expectf index bac980785..af89c911a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation11.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation12.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation12.php.expectf index 5b84f8f8b..528c1f7a8 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation12.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation12.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation13.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation13.php.expectf index 9fbaaf92c..dd7e39390 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation13.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation13.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation14.php.expectf index 7a20c1d21..b41111083 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation14.php.expectf @@ -451,53 +451,53 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation15.php.expectf index daf3326ca..5248ab748 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation15.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation16.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation16.php.expectf index b558b1750..24be4eccf 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation16.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation16.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation17.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation17.php.expectf index f2ab4aedf..7a938b539 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation17.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation17.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation18.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation18.php.expectf index 84e0bba58..8e8b677eb 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation18.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation18.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation19.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation19.php.expectf index 2d4c4c411..bc78de988 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation19.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation19.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation2.php.expectf index 0a0bcdf27..76dd97438 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation2.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation20.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation20.php.expectf index abf2b61ef..9551a20ed 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation20.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation20.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation21.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation21.php.expectf index 3097695ec..3f76933fc 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation21.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation21.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation22.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation22.php.expectf index d455adb0a..7a417799b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation22.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation22.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation23.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation23.php.expectf index e37849b83..02f4a5d83 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation23.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation23.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation24.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation24.php.expectf index 886dbe6b1..4ecd9585d 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation24.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation24.php.expectf @@ -445,41 +445,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation25.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation25.php.expectf index 4052b7a50..afa709df5 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation25.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation25.php.expectf @@ -109,13 +109,13 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation26.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation26.php.expectf index 48eb33a7e..db1472aca 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation26.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation26.php.expectf @@ -139,15 +139,15 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation27.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation27.php.expectf index e4acf06a0..aecd02efa 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation27.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation27.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation28.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation28.php.expectf index 85f73cf3e..735a159d0 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation28.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation28.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation29.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation29.php.expectf index b849b5a9f..4125d1b5e 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation29.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation29.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation3.php.expectf index 438179203..eaf5892be 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation3.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation30.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation30.php.expectf index 3690bbbe7..7e669012e 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation30.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation30.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation31.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation31.php.expectf index 5fec08ab0..0b07e0955 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation31.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation31.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation32.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation32.php.expectf index 3fb41e43a..0961c5270 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation32.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation33.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation33.php.expectf index 014f49b12..6c0245163 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation33.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation33.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation34.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation34.php.expectf index 29c4c57f4..9a30b922c 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation34.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation34.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation35.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation35.php.expectf index aa5fc0b32..5bd7f0dba 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation35.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation35.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation36.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation36.php.expectf index 928ae9b6a..e6270899b 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation36.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation36.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation37.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation37.php.expectf index b914fb97b..9e9c6050a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation37.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation37.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation38.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation38.php.expectf index c92d39c47..0fecbdcc0 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation38.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation38.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation39.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation39.php.expectf index 43737caa5..da886a73f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation39.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation39.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation4.php.expectf index e272ac2bb..f9b5ac290 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation4.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation40.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation40.php.expectf index cc9b624ac..fe8e02890 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation40.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation40.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation41.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation41.php.expectf index 470b0d8c0..0caa9bf91 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation41.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation41.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation42.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation42.php.expectf index 8e0043213..e28c85c1a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation42.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation42.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation43.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation43.php.expectf index 1f676250a..4d37ae6b4 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation43.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation43.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation44.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation44.php.expectf index f330ccf1c..371abf58f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation44.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation44.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation45.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation45.php.expectf index 97815b6de..f62040ab1 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation45.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation45.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation46.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation46.php.expectf index 16278d7b7..286c1ccf1 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation46.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation46.php.expectf @@ -379,35 +379,35 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation47.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation47.php.expectf index 32f3c0fa6..1cd7b6f62 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation47.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation47.php.expectf @@ -67,9 +67,9 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation48.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation48.php.expectf index c26ef1052..334057950 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation48.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation48.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation49.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation49.php.expectf index cc4bb738f..fc824fa1a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation49.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation49.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation5.php.expectf index f14145fb5..fc42abc7a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation5.php.expectf @@ -307,29 +307,29 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation50.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation50.php.expectf index 0da51e552..7edd50f9d 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation50.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation50.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation6.php.expectf index d5bce573c..bd35e6718 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation6.php.expectf @@ -415,41 +415,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation7.php.expectf index 69bbf40d0..72ca8689a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation7.php.expectf @@ -79,13 +79,13 @@ NULL bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation8.php.expectf index 4d22622a2..ae5862b16 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation8.php.expectf @@ -739,65 +739,65 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fscanf_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-file/fscanf_variation9.php.expectf index 3d917fa32..8b85da72a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fscanf_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fscanf_variation9.php.expectf @@ -451,41 +451,41 @@ array(1) { bool(false) -- iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2-win32.php b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2-win32.php index 0c0680511..b195db7a6 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2-win32.php +++ b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2-win32.php @@ -43,7 +43,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,(binary)$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to begining of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2.php b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2.php index 0c0680511..b195db7a6 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2.php +++ b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_basic2.php @@ -43,7 +43,7 @@ foreach($file_content_types as $file_content_type){ fwrite($file_handle,(binary)$data_to_be_written); // set file pointer to 0 - var_dump( rewind($file_handle) ); // set to begining of file + var_dump( rewind($file_handle) ); // set to beginning of file var_dump( ftell($file_handle) ); foreach($whence_set as $whence){ diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error1.php.expectf b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error1.php.expectf index d8c548d1b..3cb0cd47c 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error1.php.expectf @@ -1,34 +1,34 @@ *** Testing fseek() : error conditions *** -- Testing fseek() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fseek() with unexpected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fseek() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fseek() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error2.php.expectf index 60da9da74..dc7370055 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error2.php.expectf @@ -1,32 +1,32 @@ *** Testing ftell() : error conditions *** -- Testing ftell() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing ftell() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing ftell() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing ftell with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error3.php.expectf b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error3.php.expectf index bda5ce2fc..cda95c29a 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fseek_ftell_rewind_error3.php.expectf @@ -1,32 +1,32 @@ *** Testing rewind() : error conditions *** -- Testing rewind() with zero argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing rewind() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing rewind() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing rewind() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/fseek_variation1.php.expectf index ea727f4b8..5dbf4f4fd 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fseek_variation1.php.expectf @@ -17,27 +17,27 @@ int(0) int(0) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) @@ -66,27 +66,27 @@ int(0) int(0) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) Arg value testClass -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) diff --git a/hphp/test/zend/bad/ext-standard-file/fseek_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/fseek_variation2.php.expectf index 72a4712ec..3fa5b6906 100644 --- a/hphp/test/zend/bad/ext-standard-file/fseek_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fseek_variation2.php.expectf @@ -53,22 +53,22 @@ int(0) int(3) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) int(3) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) int(3) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) int(3) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) int(3) diff --git a/hphp/test/zend/bad/ext-standard-file/fstat.php.expectf b/hphp/test/zend/bad/ext-standard-file/fstat.php.expectf index d3cf49d14..c167d239d 100644 --- a/hphp/test/zend/bad/ext-standard-file/fstat.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fstat.php.expectf @@ -52,6 +52,6 @@ array(26) { ["blocks"]=> int(%i) } -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fstat_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fstat_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-standard-file/fstat_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fstat_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/ftruncate_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/ftruncate_error.php.expectf index 2aa5b65d4..cfdeda8b7 100644 --- a/hphp/test/zend/bad/ext-standard-file/ftruncate_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/ftruncate_error.php.expectf @@ -2,39 +2,39 @@ Initial file size = 36 -- Testing ftruncate() with less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(36) -- Testing ftruncate() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(36) -- Testing ftruncate() with invalid file pointer -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing ftruncate() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(36) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(36) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fwrite.php.expectf b/hphp/test/zend/bad/ext-standard-file/fwrite.php.expectf index e77244958..0530fd70f 100644 --- a/hphp/test/zend/bad/ext-standard-file/fwrite.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fwrite.php.expectf @@ -1,16 +1,16 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) int(0) int(4) int(0) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(4) "data" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fwrite_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/fwrite_error.php.expectf index 565ebed5e..b1d64baec 100644 --- a/hphp/test/zend/bad/ext-standard-file/fwrite_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/fwrite_error.php.expectf @@ -1,37 +1,37 @@ *** Testing fwrite() : error conditions *** -- Testing fwrite() with less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fwrite() with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fwrite() with invalid length arguments -- int(0) int(0) -- Testing fwrite() with invalid arguments -- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing fwrite() with closed/unset file handle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/glob_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/glob_error.php.expectf index d605c4e3a..5c755f3b1 100644 --- a/hphp/test/zend/bad/ext-standard-file/glob_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/glob_error.php.expectf @@ -1,13 +1,13 @@ *** Testing glob() : error conditions *** -- Testing glob() with unexpected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing glob() with invalid arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/glob_error_002-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/glob_error_002-win32.php.expectf index 02a2ef2be..d7c8baefb 100644 --- a/hphp/test/zend/bad/ext-standard-file/glob_error_002-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/glob_error_002-win32.php.expectf @@ -1,4 +1,4 @@ *** Testing glob() : error condition - pattern too long. *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/glob_variation-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/glob_variation-win32.php.expectf index b9e89fbe2..b670ff477 100644 --- a/hphp/test/zend/bad/ext-standard-file/glob_variation-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/glob_variation-win32.php.expectf @@ -237,17 +237,17 @@ array(0) { } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- @@ -351,7 +351,7 @@ array(1) { array(0) { } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- array(0) { diff --git a/hphp/test/zend/bad/ext-standard-file/glob_variation.php.expectf b/hphp/test/zend/bad/ext-standard-file/glob_variation.php.expectf index 006cec15f..bd11fcbe9 100644 --- a/hphp/test/zend/bad/ext-standard-file/glob_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/glob_variation.php.expectf @@ -237,17 +237,17 @@ array(0) { } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- @@ -351,7 +351,7 @@ array(1) { array(0) { } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- array(0) { diff --git a/hphp/test/zend/bad/ext-standard-file/is_dir_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_dir_error.php.expectf index 4a0fd159d..c7f4b1ddf 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_dir_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_dir_error.php.expectf @@ -1,7 +1,7 @@ *** Testing is_dir() error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_dir_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_dir_variation2.php.expectf index 63a9bbd41..5027beecc 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_dir_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_dir_variation2.php.expectf @@ -4,7 +4,7 @@ bool(true) -- With symlink -- bool(true) -- With hardlink -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing is_dir() with file and links to a file *** diff --git a/hphp/test/zend/bad/ext-standard-file/is_dir_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_dir_variation3.php.expectf index 8713b01d8..ee3f8ce7f 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_dir_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_dir_variation3.php.expectf @@ -4,7 +4,7 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/is_dir_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_dir_variation4.php.expectf index a6207f3ff..663157e9d 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_dir_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_dir_variation4.php.expectf @@ -24,11 +24,11 @@ bool(true) bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_executable_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_executable_variation1.php.expectf index ab4e6f849..feda28743 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_executable_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_executable_variation1.php.expectf @@ -10,10 +10,10 @@ bool(false) -- Iteration 5 -- bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/is_executable_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_executable_variation3.php.expectf index 1a93719f0..fab2b3894 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_executable_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_executable_variation3.php.expectf @@ -8,7 +8,7 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_file_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_file_error.php.expectf index 2f9b7f0c5..a89e18b38 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_file_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_file_error.php.expectf @@ -1,10 +1,10 @@ *** Testing is_file() error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_file_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_file_variation3.php.expectf index fdc82ef8f..b295f57ae 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_file_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_file_variation3.php.expectf @@ -5,7 +5,7 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/is_file_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_file_variation4.php.expectf index 86aef5734..e56058c28 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_file_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_file_variation4.php.expectf @@ -12,10 +12,10 @@ bool(false) - Iteration 6 - bool(false) - Iteration 7 - -HipHop Warning: %a +HipHop Warning: %s NULL - Iteration 8 - -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_readable_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_readable_variation1.php.expectf index ccbdd0218..231a8d776 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_readable_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_readable_variation1.php.expectf @@ -12,13 +12,13 @@ bool(false) -- Iteration 6 -- bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/is_readable_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_readable_variation3.php.expectf index 72399808a..cd31cd158 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_readable_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_readable_variation3.php.expectf @@ -8,7 +8,7 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/is_writable_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_writable_variation1.php.expectf index c59a6094d..92faf5e5b 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_writable_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_writable_variation1.php.expectf @@ -18,19 +18,19 @@ bool(false) bool(false) bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/is_writable_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/is_writable_variation3.php.expectf index c40d704ab..7f9271a49 100644 --- a/hphp/test/zend/bad/ext-standard-file/is_writable_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/is_writable_variation3.php.expectf @@ -15,9 +15,9 @@ bool(false) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) diff --git a/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php b/hphp/test/zend/bad/ext-standard-file/lchgrp_basic.php similarity index 96% rename from hphp/test/zend/good/ext-standard-file/lchgrp_basic.php rename to hphp/test/zend/bad/ext-standard-file/lchgrp_basic.php index 8ab422d56..da04fa842 100644 --- a/hphp/test/zend/good/ext-standard-file/lchgrp_basic.php +++ b/hphp/test/zend/bad/ext-standard-file/lchgrp_basic.php @@ -10,7 +10,8 @@ var_dump( lchgrp( $filename, $gid ) ); var_dump( filegroup( $symlink ) === $gid ); ?> -===DONE=== + -===DONE=== + -===DONE=== + -===Done=== + Non_alpha6 = @ Non_alpha7 = # -Non_alpha8 = ^ -Non_alpha9 = - -Non_alpha10 = : -Non_alpha11 = ? -Non_alpha12 = / -Non_alpha13 = \ +Non_alpha8 = - +Non_alpha9 = : +Non_alpha10 = ? +Non_alpha11 = / +Non_alpha12 = \ ;These chars have a special meaning when used in the value, ; hence parser throws an error -;Non_alpha14 = & +;Non_alpha13 = & +;Non_alpha14 = ^ ;Non_alpha15 = {} ;Non_alpha16 = | ;Non_alpha17 = ~ diff --git a/hphp/test/zend/bad/ext-standard-file/parse_ini_file.php.expectf b/hphp/test/zend/bad/ext-standard-file/parse_ini_file.php.expectf index edf1c84a2..14fb79be7 100644 --- a/hphp/test/zend/bad/ext-standard-file/parse_ini_file.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/parse_ini_file.php.expectf @@ -29,12 +29,11 @@ Array [Non_alpha5] => <> [Non_alpha6] => @ [Non_alpha7] => # - [Non_alpha8] => ^ - [Non_alpha9] => - - [Non_alpha10] => : - [Non_alpha11] => ? - [Non_alpha12] => / - [Non_alpha13] => \ + [Non_alpha8] => - + [Non_alpha9] => : + [Non_alpha10] => ? + [Non_alpha11] => / + [Non_alpha12] => \ [Non_alpha1_quotes] => ; [Non_alpha2_quotes] => + [Non_alpha3_quotes] => * @@ -165,12 +164,11 @@ Array [Non_alpha5] => <> [Non_alpha6] => @ [Non_alpha7] => # - [Non_alpha8] => ^ - [Non_alpha9] => - - [Non_alpha10] => : - [Non_alpha11] => ? - [Non_alpha12] => / - [Non_alpha13] => \ + [Non_alpha8] => - + [Non_alpha9] => : + [Non_alpha10] => ? + [Non_alpha11] => / + [Non_alpha12] => \ [Non_alpha1_quotes] => ; [Non_alpha2_quotes] => + [Non_alpha3_quotes] => * diff --git a/hphp/test/zend/bad/ext-standard-file/parse_ini_file_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/parse_ini_file_error.php.expectf index 0ec8c4d9f..e4a1df872 100644 --- a/hphp/test/zend/bad/ext-standard-file/parse_ini_file_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/parse_ini_file_error.php.expectf @@ -1,14 +1,14 @@ *** Testing parse_ini_file() : error conditions *** -- Testing parse_ini_file() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing parse_ini_file() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing parse_ini_file() function with a non-existent file -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/parse_ini_file_variation3.php b/hphp/test/zend/bad/ext-standard-file/parse_ini_file_variation3.php index ec9ce822a..27d588035 100644 --- a/hphp/test/zend/bad/ext-standard-file/parse_ini_file_variation3.php +++ b/hphp/test/zend/bad/ext-standard-file/parse_ini_file_variation3.php @@ -48,7 +48,8 @@ file_put_contents($output_file, $iniContent); var_dump(parse_ini_file($iniFile)); ?> -===Done=== + @@ -105,15 +105,15 @@ string(21) "array( array(), null)" string(0) "" string(21) "array( array(), null)" -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- array(3) { diff --git a/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_03.php.expectf b/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_03.php.expectf index 0a4580cc9..8f37a6ece 100644 --- a/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_03.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_03.php.expectf @@ -1,7 +1,7 @@ -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 Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_04.php.expectf b/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_04.php.expectf index 46941ec3a..167e186cd 100644 --- a/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_04.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/php_fd_wrapper_04.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-sunos.php.expectf b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-sunos.php.expectf index 1c3cdc988..ef4be8604 100644 --- a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-sunos.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-sunos.php.expectf @@ -1,15 +1,15 @@ *** Testing for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL sh: abc.txt: not found resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) --- Done --- \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32-debug.php.expectf b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32-debug.php.expectf index 069041bf0..7608a963f 100644 --- a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32-debug.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32-debug.php.expectf @@ -1,16 +1,16 @@ *** Testing for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +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) --- Done ---'abc.txt' is not recognized as an internal or external command, diff --git a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32.php.expectf index 67bf8bff6..5d78f31e7 100644 --- a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error-win32.php.expectf @@ -1,15 +1,15 @@ *** Testing for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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) diff --git a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error.php.expectf index c18f3dc69..34e295707 100644 --- a/hphp/test/zend/bad/ext-standard-file/popen_pclose_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/popen_pclose_error.php.expectf @@ -1,15 +1,15 @@ *** Testing for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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) --- Done --- \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/readfile_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/readfile_error.php.expectf index 7c265d917..5cff72f43 100644 --- a/hphp/test/zend/bad/ext-standard-file/readfile_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/readfile_error.php.expectf @@ -1,23 +1,23 @@ *** Test readfile(): error conditions *** -- Testing readfile() with unexpected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing readfile() with invalid arguments -- -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) -- Testing readfile() with non-existent file -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/readfile_variation10-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/readfile_variation10-win32.php.expectf index 322d1f913..6f43af89a 100644 --- a/hphp/test/zend/bad/ext-standard-file/readfile_variation10-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/readfile_variation10-win32.php.expectf @@ -1,32 +1,32 @@ *** Testing readfile() : variation *** -- Filename: -1 -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: TRUE -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: FALSE -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: NULL -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: "" -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: " " -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: \0 -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: array() -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: /no/such/file/dir -- -HipHop Warning: %a +HipHop Warning: %s -- Filename: php/php -- -HipHop Warning: %a +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/readfile_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-file/readfile_variation10.php.expectf index 10b340e8b..caf094e06 100644 Binary files a/hphp/test/zend/bad/ext-standard-file/readfile_variation10.php.expectf and b/hphp/test/zend/bad/ext-standard-file/readfile_variation10.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-file/readfile_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/readfile_variation8-win32.php.expectf index 29a602734..5f0e3abed 100644 --- a/hphp/test/zend/bad/ext-standard-file/readfile_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/readfile_variation8-win32.php.expectf @@ -9,10 +9,10 @@ The File Contents -- %s\readfileVar8\readfileVar8Sub\..\..\readfileVar8\.\readfileVar8Sub -- The File Contents -- %s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub -- -HipHop Warning: %a +HipHop Warning: %s -- %s\readfileVar8\readfileVar8Sub\BADDIR -- -HipHop Warning: %a +HipHop Warning: %s -- readfileVar8\readfileVar8Sub -- The File Contents @@ -23,7 +23,7 @@ The File Contents -- .\readfileVar8\..\readfileVar8\readfileVar8Sub -- The File Contents -- BADDIR -- -HipHop Warning: %a +HipHop Warning: %s -- /%s/readfileVar8/readfileVar8Sub -- The File Contents diff --git a/hphp/test/zend/bad/ext-standard-file/readlink_realpath_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/readlink_realpath_variation2.php.expectf index db9bd08dc..00c7b6ab7 100644 --- a/hphp/test/zend/bad/ext-standard-file/readlink_realpath_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/readlink_realpath_variation2.php.expectf @@ -6,22 +6,22 @@ bool(true) string(%d) "%s/readlink_realpath_variation2/home/tests/link/readlink_realpath_variation2.tmp" string(%d) "%s/readlink_realpath_variation2/home/tests/link/readlink_realpath_variation2.tmp" -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s -- Testing readlink() and realpath() with hardlink, linkname stored inside an array -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s/readlink_realpath_variation2/home/tests/link/readlink_realpath_variation2_link.tmp" -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/readlink_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/readlink_variation1.php.expectf index 38e412bcb..e6444e690 100644 --- a/hphp/test/zend/bad/ext-standard-file/readlink_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/readlink_variation1.php.expectf @@ -1,19 +1,19 @@ *** Testing Invalid file types *** -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) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_basic.php b/hphp/test/zend/bad/ext-standard-file/rename_basic.php index 468cbd14d..94d0021b0 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_basic.php +++ b/hphp/test/zend/bad/ext-standard-file/rename_basic.php @@ -28,6 +28,7 @@ $keys_to_compare = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 12, var_dump( compare_stats($old_stat, $new_stat, $keys_to_compare) ); ?> -===Done=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_error.php.expectf index ef5e505bf..2ef3201db 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_error.php.expectf @@ -1,8 +1,8 @@ *** Testing rename() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation-win32.php.expectf index 9c8038dd6..a836bcfcb 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation-win32.php.expectf @@ -4,11 +4,11 @@ bool(true) bool(false) bool(true) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s -- Iteration 3 -- bool(true) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation.php.expectf index 9c8038dd6..a836bcfcb 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation.php.expectf @@ -4,11 +4,11 @@ bool(true) bool(false) bool(true) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s -- Iteration 3 -- bool(true) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation11-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation11-win32.php.expectf index 83c4366b1..3aefae6ca 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation11-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation11-win32.php.expectf @@ -17,11 +17,11 @@ bool(true) bool(true) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -41,7 +41,7 @@ bool(true) bool(true) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation12-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation12-win32.php.expectf index 552252254..607e3e256 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation12-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation12-win32.php.expectf @@ -17,11 +17,11 @@ bool(true) bool(true) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -41,7 +41,7 @@ bool(true) bool(true) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation12.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation12.php.expectf index 552252254..607e3e256 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation12.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation12.php.expectf @@ -17,11 +17,11 @@ bool(true) bool(true) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -41,7 +41,7 @@ bool(true) bool(true) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation13-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation13-win32.php.expectf index 34737be1d..996c0dfdd 100644 Binary files a/hphp/test/zend/bad/ext-standard-file/rename_variation13-win32.php.expectf and b/hphp/test/zend/bad/ext-standard-file/rename_variation13-win32.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation13.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation13.php.expectf index 2e9d0bbc8..0294916d8 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation13.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation13.php.expectf @@ -1,52 +1,52 @@ *** Testing rename() with obscure files *** -- testing '-1' -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing '1' -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing '' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing '' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing '' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing ' ' -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing '%s' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- testing 'Array' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -- testing '/no/such/file/dir' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- testing 'php/php' -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation3-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation3-win32.php.expectf index f0f95c72b..f69510338 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation3-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation3-win32.php.expectf @@ -7,7 +7,7 @@ bool(true) bool(true) -- Renaming existing file to existing directory name -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation5.php.expectf index 7ee79f270..e8912df3d 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation5.php.expectf @@ -8,24 +8,24 @@ bool(true) bool(true) -- Renaming existing link to existing directory name -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Renaming existing link to existing file name -- bool(true) -- Renaming existing file to existing directory name -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Renaming existing file to existing link name -- bool(true) -- Renaming existing directory to existing file name -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Renaming existing directory to existing link name -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation7-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation7-win32.php.expectf index ac657117a..bf0dd0279 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation7-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation7-win32.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation8-win32.php.expectf index b1c65f740..b4ced43f2 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation8-win32.php.expectf @@ -1,5 +1,5 @@ *** Testing rename() on non-existing file *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) @@ -10,7 +10,7 @@ bool(false) bool(true) *** Testing rename() on non-existing directory *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/rename_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/rename_variation8.php.expectf index b1c65f740..b4ced43f2 100644 --- a/hphp/test/zend/bad/ext-standard-file/rename_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rename_variation8.php.expectf @@ -1,5 +1,5 @@ *** Testing rename() on non-existing file *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) @@ -10,7 +10,7 @@ bool(false) bool(true) *** Testing rename() on non-existing directory *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/rmdir_variation3-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/rmdir_variation3-win32.php.expectf index e78282b10..0c268d525 100644 --- a/hphp/test/zend/bad/ext-standard-file/rmdir_variation3-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rmdir_variation3-win32.php.expectf @@ -6,9 +6,9 @@ Directory removed -- removing rmdirVar3.tmp\..\rmdirVar3.tmp\aSubDir -- Directory removed -- removing rmdirVar3.tmp\..\BADDIR\aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing BADDIR\aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s\rmdirVar3.tmp\aSubDir -- Directory removed -- removing %s\.\rmdirVar3.tmp\aSubDir -- @@ -16,7 +16,7 @@ Directory removed -- removing %s\rmdirVar3.tmp\..\rmdirVar3.tmp\aSubDir -- Directory removed -- removing %s\BADDIR\aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing rmdirVar3.tmp\aSubDir\ -- Directory removed -- removing %s\rmdirVar3.tmp\aSubDir\ -- diff --git a/hphp/test/zend/bad/ext-standard-file/rmdir_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/rmdir_variation3.php.expectf index fb35dc3e3..ac20eb9e8 100644 --- a/hphp/test/zend/bad/ext-standard-file/rmdir_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/rmdir_variation3.php.expectf @@ -6,9 +6,9 @@ Directory removed -- removing rmdirVar3.tmp/../rmdirVar3.tmp/aSubDir -- Directory removed -- removing rmdirVar3.tmp/../BADDIR/aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing BADDIR/aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s/rmdirVar3.tmp/aSubDir -- Directory removed -- removing %s/./rmdirVar3.tmp/aSubDir -- @@ -16,7 +16,7 @@ Directory removed -- removing %s/rmdirVar3.tmp/../rmdirVar3.tmp/aSubDir -- Directory removed -- removing %s/BADDIR/aSubDir -- -HipHop Warning: %a +HipHop Warning: %s -- removing rmdirVar3.tmp/aSubDir/ -- Directory removed -- removing %s/rmdirVar3.tmp/aSubDir/ -- diff --git a/hphp/test/zend/bad/ext-standard-file/stat_error-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/stat_error-win32.php.expectf index f41ba8864..1969b8d41 100644 --- a/hphp/test/zend/bad/ext-standard-file/stat_error-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/stat_error-win32.php.expectf @@ -1,16 +1,16 @@ *** Testing stat() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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 NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/stream_001.php.expectf b/hphp/test/zend/bad/ext-standard-file/stream_001.php.expectf index 5bf0187c8..226cdad44 100644 --- a/hphp/test/zend/bad/ext-standard-file/stream_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/stream_001.php.expectf @@ -1,7 +1,7 @@ bool(true) -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) bool(true) resource(%d) of type (stream) diff --git a/hphp/test/zend/bad/ext-standard-file/stream_002.php.expectf b/hphp/test/zend/bad/ext-standard-file/stream_002.php.expectf index 7f9802134..02d1ad747 100644 --- a/hphp/test/zend/bad/ext-standard-file/stream_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/stream_002.php.expectf @@ -1,24 +1,24 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(26) "Failed to parse address """ -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(27) "Failed to parse address "["" -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(%d) "Failed to parse%saddress "[ "" -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(27) "Failed to parse address "."" -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(27) "Failed to parse address "1"" -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) string(27) "Failed to parse address "1"" diff --git a/hphp/test/zend/bad/ext-standard-file/symlink.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink.php.expectf index edafe63c9..dc55dc209 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink.php.expectf @@ -1,23 +1,23 @@ bool(true) string(%d) "%ssymlink.dat" int(%d) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) -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(%d) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_basic2.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_basic2.php.expectf index c8452517d..a2686d90a 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_basic2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_basic2.php.expectf @@ -8,9 +8,9 @@ int(%d) bool(true) -- Testing on hard links -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error1.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error1.php.expectf index e0dedad59..90ff8915d 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error1.php.expectf @@ -1,30 +1,30 @@ *** Testing symlink() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing linkinfo() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s int(-1) -HipHop Warning: %a +HipHop Warning: %s int(-1) -HipHop Warning: %a +HipHop Warning: %s int(-1) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error2.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error2.php.expectf index 27203ef34..a144b875d 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_error2.php.expectf @@ -1,27 +1,27 @@ *** Testing link() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing is_link() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation2.php.expectf index 6c20afc62..5399a0948 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation2.php.expectf @@ -1,7 +1,7 @@ *** Creating a hard link to a non-existent file *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation5.php.expectf index e4193f112..3f0bf42ee 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation5.php.expectf @@ -1,7 +1,7 @@ *** Testing linkinfo() and is_link() on deleted link *** bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s int(-1) bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation6.php.expectf index a0a76913d..4217b54ad 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation6.php.expectf @@ -2,16 +2,16 @@ bool(true) -- Working with soft links -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) bool(false) -- Working with hard links -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s int(-1) bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation7.php.expectf index 2bf08b7a9..e69a9bf90 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation7.php.expectf @@ -1,15 +1,15 @@ *** Create soft link to file and then to itself *** bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Create soft link to directory and then to itself *** bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Create hard link to file and then to itself *** bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation8.php.expectf index 861e68d65..b06076522 100644 --- a/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/symlink_link_linkinfo_is_link_variation8.php.expectf @@ -1,10 +1,10 @@ *** Create hard link in different directory with same filename *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) *** Create soft link in different directory with same filename *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/tempnam_variation3-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/tempnam_variation3-win32.php.expectf index 81049aa9c..3685c2337 100644 --- a/hphp/test/zend/bad/ext-standard-file/tempnam_variation3-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/tempnam_variation3-win32.php.expectf @@ -15,7 +15,7 @@ Failed, not created in the correct directory %s vs %s -- Iteration 6 -- OK -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s OK -- Iteration 8 -- OK diff --git a/hphp/test/zend/bad/ext-standard-file/tempnam_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-file/tempnam_variation3.php.expectf index e9736d406..a5313b0fa 100644 --- a/hphp/test/zend/bad/ext-standard-file/tempnam_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/tempnam_variation3.php.expectf @@ -28,9 +28,9 @@ File name is => %s/%s File permissions are => 100600 File created in => directory specified -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s -- File is not created -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 8 -- File name is => %s/dir%s File permissions are => 100600 diff --git a/hphp/test/zend/bad/ext-standard-file/tempnam_variation7-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/tempnam_variation7-win32.php.expectf index cd5117b52..99158259d 100644 --- a/hphp/test/zend/bad/ext-standard-file/tempnam_variation7-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/tempnam_variation7-win32.php.expectf @@ -24,13 +24,13 @@ File name is => %s%et%s File permissions are => 100666 File created in => temp dir -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s -- File is not created -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s -- File is not created -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 8 -- File name is => %s%et%s File permissions are => 100666 diff --git a/hphp/test/zend/bad/ext-standard-file/tempnam_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-file/tempnam_variation7.php.expectf index 9aeaef062..73facaf38 100644 --- a/hphp/test/zend/bad/ext-standard-file/tempnam_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/tempnam_variation7.php.expectf @@ -24,13 +24,13 @@ File name is => %s%etempnam_variation3.tmp%s File permissions are => 100600 File created in => temp dir -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s -- File is not created -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s -- File is not created -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 8 -- File name is => %s/tempnam_variation3.tmp%s File permissions are => 100600 diff --git a/hphp/test/zend/bad/ext-standard-file/touch.php.expectf b/hphp/test/zend/bad/ext-standard-file/touch.php.expectf index 7a42fb856..2e2a36a57 100644 --- a/hphp/test/zend/bad/ext-standard-file/touch.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/touch.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) int(%d) @@ -10,6 +10,6 @@ bool(true) int(100) bool(true) int(100) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/touch_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/touch_error.php.expectf index 6b15415fd..93b487cb6 100644 --- a/hphp/test/zend/bad/ext-standard-file/touch_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/touch_error.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/touch_variation5-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/touch_variation5-win32.php.expectf index 514641c50..8543d41de 100644 --- a/hphp/test/zend/bad/ext-standard-file/touch_variation5-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/touch_variation5-win32.php.expectf @@ -8,9 +8,9 @@ PASSED: ./touchVar5.tmp/aSubDirOrFile - created --- testing touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile --- PASSED: touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created --- testing touchVar5.tmp/../BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing %s/touchVar5.tmp/aSubDirOrFile --- PASSED: %s/touchVar5.tmp/aSubDirOrFile - created --- testing %s/./touchVar5.tmp/aSubDirOrFile --- @@ -18,11 +18,11 @@ PASSED: %s/./touchVar5.tmp/aSubDirOrFile - created --- testing %s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile --- PASSED: %s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created --- testing %s/BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp/aSubDirOrFile/ --- -HipHop Warning: %a +HipHop Warning: %s --- testing %s/touchVar5.tmp/aSubDirOrFile/ --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp//aSubDirOrFile --- PASSED: touchVar5.tmp//aSubDirOrFile - created --- testing %s//touchVar5.tmp//aSubDirOrFile --- diff --git a/hphp/test/zend/bad/ext-standard-file/touch_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-file/touch_variation5.php.expectf index 6d3c7bc6d..d4ceac0e2 100644 --- a/hphp/test/zend/bad/ext-standard-file/touch_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/touch_variation5.php.expectf @@ -8,9 +8,9 @@ PASSED: ./touchVar5.tmp/aSubDirOrFile - created --- testing touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile --- PASSED: touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created --- testing touchVar5.tmp/../BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing /%s/touchVar5.tmp/aSubDirOrFile --- PASSED: /%s/touchVar5.tmp/aSubDirOrFile - created --- testing /%s/./touchVar5.tmp/aSubDirOrFile --- @@ -18,11 +18,11 @@ PASSED: /%s/./touchVar5.tmp/aSubDirOrFile - created --- testing /%s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile --- PASSED: /%s/touchVar5.tmp/../touchVar5.tmp/aSubDirOrFile - created --- testing /%s/BADDIR/aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp/aSubDirOrFile/ --- -HipHop Warning: %a +HipHop Warning: %s --- testing /%s/touchVar5.tmp/aSubDirOrFile/ --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp//aSubDirOrFile --- PASSED: touchVar5.tmp//aSubDirOrFile - created --- testing /%s//touchVar5.tmp//aSubDirOrFile --- diff --git a/hphp/test/zend/bad/ext-standard-file/touch_variation6-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/touch_variation6-win32.php.expectf index 5ee549a5f..eb17159a8 100644 --- a/hphp/test/zend/bad/ext-standard-file/touch_variation6-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/touch_variation6-win32.php.expectf @@ -8,9 +8,9 @@ PASSED: .\touchVar5.tmp\aSubDirOrFile - created --- testing touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile --- PASSED: touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created --- testing touchVar5.tmp\..\BADDIR\aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing BADDIR\aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing %s\touchVar5.tmp\aSubDirOrFile --- PASSED: %s\touchVar5.tmp\aSubDirOrFile - created --- testing %s\.\touchVar5.tmp\aSubDirOrFile --- @@ -18,11 +18,11 @@ PASSED: %s\.\touchVar5.tmp\aSubDirOrFile - created --- testing %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile --- PASSED: %s\touchVar5.tmp\..\touchVar5.tmp\aSubDirOrFile - created --- testing %s\BADDIR\aSubDirOrFile --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp\aSubDirOrFile\ --- -HipHop Warning: %a +HipHop Warning: %s --- testing %s\touchVar5.tmp\aSubDirOrFile\ --- -HipHop Warning: %a +HipHop Warning: %s --- testing touchVar5.tmp\\aSubDirOrFile --- PASSED: touchVar5.tmp\\aSubDirOrFile - created --- testing %s\\touchVar5.tmp\\aSubDirOrFile --- diff --git a/hphp/test/zend/bad/ext-standard-file/umask_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/umask_error.php.expectf index be610717e..0a806b59e 100644 --- a/hphp/test/zend/bad/ext-standard-file/umask_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/umask_error.php.expectf @@ -1,4 +1,4 @@ *** Testing umask() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_error-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_error-win32.php.expectf index d07d9946b..fa88bb276 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_error-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_error-win32.php.expectf @@ -1,33 +1,33 @@ *** Testing unlink() : error conditions *** -- Testing unlink() on unexpected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) -- Testing unlink() on invalid arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) 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) -- Testing unlink() on non-existent file -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing unlink() on directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_error.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_error.php.expectf index d07d9946b..fa88bb276 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_error.php.expectf @@ -1,33 +1,33 @@ *** Testing unlink() : error conditions *** -- Testing unlink() on unexpected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) -- Testing unlink() on invalid arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) 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) -- Testing unlink() on non-existent file -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing unlink() on directory -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation1-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation1-win32.php.expectf index 7f8d1373c..2df74d80e 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation1-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation1-win32.php.expectf @@ -7,7 +7,7 @@ bool(true) -- Unlinking file without write permission, its dir having default permission -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation1.php.expectf index 175908756..dbc57bdc8 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation1.php.expectf @@ -1,7 +1,7 @@ *** Testing unlink() on file inside a directory *** -- Unlink file having default permission and its dir having read only permission -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation10.php.expectf index 9d5c82f1d..47e097acd 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation10.php.expectf @@ -17,5 +17,5 @@ directory unlinked directory unlinked --- try to unlink a directory --- -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation2-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation2-win32.php.expectf index d27f71a57..e47f075fe 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation2-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation2-win32.php.expectf @@ -1,5 +1,5 @@ *** Testing unlink() on a file when file handle is open *** -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation4.php.expectf index 1edb71578..8e008a3e6 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation4.php.expectf @@ -1,6 +1,6 @@ *** Testing unlink() on deleted file *** bool(true) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation8-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation8-win32.php.expectf index 24a13c966..824a408ec 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation8-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation8-win32.php.expectf @@ -6,9 +6,9 @@ file removed -- removing unlinkVar8.tmp/../unlinkVar8.tmp/file.tmp -- file removed -- removing unlinkVar8.tmp/../BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s/unlinkVar8.tmp/file.tmp -- file removed -- removing %s/./unlinkVar8.tmp/file.tmp -- @@ -16,11 +16,11 @@ file removed -- removing %s/unlinkVar8.tmp/../unlinkVar8.tmp/file.tmp -- file removed -- removing %s/BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s/unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar8.tmp//file.tmp -- file removed -- removing %s//unlinkVar8.tmp//file.tmp -- diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation8.php.expectf index ad17e8f31..beff744c1 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation8.php.expectf @@ -18,17 +18,17 @@ file unlinked -- unlinking hard link unlinkVar8.tmp/../unlinkVar8.tmp/file.tmp -- file unlinked -- removing unlinkVar8.tmp/../BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking soft link unlinkVar8.tmp/../BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking hard link unlinkVar8.tmp/../BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking soft link BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking hard link BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing /%s/unlinkVar8.tmp/file.tmp -- file removed -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp -- @@ -48,23 +48,23 @@ file unlinked -- unlinking hard link /%s/unlinkVar8.tmp/../unlinkVar8.tmp/file.tmp -- file unlinked -- removing /%s/BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking soft link /%s/BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking hard link /%s/BADDIR/file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking soft link unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking hard link unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- removing /%s/unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking soft link /%s/unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- unlinking hard link /%s/unlinkVar8.tmp/file.tmp/ -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar8.tmp//file.tmp -- file removed -- unlinking soft link unlinkVar8.tmp//file.tmp -- diff --git a/hphp/test/zend/bad/ext-standard-file/unlink_variation9-win32.php.expectf b/hphp/test/zend/bad/ext-standard-file/unlink_variation9-win32.php.expectf index 62b27a21c..29be05881 100644 --- a/hphp/test/zend/bad/ext-standard-file/unlink_variation9-win32.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/unlink_variation9-win32.php.expectf @@ -6,9 +6,9 @@ file removed -- removing unlinkVar9.tmp\..\unlinkVar9.tmp\file.tmp -- file removed -- removing unlinkVar9.tmp\..\BADDIR\file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing BADDIR\file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s\unlinkVar9.tmp\file.tmp -- file removed -- removing %s\.\unlinkVar9.tmp\file.tmp -- @@ -16,11 +16,11 @@ file removed -- removing %s\unlinkVar9.tmp\..\unlinkVar9.tmp\file.tmp -- file removed -- removing %s\BADDIR\file.tmp -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar9.tmp\file.tmp\ -- -HipHop Warning: %a +HipHop Warning: %s -- removing %s\unlinkVar9.tmp\file.tmp\ -- -HipHop Warning: %a +HipHop Warning: %s -- removing unlinkVar9.tmp\\file.tmp -- file removed -- removing %s\\unlinkVar9.tmp\\file.tmp -- diff --git a/hphp/test/zend/bad/ext-standard-file/userstreams_002.php.expectf b/hphp/test/zend/bad/ext-standard-file/userstreams_002.php.expectf index ce0222629..5ce576aed 100644 --- a/hphp/test/zend/bad/ext-standard-file/userstreams_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/userstreams_002.php.expectf @@ -5,32 +5,32 @@ bool(true) bool(true) ------ stream_cast not implemented: ------- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) ------ return value is false: ------- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) ------ return value not a stream resource: ------- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) ------ return value is stream itself: ------- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) ------ return value cannot be casted: ------- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/userstreams_003.php.expectf b/hphp/test/zend/bad/ext-standard-file/userstreams_003.php.expectf index dc5cd1397..a1cb0cb51 100644 --- a/hphp/test/zend/bad/ext-standard-file/userstreams_003.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/userstreams_003.php.expectf @@ -35,7 +35,7 @@ bool(true) bool(true) ------ stream_set_blocking - 4: ------- -HipHop Warning: %a +HipHop Warning: %s bool(false) ------ stream_set_write_buffer - 1: ------- diff --git a/hphp/test/zend/bad/ext-standard-file/userstreams_004.php.expectf b/hphp/test/zend/bad/ext-standard-file/userstreams_004.php.expectf index 3945423a4..50a69c34e 100644 --- a/hphp/test/zend/bad/ext-standard-file/userstreams_004.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/userstreams_004.php.expectf @@ -1,7 +1,7 @@ bool(true) bool(true) ------ stream_lock not implemented: ------- -HipHop Warning: %a +HipHop Warning: %s bool(false) ------ fclock(LOCK_SH): ------- bool(true) diff --git a/hphp/test/zend/bad/ext-standard-file/userstreams_005.php.expectf b/hphp/test/zend/bad/ext-standard-file/userstreams_005.php.expectf index 7708a565e..18313964c 100644 --- a/hphp/test/zend/bad/ext-standard-file/userstreams_005.php.expectf +++ b/hphp/test/zend/bad/ext-standard-file/userstreams_005.php.expectf @@ -2,7 +2,7 @@ bool(true) bool(true) bool(true) ------ stream_truncate not implemented: ------- -HipHop Warning: %a +HipHop Warning: %s bool(false) ------ stream_truncate size 0: ------- truncation with new_size=0 @@ -14,5 +14,5 @@ bool(true) bool(false) ------ stream_truncate bad return: ------- truncation with new_size=0 -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-filters/001.php.expectf b/hphp/test/zend/bad/ext-standard-filters/001.php.expectf index d746d4bc5..f01300dc5 100644 --- a/hphp/test/zend/bad/ext-standard-filters/001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-filters/001.php.expectf @@ -1,12 +1,12 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-filters/filter_errors_convert_base64_decode.php.expectf b/hphp/test/zend/bad/ext-standard-filters/filter_errors_convert_base64_decode.php.expectf index 77b283890..4024e3c01 100644 --- a/hphp/test/zend/bad/ext-standard-filters/filter_errors_convert_base64_decode.php.expectf +++ b/hphp/test/zend/bad/ext-standard-filters/filter_errors_convert_base64_decode.php.expectf @@ -1,5 +1,5 @@ test filtering of buffered data -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test filtering of non buffered data -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-filters/filter_errors_user.php.expectf b/hphp/test/zend/bad/ext-standard-filters/filter_errors_user.php.expectf index 0a412da11..3176e3361 100644 --- a/hphp/test/zend/bad/ext-standard-filters/filter_errors_user.php.expectf +++ b/hphp/test/zend/bad/ext-standard-filters/filter_errors_user.php.expectf @@ -1,64 +1,64 @@ test_filter0 bool(true) test filtering of buffered data -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test filtering of non buffered data -HipHop Warning: %a +HipHop Warning: %s test_filter1 bool(true) test filtering of buffered data -HipHop Warning: %a +HipHop Warning: %s test filtering of non buffered data test_filter2 bool(true) test filtering of buffered data -HipHop Warning: %a +HipHop Warning: %s test filtering of non buffered data test_filter3 bool(true) test filtering of buffered data -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test filtering of non buffered data -HipHop Warning: %a +HipHop Warning: %s test_filter4 bool(true) test filtering of buffered data -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test filtering of non buffered data -HipHop Warning: %a +HipHop Warning: %s test append / read / remove test_filter0 -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test_filter1 -HipHop Warning: %a +HipHop Warning: %s test_filter2 -HipHop Warning: %a +HipHop Warning: %s test_filter3 -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test_filter4 -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test append all / read / remove all test_filter0 test_filter1 test_filter2 test_filter3 test_filter4 -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 test append all / read / close test_filter0 test_filter1 test_filter2 test_filter3 test_filter4 -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-filters/filter_errors_zlib_inflate.php.expectf b/hphp/test/zend/bad/ext-standard-filters/filter_errors_zlib_inflate.php.expectf index c11cd6cab..71c6a4883 100644 --- a/hphp/test/zend/bad/ext-standard-filters/filter_errors_zlib_inflate.php.expectf +++ b/hphp/test/zend/bad/ext-standard-filters/filter_errors_zlib_inflate.php.expectf @@ -1,3 +1,3 @@ test filtering of buffered data -HipHop Warning: %a +HipHop Warning: %s test filtering of non buffered data \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-filters/stream_filter_remove_basic.php b/hphp/test/zend/bad/ext-standard-filters/stream_filter_remove_basic.php index ff47a634d..362f9eb1e 100644 --- a/hphp/test/zend/bad/ext-standard-filters/stream_filter_remove_basic.php +++ b/hphp/test/zend/bad/ext-standard-filters/stream_filter_remove_basic.php @@ -23,7 +23,8 @@ fpassthru( $fp ); fclose( $fp ); ?> -===DONE=== + -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/boolval.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/boolval.php.expectf new file mode 100644 index 000000000..c70287bbc --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-general_functions/boolval.php.expectf @@ -0,0 +1,11 @@ +bool(false) +bool(false) +bool(false) +bool(false) +bool(false) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug41037.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug41037.php.expectf index d2be168c5..a21a21a9a 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug41037.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug41037.php.expectf @@ -1,7 +1,7 @@ hello -HipHop Warning: %a +HipHop Warning: %s Done hello -HipHop Warning: %a +HipHop Warning: %s hello -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug41970.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug41970.php.expectf index 1ff70b4e3..3c3f1447c 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug41970.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug41970.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug44461.php b/hphp/test/zend/bad/ext-standard-general_functions/bug44461.php index d7b7b95d6..5e48ce70c 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug44461.php +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug44461.php @@ -6,6 +6,7 @@ EOF ); parse_ini_file(__DIR__ . 'bug44461.ini', true); ?> -===DONE=== + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug46587.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug46587.php.expectf index f928e9fa4..f16d455c2 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug46587.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug46587.php.expectf @@ -1,4 +1,4 @@ int(%d) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug47857.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug47857.php.expectf index ffdc0f59f..9e2162449 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug47857.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug47857.php.expectf @@ -3,4 +3,4 @@ bool(true) Strict Standards: Non-static method foo::bar() should not be called statically in %sbug47857.php on line %d ok bool(false) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_2.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_2.php.expectf index cf56c863f..ae2d7dcb0 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s foo \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_3.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_3.php.expectf index cf56c863f..ae2d7dcb0 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s foo \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_4.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_4.php.expectf index cf56c863f..ae2d7dcb0 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/bug60227_4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/bug60227_4.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s foo \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/call_user_method_002.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/call_user_method_002.php.expectf index 0cef9d9b4..195e22cec 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/call_user_method_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/call_user_method_002.php.expectf @@ -1,2 +1,2 @@ Deprecated: Function call_user_method() is deprecated in hphp/test/zend/bad/ext-standard-general_functions/call_user_method_002.phpt on line %d -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/callbacks_001.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/callbacks_001.php.expectf index f2b140cde..fb11c9a2f 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/callbacks_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/callbacks_001.php.expectf @@ -20,5 +20,5 @@ O $this|O::who O $this|B::who -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/debug_zval_dump_v.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/debug_zval_dump_v.php.expectf index 87d852cd6..396a06ae8 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/debug_zval_dump_v.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/debug_zval_dump_v.php.expectf @@ -25,7 +25,7 @@ NULL refcount(1) long(10) refcount(2) -- Value of $ref_first_var -- -HipHop Notice: %a +HipHop Notice: %s NULL refcount(1) -- Value of $first_var -- @@ -43,7 +43,7 @@ long(10) refcount(1) long(10) refcount(1) -- Value of $var_3: (after unsetting var_3) -- -HipHop Notice: %a +HipHop Notice: %s NULL refcount(1) -- Value of $var_2: -- @@ -53,7 +53,7 @@ long(10) refcount(1) long(10) refcount(1) -- Value of $var_1: (after unsetting variable_1) -- -HipHop Notice: %a +HipHop Notice: %s NULL refcount(1) -- Value of $var_2: -- diff --git a/hphp/test/zend/bad/ext-standard-general_functions/error_get_last.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/error_get_last.php.expectf index 9e956a633..0f07c4934 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/error_get_last.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/error_get_last.php.expectf @@ -1,5 +1,5 @@ NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(4) { ["type"]=> @@ -11,7 +11,7 @@ array(4) { ["line"]=> int(4) } -HipHop Notice: %a +HipHop Notice: %s array(4) { ["type"]=> int(8) diff --git a/hphp/test/zend/bad/ext-standard-general_functions/escapeshellarg_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/escapeshellarg_error.php.expectf index 168e07563..c4a61e2ce 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/escapeshellarg_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/escapeshellarg_error.php.expectf @@ -1,22 +1,22 @@ *** Testing escapeshellarg() : error conditions *** -- Testing escapeshellarg() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing escapeshellarg() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing escapeshellarg() function with a object supplied for argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing escapeshellarg() function with a resource supplied for argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing escapeshellarg() function with a array supplied for argument -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/floatval.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/floatval.php.expectf index 9f7f6a6ef..a61102bea 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/floatval.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/floatval.php.expectf @@ -81,13 +81,13 @@ float(0) float(0) *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_error.php.expectf index 4cb200379..44e22b99e 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_error.php.expectf @@ -1,11 +1,11 @@ *** Testing get_extension_funcs() : error conditions *** -- Too few arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Too many arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Invalid extension name -- diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_variation.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_variation.php.expectf index 786bc675d..f5c9d1c1b 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/get_extension_funcs_variation.php.expectf @@ -18,13 +18,13 @@ bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- bool(false) @@ -41,7 +41,7 @@ bool(false) -- Iteration 19 -- bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_gpc.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_gpc.php.expectf index 361ad6e43..4b0534a60 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_gpc.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_gpc.php.expectf @@ -2,6 +2,6 @@ Simple testcase for get_magic_quotes_gpc() function bool(false) -- Error cases -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_runtime.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_runtime.php.expectf index 268dee5e2..6a8d2bd70 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_runtime.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/get_magic_quotes_runtime.php.expectf @@ -2,6 +2,6 @@ Simple testcase for get_magic_quotes_runtime() function bool(false) -- Error cases -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_variation1.php.expectf index 0003f1dc7..55c69b026 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/get_resource_type_variation1.php.expectf @@ -1,30 +1,30 @@ *** Testing get_resource_type() : variation test *** -- bool -- -HipHop Warning: %a +HipHop Warning: %s NULL -- int 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- float 10.5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- string -- -HipHop Warning: %a +HipHop Warning: %s NULL -- array -- -HipHop Warning: %a +HipHop Warning: %s NULL -- NULL -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Object -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getrusage.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getrusage.php.expectf index 1194716ad..74e363f2e 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getrusage.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getrusage.php.expectf @@ -1,6 +1,6 @@ string(5) "array" string(5) "array" string(5) "array" -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getrusage_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getrusage_error.php.expectf index 710100f5d..28d2d6d10 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getrusage_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getrusage_error.php.expectf @@ -1,17 +1,17 @@ *** Testing getrusage() : error conditions *** -- Testing getrusage() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing getrusage() function with invalid argument - non-numeric STRING-- -HipHop Warning: %a +HipHop Warning: %s -- Testing getrusage() function with invalid argument - ARRAY-- -HipHop Warning: %a +HipHop Warning: %s -- Testing getrusage() function with invalid argument - OBJECT -- -HipHop Warning: %a +HipHop Warning: %s -- Testing getrusage() function with invalid argument - RESOURCE -- -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation1.php.expectf index ff8593880..19d42611c 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation1.php.expectf @@ -1,9 +1,9 @@ *** Test substituting argument 1 with array values *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation13.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation13.php.expectf index 1fab8ea86..a32984603 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation13.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation13.php.expectf @@ -1,4 +1,4 @@ *** Test substituting argument 2 with object values *** bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation6.php.expectf index 95bca615e..0553944a6 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation6.php.expectf @@ -1,4 +1,4 @@ *** Test substituting argument 1 with object values *** bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation8.php.expectf index 90d409308..b8fe37a04 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getservbyname_variation8.php.expectf @@ -1,9 +1,9 @@ *** Test substituting argument 2 with array values *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/getservbyport_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/getservbyport_variation1.php.expectf index a9bcb3180..9ec5b89d7 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/getservbyport_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/getservbyport_variation1.php.expectf @@ -1,13 +1,13 @@ bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) string(%d) "%s" -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/gettype_settype_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/gettype_settype_error.php.expectf index f55bbcdc1..204c733cb 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/gettype_settype_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/gettype_settype_error.php.expectf @@ -1,16 +1,16 @@ **** Testing gettype() and settype() functions **** *** Testing gettype(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing settype(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/head.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/head.php.expectf index c580a6f60..0d400eead 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/head.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/head.php.expectf @@ -2,16 +2,16 @@ NULL bool(false) array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) array(0) { diff --git a/hphp/test/zend/bad/ext-standard-general_functions/import_request.php b/hphp/test/zend/bad/ext-standard-general_functions/import_request.php index ec4b662a0..b7966fdeb 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/import_request.php +++ b/hphp/test/zend/bad/ext-standard-general_functions/import_request.php @@ -1,7 +1,9 @@ string(0) "" } -HipHop Warning: %a +HipHop Warning: %s in %sparse_ini_file.php on line 20 bool(false) -HipHop Warning: %a +HipHop Warning: %s in %sparse_ini_file.php on line 26 bool(false) array(1) { diff --git a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php index 8f8732258..44f4f1a30 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php +++ b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php @@ -52,15 +52,15 @@ Non_alpha4 = % Non_alpha5 = <> Non_alpha6 = @ Non_alpha7 = # -Non_alpha8 = ^ -Non_alpha9 = - -Non_alpha10 = : -Non_alpha11 = ? -Non_alpha12 = / -Non_alpha13 = \ +Non_alpha8 = - +Non_alpha9 = : +Non_alpha10 = ? +Non_alpha11 = / +Non_alpha12 = \ ;These chars have a special meaning when used in the value, ; hence parser throws an error -;Non_alpha14 = & +;Non_alpha13 = & +;Non_alpha14 = ^ ;Non_alpha15 = {} ;Non_alpha16 = | ;Non_alpha17 = ~ diff --git a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php.expectf index e819c7911..78bc54918 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_001.php.expectf @@ -29,12 +29,11 @@ Array [Non_alpha5] => <> [Non_alpha6] => @ [Non_alpha7] => # - [Non_alpha8] => ^ - [Non_alpha9] => - - [Non_alpha10] => : - [Non_alpha11] => ? - [Non_alpha12] => / - [Non_alpha13] => \ + [Non_alpha8] => - + [Non_alpha9] => : + [Non_alpha10] => ? + [Non_alpha11] => / + [Non_alpha12] => \ [Non_alpha1_quotes] => ; [Non_alpha2_quotes] => + [Non_alpha3_quotes] => * @@ -165,12 +164,11 @@ Array [Non_alpha5] => <> [Non_alpha6] => @ [Non_alpha7] => # - [Non_alpha8] => ^ - [Non_alpha9] => - - [Non_alpha10] => : - [Non_alpha11] => ? - [Non_alpha12] => / - [Non_alpha13] => \ + [Non_alpha8] => - + [Non_alpha9] => : + [Non_alpha10] => ? + [Non_alpha11] => / + [Non_alpha12] => \ [Non_alpha1_quotes] => ; [Non_alpha2_quotes] => + [Non_alpha3_quotes] => * diff --git a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_002.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_002.php.expectf index 5d40ba037..226bb1cac 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/parse_ini_string_002.php.expectf @@ -1,15 +1,15 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) array(1) { [%u|b%"test"]=> %unicode|string%(0) "" } -HipHop Warning: %a +HipHop Warning: %s in %s bool(false) -HipHop Warning: %a +HipHop Warning: %s in %s bool(false) array(1) { diff --git a/hphp/test/zend/bad/ext-standard-general_functions/php_uname_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/php_uname_error.php.expectf index d11ffe654..c353e37e9 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/php_uname_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/php_uname_error.php.expectf @@ -1,19 +1,19 @@ *** Testing php_uname() - error test -- Testing php_uname() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing php_uname() function with invalid mode -- bool(true) -- Testing php_uname() function with invalid argument types -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/phpcredits.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/phpcredits.php.expectf index 55e0cf47c..b43c767af 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/phpcredits.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/phpcredits.php.expectf @@ -24,7 +24,7 @@ PHP Quality Assurance Team %wWebsites and Infrastructure team%w %a bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -- PHP Credits diff --git a/hphp/test/zend/bad/ext-standard-general_functions/phpcredits2.php b/hphp/test/zend/bad/ext-standard-general_functions/phpcredits2.php index 52931b559..78a077294 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/phpcredits2.php +++ b/hphp/test/zend/bad/ext-standard-general_functions/phpcredits2.php @@ -1,5 +1,6 @@ %s bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL --

PHP Credits

diff --git a/hphp/test/zend/bad/ext-standard-general_functions/phpinfo.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/phpinfo.php.expectf index 9a22767c0..9a5b7f606 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/phpinfo.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/phpinfo.php.expectf @@ -45,7 +45,7 @@ PHP License %A bool(true) -- -HipHop Warning: %a +HipHop Warning: %s NULL -- phpinfo() diff --git a/hphp/test/zend/bad/ext-standard-general_functions/phpinfo2.php b/hphp/test/zend/bad/ext-standard-general_functions/phpinfo2.php index 1d753e960..b281beb22 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/phpinfo2.php +++ b/hphp/test/zend/bad/ext-standard-general_functions/phpinfo2.php @@ -1,5 +1,6 @@ %abool(true) -- -HipHop Warning: %a +HipHop Warning: %s NULL -- diff --git a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_error.php.expectf index 605baac7a..49292393c 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_error.php.expectf @@ -1,5 +1,5 @@ *** Test by calling method or function with incorrect numbers of arguments *** -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation1.php.expectf index 1c4604633..a67a7c9ff 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation1.php.expectf @@ -1,9 +1,9 @@ *** Test substituting argument 1 with array values *** -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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation3.php.expectf index cb0b5e6ce..1238429f5 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation3.php.expectf @@ -1,9 +1,9 @@ *** Test substituting argument 1 with emptyUnsetUndefNull values *** bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation7.php.expectf index 6d400bbe0..3e0aa5841 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/proc_nice_variation7.php.expectf @@ -1,9 +1,9 @@ *** Test substituting argument 1 with string values *** -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) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/rand.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/rand.php.expectf index fac456096..71e71d1c5 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/rand.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/rand.php.expectf @@ -1,25 +1,25 @@ int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL int(%i) int(%d) int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL int(%i) int(%d) NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.php.expectf index 76571e254..4f0601cdc 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.php.expectf @@ -3,12 +3,12 @@ Simple testcase for set_magic_quotes_runtime() - error test -- Testing set_magic_quotes_runtime() function with less than expected no. of arguments -- Deprecated: Function set_magic_quotes_runtime() is deprecated in hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.phpt on line %d -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing set_magic_quotes_runtime() function with more than expected no. of arguments -- Deprecated: Function set_magic_quotes_runtime() is deprecated in hphp/test/zend/bad/ext-standard-general_functions/set_magic_quotes_runtime_error.phpt on line %d -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/uniqid_error.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/uniqid_error.php.expectf index 531ff827e..f2d4ae024 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/uniqid_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/uniqid_error.php.expectf @@ -1,11 +1,11 @@ *** Testing uniqid() : error conditions *** -- Testing uniqid() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uniqid() function with invalid values for $prefix -- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/var_export_error2.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/var_export_error2.php.expectf index 48734b894..82465ddae 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/var_export_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/var_export_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-general_functions/var_export_error3.php.expectf b/hphp/test/zend/bad/ext-standard-general_functions/var_export_error3.php.expectf index 48734b894..82465ddae 100644 --- a/hphp/test/zend/bad/ext-standard-general_functions/var_export_error3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-general_functions/var_export_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-image/getimagesize_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-image/getimagesize_variation3.php.expectf index bc203e135..5ba6e77a6 100644 --- a/hphp/test/zend/bad/ext-standard-image/getimagesize_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-image/getimagesize_variation3.php.expectf @@ -13,17 +13,17 @@ array(0) { } -- Non-existent file (nofile.ext) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) array(0) { } -- Empty File (blank_file.bmp) -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) array(0) { } diff --git a/hphp/test/zend/bad/ext-standard-image/getimagesize_variation_003.php.expectf b/hphp/test/zend/bad/ext-standard-image/getimagesize_variation_003.php.expectf index bc203e135..5ba6e77a6 100644 --- a/hphp/test/zend/bad/ext-standard-image/getimagesize_variation_003.php.expectf +++ b/hphp/test/zend/bad/ext-standard-image/getimagesize_variation_003.php.expectf @@ -13,17 +13,17 @@ array(0) { } -- Non-existent file (nofile.ext) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) array(0) { } -- Empty File (blank_file.bmp) -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) array(0) { } diff --git a/hphp/test/zend/bad/ext-standard-image/image_type_to_extension.php.expectf b/hphp/test/zend/bad/ext-standard-image/image_type_to_extension.php.expectf index 520e06ba8..87cb5a7fc 100644 --- a/hphp/test/zend/bad/ext-standard-image/image_type_to_extension.php.expectf +++ b/hphp/test/zend/bad/ext-standard-image/image_type_to_extension.php.expectf @@ -46,14 +46,14 @@ Constant: IMAGETYPE_JPEG2000 Constant: IMAGETYPE_XBM With dot: .xbm Without dot: xbm -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-image/image_type_to_mime_type_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-image/image_type_to_mime_type_variation1.php.expectf index 1ec67124a..c710fefff 100644 --- a/hphp/test/zend/bad/ext-standard-image/image_type_to_mime_type_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-image/image_type_to_mime_type_variation1.php.expectf @@ -16,11 +16,11 @@ string(24) "application/octet-stream" string(24) "application/octet-stream" -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- @@ -42,23 +42,23 @@ string(9) "image/gif" string(24) "application/octet-stream" -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- diff --git a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_error.php.expectf b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_error.php.expectf index efbcf6387..d7625ae7b 100644 --- a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_error.php.expectf @@ -1,22 +1,22 @@ *** Testing ezmlm_hash() : error conditions *** -- Testing ezmlm_hash() function with fewer than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ezmlm_hash() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ezmlm_hash() function with invalid input - ARRAY -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ezmlm_hash() function with invalid input - OBJECT without 'cast_object' method -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ezmlm_hash() function with invalid input - RESOURCE -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php.expectf index b51678326..841b15d97 100644 --- a/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-mail/ezmlm_hash_variation1.php.expectf @@ -47,13 +47,13 @@ array(1) { string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- array(2) { @@ -63,7 +63,7 @@ array(2) { string(35) " piece2 piece3 piece4 piece5 piece6" } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- array(2) { @@ -73,13 +73,13 @@ array(2) { string(35) " piece2 piece3 piece4 piece5 piece6" } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- array(1) { @@ -87,12 +87,12 @@ array(1) { string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/abs_variation.php.expectf b/hphp/test/zend/bad/ext-standard-math/abs_variation.php.expectf index 6667b8c88..66229993a 100644 --- a/hphp/test/zend/bad/ext-standard-math/abs_variation.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/abs_variation.php.expectf @@ -37,7 +37,7 @@ int(0) int(0) -- Iteration 13 -- -HipHop Notice: %a +HipHop Notice: %s int(1) -- Iteration 14 -- diff --git a/hphp/test/zend/bad/ext-standard-math/acos_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/acos_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/acos_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/acos_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/acosh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/acosh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/acosh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/acosh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/asin_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/asin_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/asin_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/asin_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/asinh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/asinh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/asinh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/asinh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/atan_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/atan_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/atan_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/atan_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/atanh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/atanh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/atanh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/atanh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/base_convert_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/base_convert_error.php.expectf deleted file mode 100644 index c37abc39d..000000000 --- a/hphp/test/zend/bad/ext-standard-math/base_convert_error.php.expectf +++ /dev/null @@ -1,10 +0,0 @@ -*** Testing base_convert() : error conditions *** -Incorrect number of arguments -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -Incorrect input - -HipHop Fatal error: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/base_convert_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/base_convert_variation1.php.expectf index 7908a8432..6ac005f03 100644 --- a/hphp/test/zend/bad/ext-standard-math/base_convert_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/base_convert_variation1.php.expectf @@ -55,7 +55,7 @@ string(1) "0" string(1) "0" -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s string(1) "0" -- Iteration 20 -- diff --git a/hphp/test/zend/bad/ext-standard-math/base_convert_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/base_convert_variation2.php.expectf index 767a8bc66..653b80377 100644 --- a/hphp/test/zend/bad/ext-standard-math/base_convert_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/base_convert_variation2.php.expectf @@ -1,97 +1,97 @@ *** Testing base_convert() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- string(2) "31" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- 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 Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/base_convert_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-math/base_convert_variation3.php.expectf index 13ee47e34..8615bf1f4 100644 --- a/hphp/test/zend/bad/ext-standard-math/base_convert_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/base_convert_variation3.php.expectf @@ -1,97 +1,97 @@ *** Testing base_convert() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- string(2) "25" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- 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 Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/bindec_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/bindec_variation1.php.expectf index 85a92111a..061f82a5a 100644 --- a/hphp/test/zend/bad/ext-standard-math/bindec_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/bindec_variation1.php.expectf @@ -52,7 +52,7 @@ int(0) int(0) -- Iteration 18 -- -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 19 -- diff --git a/hphp/test/zend/bad/ext-standard-math/bindec_variation1_64bit.php.expectf b/hphp/test/zend/bad/ext-standard-math/bindec_variation1_64bit.php.expectf index 85a92111a..061f82a5a 100644 --- a/hphp/test/zend/bad/ext-standard-math/bindec_variation1_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/bindec_variation1_64bit.php.expectf @@ -52,7 +52,7 @@ int(0) int(0) -- Iteration 18 -- -HipHop Notice: %a +HipHop Notice: %s int(0) -- Iteration 19 -- diff --git a/hphp/test/zend/bad/ext-standard-math/cos_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/cos_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/cos_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/cos_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/cosh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/cosh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/cosh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/cosh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/fmod_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/fmod_variation1.php.expectf index 05bfeeb23..f0d495c3b 100644 --- a/hphp/test/zend/bad/ext-standard-math/fmod_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/fmod_variation1.php.expectf @@ -49,31 +49,31 @@ float(1) float(0) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ float(0) float(0) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/fmod_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/fmod_variation2.php.expectf index f3c549f52..a456c02ce 100644 --- a/hphp/test/zend/bad/ext-standard-math/fmod_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/fmod_variation2.php.expectf @@ -49,31 +49,31 @@ float(0) float(NAN) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ float(NAN) float(NAN) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/hypot_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/hypot_variation1.php.expectf index cac9fe052..3daa80d8e 100644 --- a/hphp/test/zend/bad/ext-standard-math/hypot_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/hypot_variation1.php.expectf @@ -49,31 +49,31 @@ float(5.0990195135928) float(5) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ float(5) float(5) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/hypot_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/hypot_variation2.php.expectf index 92e91f197..9ae80ec73 100644 --- a/hphp/test/zend/bad/ext-standard-math/hypot_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/hypot_variation2.php.expectf @@ -49,31 +49,31 @@ float(3.1622776601684) float(3) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ float(3) float(3) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/is_finite_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/is_finite_variation1.php.expectf index 623a42ac9..c9cc7682f 100644 --- a/hphp/test/zend/bad/ext-standard-math/is_finite_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/is_finite_variation1.php.expectf @@ -49,31 +49,31 @@ bool(true) bool(true) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ bool(true) bool(true) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/is_infinite_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/is_infinite_variation1.php.expectf index 1728b4445..07cecacb2 100644 --- a/hphp/test/zend/bad/ext-standard-math/is_infinite_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/is_infinite_variation1.php.expectf @@ -49,31 +49,31 @@ bool(false) bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ bool(false) bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/is_nan_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/is_nan_variation1.php.expectf index d2aa9e73b..2d3d15aeb 100644 --- a/hphp/test/zend/bad/ext-standard-math/is_nan_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/is_nan_variation1.php.expectf @@ -49,31 +49,31 @@ bool(false) bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ bool(false) bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/log_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/log_variation1.php.expectf index 4d1c7dec0..9b196c9bf 100644 --- a/hphp/test/zend/bad/ext-standard-math/log_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/log_variation1.php.expectf @@ -49,31 +49,31 @@ float(0) float(-INF) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ float(-INF) float(-INF) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/log_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/log_variation2.php.expectf index bef19ee02..a8bdc09ec 100644 --- a/hphp/test/zend/bad/ext-standard-math/log_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/log_variation2.php.expectf @@ -1,7 +1,7 @@ *** Testing log() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- @@ -11,7 +11,7 @@ float(NAN) float(0.12145441273706) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- @@ -21,7 +21,7 @@ float(0.053250469650086) float(0.48661854224853) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- @@ -34,64 +34,64 @@ float(-0.055781611216686) float(-1.6507645591169) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- float(NAN) -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- float(NAN) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/mt_rand_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/mt_rand_error.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-standard-math/mt_rand_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/mt_rand_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/mt_rand_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/mt_rand_variation1.php.expectf index 8346e45fa..9295f9601 100644 --- a/hphp/test/zend/bad/ext-standard-math/mt_rand_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/mt_rand_variation1.php.expectf @@ -49,31 +49,31 @@ int(%i) int(%i) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ int(%i) int(%i) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/mt_rand_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/mt_rand_variation2.php.expectf index 90ac14097..a63a70d76 100644 --- a/hphp/test/zend/bad/ext-standard-math/mt_rand_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/mt_rand_variation2.php.expectf @@ -49,31 +49,31 @@ int(%i) int(%i) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ int(%i) int(%i) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/mt_srand_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/mt_srand_error.php.expectf index 8ba59eae5..7bc123211 100644 --- a/hphp/test/zend/bad/ext-standard-math/mt_srand_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/mt_srand_error.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/mt_srand_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/mt_srand_variation1.php.expectf index b4669f5a0..f1eccf836 100644 --- a/hphp/test/zend/bad/ext-standard-math/mt_srand_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/mt_srand_variation1.php.expectf @@ -49,31 +49,31 @@ NULL NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ NULL NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/rand_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/rand_error.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/bad/ext-standard-math/rand_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/rand_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/rand_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/rand_variation1.php.expectf index 7eb9b71a0..65057800f 100644 --- a/hphp/test/zend/bad/ext-standard-math/rand_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/rand_variation1.php.expectf @@ -49,31 +49,31 @@ int(%i) int(%i) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ int(%i) int(%i) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/rand_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-math/rand_variation2.php.expectf index b8dc75ed7..ac7418340 100644 --- a/hphp/test/zend/bad/ext-standard-math/rand_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/rand_variation2.php.expectf @@ -49,31 +49,31 @@ int(%i) int(%i) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ int(%i) int(%i) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/sin_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/sin_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/sin_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/sin_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/sinh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/sinh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/sinh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/sinh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/srand_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/srand_error.php.expectf index a4d5f7902..4f669058f 100644 --- a/hphp/test/zend/bad/ext-standard-math/srand_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/srand_error.php.expectf @@ -1,8 +1,8 @@ *** Testing srand() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/srand_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-math/srand_variation1.php.expectf index 5dd6648d2..a24a78029 100644 --- a/hphp/test/zend/bad/ext-standard-math/srand_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/srand_variation1.php.expectf @@ -49,31 +49,31 @@ NULL NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- @@ -83,6 +83,6 @@ NULL NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/tan_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/tan_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/tan_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/tan_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/tanh_error.php.expectf b/hphp/test/zend/bad/ext-standard-math/tanh_error.php.expectf index 5062dbc28..c5cd6f9f2 100644 --- a/hphp/test/zend/bad/ext-standard-math/tanh_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-math/tanh_error.php.expectf @@ -1,7 +1,7 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-misc/syslog_parameters.php.expectf b/hphp/test/zend/bad/ext-standard-misc/syslog_parameters.php.expectf index 68060b92a..9fbf6d725 100644 --- a/hphp/test/zend/bad/ext-standard-misc/syslog_parameters.php.expectf +++ b/hphp/test/zend/bad/ext-standard-misc/syslog_parameters.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error1.php.expectf b/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error2.php.expectf b/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error2.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-misc/time_nanosleep_error2.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-misc/time_sleep_until_error2.php.expectf b/hphp/test/zend/bad/ext-standard-misc/time_sleep_until_error2.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-standard-misc/time_sleep_until_error2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-misc/time_sleep_until_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-network/fsockopen_error.php.expectf b/hphp/test/zend/bad/ext-standard-network/fsockopen_error.php.expectf index 0ed339810..18225dc83 100644 --- a/hphp/test/zend/bad/ext-standard-network/fsockopen_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-network/fsockopen_error.php.expectf @@ -1,22 +1,22 @@ *** Testing fsockopen() : basic error conditions *** -- Testing fsockopen() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(10) "string_val" int(10) -- Testing fsockopen() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Attempting to connect to a non-existent socket -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%a" -- Attempting to connect using an invalid protocol -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(100) "Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-network/inet.php.expectf b/hphp/test/zend/bad/ext-standard-network/inet.php.expectf index 9bf03c337..2f531a0a7 100644 --- a/hphp/test/zend/bad/ext-standard-network/inet.php.expectf +++ b/hphp/test/zend/bad/ext-standard-network/inet.php.expectf @@ -1,20 +1,20 @@ %unicode|string%(9) "127.0.0.1" %unicode|string%(13) "255.255.255.0" -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) %unicode|string%(%d) "7f000001" %unicode|string%(9) "127.0.0.1" diff --git a/hphp/test/zend/bad/ext-standard-network/ip.php.expectf b/hphp/test/zend/bad/ext-standard-network/ip.php.expectf index 66e61fd06..4819b7287 100644 --- a/hphp/test/zend/bad/ext-standard-network/ip.php.expectf +++ b/hphp/test/zend/bad/ext-standard-network/ip.php.expectf @@ -10,17 +10,17 @@ int(0) string(7) "0.0.0.0" int(1118019956) string(14) "66.163.161.116" -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) int(1869573999) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(13) "255.254.82.80" string(7) "0.0.0.0" -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-network/ip_x86_64.php.expectf b/hphp/test/zend/bad/ext-standard-network/ip_x86_64.php.expectf index e5a4027a2..6c6d5c9dc 100644 --- a/hphp/test/zend/bad/ext-standard-network/ip_x86_64.php.expectf +++ b/hphp/test/zend/bad/ext-standard-network/ip_x86_64.php.expectf @@ -10,17 +10,17 @@ int(0) string(7) "0.0.0.0" int(1118019956) string(14) "66.163.161.116" -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) int(1869573999) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(13) "255.254.82.80" string(7) "0.0.0.0" -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php b/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php new file mode 100644 index 000000000..597dcf762 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php @@ -0,0 +1,16 @@ + 3))); + +var_dump(password_hash("foo", PASSWORD_BCRYPT, array("cost" => 32))); + +var_dump(password_hash("foo", PASSWORD_BCRYPT, array("salt" => "foo"))); + +var_dump(password_hash("foo", PASSWORD_BCRYPT, array("salt" => "123456789012345678901"))); + +var_dump(password_hash("foo", PASSWORD_BCRYPT, array("salt" => 123))); + +var_dump(password_hash("foo", PASSWORD_BCRYPT, array("cost" => "foo"))); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php.expectf new file mode 100644 index 000000000..251a20212 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_bcrypt_errors.php.expectf @@ -0,0 +1,12 @@ +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_get_info.php b/hphp/test/zend/bad/ext-standard-password/password_get_info.php new file mode 100644 index 000000000..2437becad --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_get_info.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_get_info.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_get_info.php.expectf new file mode 100644 index 000000000..2e2a0e1f0 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_get_info.php.expectf @@ -0,0 +1,41 @@ +array(3) { + ["algo"]=> + int(1) + ["algoName"]=> + string(6) "bcrypt" + ["options"]=> + array(1) { + ["cost"]=> + int(10) + } +} +array(3) { + ["algo"]=> + int(1) + ["algoName"]=> + string(6) "bcrypt" + ["options"]=> + array(1) { + ["cost"]=> + int(11) + } +} +array(3) { + ["algo"]=> + int(0) + ["algoName"]=> + string(7) "unknown" + ["options"]=> + array(0) { + } +} +array(3) { + ["algo"]=> + int(0) + ["algoName"]=> + string(7) "unknown" + ["options"]=> + array(0) { + } +} +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php b/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php new file mode 100644 index 000000000..7e380b467 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php.expectf new file mode 100644 index 000000000..ce51e4de4 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_get_info_error.php.expectf @@ -0,0 +1,5 @@ +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_hash.php b/hphp/test/zend/bad/ext-standard-password/password_hash.php new file mode 100644 index 000000000..a734e0b37 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_hash.php @@ -0,0 +1,15 @@ + 7, "salt" => "usesomesillystringforsalt"))); + +var_dump(password_hash("test", PASSWORD_BCRYPT, array("salt" => "123456789012345678901" . chr(0)))); + +echo "OK!"; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_hash.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_hash.php.expectf new file mode 100644 index 000000000..0878e26ff --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_hash.php.expectf @@ -0,0 +1,5 @@ +int(60) +bool(true) +string(60) "$2y$07$usesomesillystringfore2uDLvp1Ii2e./U9C8sBjqp8I90dH6hi" +string(60) "$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y" +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_hash_error.php b/hphp/test/zend/bad/ext-standard-password/password_hash_error.php new file mode 100644 index 000000000..e1552a777 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_hash_error.php @@ -0,0 +1,21 @@ + array()))); + +/* Non-string salt, checking for memory leaks */ +var_dump(password_hash('123', PASSWORD_BCRYPT, array('salt' => 1234))); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_hash_error.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_hash_error.php.expectf new file mode 100644 index 000000000..73b55444a --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_hash_error.php.expectf @@ -0,0 +1,16 @@ +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php new file mode 100644 index 000000000..87c30d1bf --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php @@ -0,0 +1,32 @@ + 10))); + +// Valid with cost the same, additional params +var_dump(password_needs_rehash('$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT, array('cost' => 10, 'foo' => 3))); + +// Invalid, different (lower) cost +var_dump(password_needs_rehash('$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT, array('cost' => 09))); + +// Invalid, different (higher) cost +var_dump(password_needs_rehash('$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT, array('cost' => 11))); + +// Valid with cost the default +$cost = str_pad(PASSWORD_BCRYPT_DEFAULT_COST, 2, '0', STR_PAD_LEFT); +var_dump(password_needs_rehash('$2y$'.$cost.'$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT)); + +// Should Issue Needs Rehash, Since Foo is cast to 0... +var_dump(password_needs_rehash('$2y$10$MTIzNDU2Nzg5MDEyMzQ1Nej0NmcAWSLR.oP7XOR9HD/vjUuOj100y', PASSWORD_BCRYPT, array('cost' => 'foo'))); + + + +echo "OK!"; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php.expectf new file mode 100644 index 000000000..2058cf906 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash.php.expectf @@ -0,0 +1,9 @@ +bool(true) +bool(false) +bool(false) +bool(false) +bool(true) +bool(true) +bool(false) +bool(true) +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php new file mode 100644 index 000000000..625f0d7bb --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php.expectf new file mode 100644 index 000000000..9f200930a --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_needs_rehash_error.php.expectf @@ -0,0 +1,11 @@ +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +HipHop Warning: %s +NULL +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_verify.php b/hphp/test/zend/bad/ext-standard-password/password_verify.php new file mode 100644 index 000000000..1faf27ac6 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_verify.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_verify.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_verify.php.expectf new file mode 100644 index 000000000..b8e4a8d9b --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_verify.php.expectf @@ -0,0 +1,5 @@ +bool(false) +bool(false) +bool(false) +bool(true) +OK! \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_verify_error.php b/hphp/test/zend/bad/ext-standard-password/password_verify_error.php new file mode 100644 index 000000000..b6a0358db --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_verify_error.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-password/password_verify_error.php.expectf b/hphp/test/zend/bad/ext-standard-password/password_verify_error.php.expectf new file mode 100644 index 000000000..79fe1faf3 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-password/password_verify_error.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +bool(false) +HipHop Warning: %s +bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/005.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/005.php.expectf index d21fdf6f8..6b4bfa7f5 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/005.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/005.php.expectf @@ -42,7 +42,7 @@ unserializer(autoload_not_available) Try __autoload() do_autoload(autoload_not_available) do_autoload(autoload_not_available) -HipHop Warning: %a +HipHop Warning: %s object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(22) "autoload_not_available" diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug14293.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/bug14293.php.expectf index 97aa94bac..23dd5aa4c 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/bug14293.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/bug14293.php.expectf @@ -1,5 +1,5 @@ __sleep called -HipHop Notice: %a +HipHop Notice: %s O:1:"t":2:{s:1:"a";s:5:"hello";s:1:"b";N;} object(t)#%d (2) { ["a"]=> diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug35895.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/bug35895.php.expectf index 0136aab3f..2ff4b661d 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/bug35895.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/bug35895.php.expectf @@ -1 +1 @@ -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug45706.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/bug45706.php.expectf index 2e94a6494..f86e3439f 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/bug45706.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/bug45706.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s array(2) { [0]=> object(__PHP_Incomplete_Class)#%d (1) { diff --git a/hphp/test/zend/bad/ext-standard-serialize/incomplete_class.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/incomplete_class.php.expectf index a47d43205..647456acf 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/incomplete_class.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/incomplete_class.php.expectf @@ -1,8 +1,8 @@ object(__PHP_Incomplete_Class)#%d (0) { } -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_error_001.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_error_001.php.expectf index ee3f586a4..272808435 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing serialize()/unserialize() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_005.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_005.php.expectf index 178e7c493..6b3ea64e1 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_005.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_005.php.expectf @@ -10,7 +10,7 @@ string(12) "ref1.changed" string(9) "p.changed" bool(false) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL @@ -22,21 +22,21 @@ object(__PHP_Incomplete_Class)#%d (2) { int(1) } bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s string(9) "p.changed" -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s bool(false) -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_006.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_006.php.expectf index fcec5e0cb..39b27be2d 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_006.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_006.php.expectf @@ -1,5 +1,5 @@ object(__PHP_Incomplete_Class)#%d (0) { } -HipHop Notice: %a +HipHop Notice: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_007.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_007.php.expectf index 06fff6a2a..3b64eeffc 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_007.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_007.php.expectf @@ -1,7 +1,7 @@ in __autoload(FOO) in check(FOO) in __autoload(FOO) -HipHop Warning: %a +HipHop Warning: %s object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(3) "FOO" diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_008.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_008.php.expectf index 320765ad1..88ee4ace5 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_008.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_008.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(3) "FOO" diff --git a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_009.php.expectf b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_009.php.expectf index 2dbd5602e..7b285fa3d 100644 --- a/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_009.php.expectf +++ b/hphp/test/zend/bad/ext-standard-serialize/serialization_objects_009.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s object(__PHP_Incomplete_Class)#%d (1) { ["__PHP_Incomplete_Class_Name"]=> string(1) "C" diff --git a/hphp/test/zend/bad/ext-standard-streams/bug44712.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug44712.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/ext-standard-streams/bug44712.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/bug44712.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug53903.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug53903.php.expectf index ee3f6af61..58c0ab3e5 100644 --- a/hphp/test/zend/bad/ext-standard-streams/bug53903.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/bug53903.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s Array ( [0] => 1 diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166.php b/hphp/test/zend/bad/ext-standard-streams/bug64166.php new file mode 100644 index 000000000..b2cfd89b9 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166.php @@ -0,0 +1,29 @@ + "\n", + 'line-length' => 74 + )); + var_dump(stream_get_contents($fd, -1, 0)); + + stream_filter_remove($res); + + rewind($fd); + stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array( + 'line-break-chars' => "\n", + 'line-length' => 6 + )); + var_dump(stream_get_contents($fd, -1, 0)); + + fclose($fd); +} + +test_64166("FIRST \nSECOND"); +test_64166("FIRST \nSECOND"); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug64166.php.expectf new file mode 100644 index 000000000..ee7137aad --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166.php.expectf @@ -0,0 +1,13 @@ +string(15) "FIRST=20 +SECOND" +string(19) "FIRST= +=20 +SECON= +D" +string(18) "FIRST=20=20 +SECOND" +string(24) "FIRST= +=20= +=20 +SECON= +D" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php b/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php new file mode 100644 index 000000000..cbe9601e9 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php @@ -0,0 +1,33 @@ + "\n", + 'line-length' => 74 + )); + $str = ""; + while(($c = fread($fd, 1))!= "") $str .= $c; + var_dump($str); + + stream_filter_remove($res); + + rewind($fd); + stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_READ, array( + 'line-break-chars' => "\n", + 'line-length' => 6 + )); + $str = ""; + while(($c = fread($fd, 1))!= "") $str .= $c; + var_dump($str); + + fclose($fd); +} + +test_64166("FIRST \nSECOND"); +test_64166("FIRST \nSECOND"); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php.expectf new file mode 100644 index 000000000..ee7137aad --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166_2.php.expectf @@ -0,0 +1,13 @@ +string(15) "FIRST=20 +SECOND" +string(19) "FIRST= +=20 +SECON= +D" +string(18) "FIRST=20=20 +SECOND" +string(24) "FIRST= +=20= +=20 +SECON= +D" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php b/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php new file mode 100644 index 000000000..5f9d076f4 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php @@ -0,0 +1,31 @@ + "\n", + 'line-length' => 74 + )); + fwrite($fd, $data); + rewind($fd); + + var_dump(stream_get_contents($fd, -1, 0)); + + stream_filter_remove($res); + + rewind($fd); + stream_filter_append($fd, 'convert.quoted-printable-encode', STREAM_FILTER_WRITE, array( + 'line-break-chars' => "\n", + 'line-length' => 6 + )); + fwrite($fd, $data); + rewind($fd); + var_dump(stream_get_contents($fd, -1, 0)); + + fclose($fd); +} + +test_64166("FIRST \nSECOND"); +test_64166("FIRST \nSECOND"); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php.expectf new file mode 100644 index 000000000..ee7137aad --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64166_3.php.expectf @@ -0,0 +1,13 @@ +string(15) "FIRST=20 +SECOND" +string(19) "FIRST= +=20 +SECON= +D" +string(18) "FIRST=20=20 +SECOND" +string(24) "FIRST= +=20= +=20 +SECON= +D" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64433.php b/hphp/test/zend/bad/ext-standard-streams/bug64433.php new file mode 100644 index 000000000..ad2b5560d --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64433.php @@ -0,0 +1,30 @@ + + array( + 'follow_location'=>0, + ) + ); +$context = stream_context_create($arr); +foreach($codes as $code) { + echo "$code: ".file_get_contents("http://".PHP_CLI_SERVER_ADDRESS."/index.php?status=$code&loc=1", false, $context); +} +echo "follow=1\n"; +$arr = array('http'=> + array( + 'follow_location'=>1, + ) + ); +$context = stream_context_create($arr); +foreach($codes as $code) { + echo "$code: ".file_get_contents("http://".PHP_CLI_SERVER_ADDRESS."/index.php?status=$code&loc=1", false, $context); +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64433.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug64433.php.expectf new file mode 100644 index 000000000..847e10d71 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64433.php.expectf @@ -0,0 +1,37 @@ +HELLO! +default +200: HELLO! +201: HELLO! +204: HELLO! +301: REDIRECTED +302: REDIRECTED +303: REDIRECTED +304: HELLO! +305: HELLO! +307: REDIRECTED +404: HELLO! +500: HELLO! +follow=0 +200: HELLO! +201: HELLO! +204: HELLO! +301: HELLO! +302: HELLO! +303: HELLO! +304: HELLO! +305: HELLO! +307: HELLO! +404: HELLO! +500: HELLO! +follow=1 +200: REDIRECTED +201: REDIRECTED +204: REDIRECTED +301: REDIRECTED +302: REDIRECTED +303: REDIRECTED +304: REDIRECTED +305: REDIRECTED +307: REDIRECTED +404: REDIRECTED +500: REDIRECTED \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64770.php b/hphp/test/zend/bad/ext-standard-streams/bug64770.php new file mode 100644 index 000000000..ae9b3d2c7 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64770.php @@ -0,0 +1,45 @@ + array('pipe', 'r'), // stdin + 1 => array('pipe', 'w'), // stdout + 2 => array('pipe', 'w'), // strerr +); + +$other_opts = array('suppress_errors' => false, 'binary_pipes' => true); + +$cmd = (substr(PHP_OS, 0, 3) == 'WIN') ? 'dir' : 'ls'; +$p = proc_open($cmd, $descs, $pipes, '.', NULL, $other_opts); + +if (is_resource($p)) { + $data = ''; + + while (1) { + $w = $e = NULL; + $n = stream_select($pipes, $w, $e, 300); + + if ($n === false) { + echo "no streams \n"; + break; + } else if ($n === 0) { + echo "process timed out\n"; + proc_terminate($p, 9); + break; + } else if ($n > 0) { + $line = fread($pipes[1], 8192); + if (strlen($line) == 0) { + /* EOF */ + break; + } + $data .= $line; + } + } + var_dump(strlen($data)); + + $ret = proc_close($p); + var_dump($ret); +} else { + echo "no process\n"; +} +?> +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/bug64770.php.expectf b/hphp/test/zend/bad/ext-standard-streams/bug64770.php.expectf new file mode 100644 index 000000000..49b0565a1 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-streams/bug64770.php.expectf @@ -0,0 +1,3 @@ +int(%d) +int(0) +==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_001.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_001.php.expectf index d4531bf89..79fe1faf3 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_001.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_002.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_002.php.expectf index d4531bf89..79fe1faf3 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_context_set_option_error_002.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_get_meta_data_file_error.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_get_meta_data_file_error.php.expectf index 4122c3306..c272aca27 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_get_meta_data_file_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_get_meta_data_file_error.php.expectf @@ -1,18 +1,18 @@ *** Testing stream_get_meta_data() : error conditions *** -- Testing stream_get_meta_data() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_get_meta_data() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_get_meta_data() function with invalid stream resource -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_get_meta_data() function with closed stream resource -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_resolve_include_path.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_resolve_include_path.php.expectf index e56cf409d..5d9822287 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_resolve_include_path.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_resolve_include_path.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) string(%d) "%stest_path%sfile" diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_set_chunk_size.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_set_chunk_size.php.expectf index 8b276f8bb..d9ebb4644 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_set_chunk_size.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_set_chunk_size.php.expectf @@ -26,9 +26,9 @@ write with size: 50 int(3) error conditions -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-streams/stream_set_timeout_error.php.expectf b/hphp/test/zend/bad/ext-standard-streams/stream_set_timeout_error.php.expectf index 991dc6280..9bee05612 100644 --- a/hphp/test/zend/bad/ext-standard-streams/stream_set_timeout_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-streams/stream_set_timeout_error.php.expectf @@ -1,19 +1,19 @@ *** Testing stream_set_timeout() : error conditions *** -- Testing stream_set_timeout() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_set_timeout() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_set_timeout() function with a closed socket -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing stream_set_timeout() function with an invalid stream -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stream_set_timeout() function with a stream that does not support timeouts -- diff --git a/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php b/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php index 836a7053c..0572e4592 100644 --- a/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php @@ -76,7 +76,7 @@ $values = array ( // loop through each element of the array and check the working of addslashes() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing addslashes() by supplying different values for 'str' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php.expectf index 9d8fde301..9759bf283 100644 --- a/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/addslashes_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing addslashes() : with non-string type argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing addslashes() by supplying different values for 'str' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(13) "1.07654321E-9" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) "1" @@ -55,7 +55,7 @@ string(0) "" -- Iteration 23 -- string(7) "obj\'ct" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/basename_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/basename_error.php.expectf index c08bea93a..9a5819aa9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/basename_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/basename_error.php.expectf @@ -1,20 +1,20 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bin2hex_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bin2hex_variation1.php.expectf index 8b29b67be..51a71ec75 100644 --- a/hphp/test/zend/bad/ext-standard-strings/bin2hex_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/bin2hex_variation1.php.expectf @@ -12,13 +12,13 @@ string(10) "2d32302e35" -- Iteration 6 -- string(24) "313031323334353637303030" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- string(2) "31" @@ -35,7 +35,7 @@ string(0) "" -- Iteration 16 -- string(26) "73616d706c65206f626a656374" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/bug33605.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug33605.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-standard-strings/bug33605.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/bug33605.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug40754.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug40754.php.expectf index ddba8c10d..7a17a08d6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/bug40754.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/bug40754.php.expectf @@ -2,23 +2,23 @@ %unicode|string%(6) "abcdex" bool(false) 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) -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(2) string(8) "abcdeabc" diff --git a/hphp/test/zend/bad/ext-standard-strings/bug44703.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug44703.php.expectf index c91b39c42..c469aa5ca 100644 --- a/hphp/test/zend/bad/ext-standard-strings/bug44703.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/bug44703.php.expectf @@ -1,17 +1,17 @@ -HipHop Warning: %a +HipHop Warning: %s string(35) "<a href='test'>Test</a>" -HipHop Warning: %a +HipHop Warning: %s string(35) "<a href='test'>Test</a>" -HipHop Warning: %a +HipHop Warning: %s string(35) "<a href='test'>Test</a>" string(35) "<a href='test'>Test</a>" -HipHop Warning: %a +HipHop Warning: %s string(35) "<a href='test'>Test</a>" string(8) "<>" -HipHop Warning: %a +HipHop Warning: %s string(8) "<>" string(8) "<>" string(8) "<>" string(8) "<>" -HipHop Warning: %a +HipHop Warning: %s string(8) "<>" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug55871.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug55871.php.expectf index 042c8b358..6d5fce034 100644 --- a/hphp/test/zend/bad/ext-standard-strings/bug55871.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/bug55871.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s array(0) { } -HipHop Warning: %a +HipHop Warning: %s array(0) { } -HipHop Warning: %a +HipHop Warning: %s array(0) { } \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug61038.php b/hphp/test/zend/bad/ext-standard-strings/bug61038.php new file mode 100644 index 000000000..1687f0600 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/bug61038.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug61038.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug61038.php.expectf new file mode 100644 index 000000000..bf0307680 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/bug61038.php.expectf @@ -0,0 +1,14 @@ +array(1) { + [1]=> + string(4) "str%c" +} +array(1) { + [1]=> + string(5) "str%c%c" +} +HipHop Warning: %s +bool(false) +array(1) { + [1]=> + string(5) "str%c%c" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug63874.php b/hphp/test/zend/bad/ext-standard-strings/bug63874.php new file mode 100644 index 000000000..ae88f8312 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/bug63874.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/bug63874.php.expectf b/hphp/test/zend/bad/ext-standard-strings/bug63874.php.expectf new file mode 100644 index 000000000..20ea54c6e --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/bug63874.php.expectf @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php b/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php index f972b25af..e9a986d45 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php @@ -79,7 +79,7 @@ $values = array ( // loop through each element of the array and check the working of chop() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing chop() by supplying different values for 'str' argument ---\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php.expectf index b5013a9c6..6625fcca2 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chop_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing chop() : with unexpected values for str argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing chop() by supplying different values for 'str' argument --- -- Iteration 1 -- @@ -31,29 +31,29 @@ string(12) "1.07654321E-" string(3) "0.5" string(2) "0." -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) "1" @@ -89,8 +89,8 @@ string(0) "" string(16) " @#$%Object @#$%" string(11) " @#$%Object" -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php b/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php index 15a2698de..5f35ed310 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php @@ -79,7 +79,7 @@ $values = array ( // loop through each element of the array and check the working of chop() -// when $charlist arugment is supplied with different values +// when $charlist argument is supplied with different values echo "\n--- Testing chop() by supplying different values for 'charlist' argument ---\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php.expectf index 18daa4161..732ad66b9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chop_variation2.php.expectf @@ -1,6 +1,6 @@ *** Testing chop() : with different unexpected values for charlist argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing chop() by supplying different values for 'charlist' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(17) "hello world12345 " -- Iteration 9 -- string(17) "hello world12345 " -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(17) "hello world12345 " @@ -55,7 +55,7 @@ string(17) "hello world12345 " -- Iteration 23 -- string(17) "hello world12345 " -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- string(17) "hello world12345 " diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php b/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php index 730ed35b7..3f4ecc698 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php @@ -7,7 +7,7 @@ /* * Testing error conditions of chunk_split() with zero arguments -* and for more than expected number of argments +* and for more than expected number of arguments */ echo "*** Testing chunk_split() : error conditions ***\n"; diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php.expectf index 6a8f297ed..e6af6dbef 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_error.php.expectf @@ -1,8 +1,8 @@ *** Testing chunk_split() : error conditions *** -- Testing chunk_split() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing chunk_split() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation1.php.expectf index e7b0dc5ff..80259d950 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation1.php.expectf @@ -18,19 +18,19 @@ string(20) "1. 07 65 43 21 E- 9 " -- Iteration 9 -- string(5) "0. 5 " -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) " " @@ -59,6 +59,6 @@ string(1) " " -- Iteration 27 -- string(1) " " -- Iteration 28 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation2.php.expectf index c84c4c2d4..73e825e09 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation2.php.expectf @@ -2,70 +2,70 @@ -- Iteration 1 -- string(28) "This is ch*uklen vari*ation*" -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- string(50) "T*h*i*s* *i*s* *c*h*u*k*l*e*n* *v*a*r*i*a*t*i*o*n*" -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation3.php.expectf index 2e660d289..670dabbc4 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation3.php.expectf @@ -18,19 +18,19 @@ string(100) "This1.07654321E-9 is 1.07654321E-9simp1.07654321E-9le s1.07654321E- -- Iteration 9 -- string(40) "This0.5 is 0.5simp0.5le s0.5trin0.5g.0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(22) "This is simple string." @@ -55,6 +55,6 @@ string(22) "This is simple string." -- Iteration 25 -- string(22) "This is simple string." -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation5.php.expectf index 81eea7c95..723092058 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation5.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation5.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation8.php.expectf b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation8.php.expectf index 3d5aa4509..af8c350b1 100644 --- a/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/chunk_split_variation8.php.expectf @@ -1,6 +1,6 @@ *** Testing chunk_split() : different 'chunklen' with heredoc 'str' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:::r:::i:::n:::g::: :::w:::i:::t:::h::: ::: ::: :::a:::n:::d::: ::: @@ -8,7 +8,7 @@ string(504) "T:::h:::i:::s:::':::s::: :::h:::e:::r:::e:::d:::o:::c::: :::s:::t:: :::I:::t::: :::h:::a:::s::: :::_:::s:::p:::e:::c:::i:::@:::l::: :::c:::h:::@:::r:::$::: :::2:::2:::2:::2::: :::!:::!:::!:::N:::o:::w::: :::\:::k::: :::a:::s::: :::e:::s:::c:::a:::p:::e::: :::c:::h:::a:::r::: :::t:::o::: :::t:::e:::s:::t::: :::c:::h:::u:::n:::k:::_:::s:::p:::l:::i:::t:::(:::):::" -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- string(129) "This's heredoc string with and @@ -26,9 +26,9 @@ string(129) "This's heredoc string with and It has _speci@l ch@r$ 2222 !!!Now \k as escape char to test chunk_split():::" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string.php.expectf index 0bc0d5850..3332dcd51 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string.php.expectf @@ -1,21 +1,21 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s string(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s string(6) "[[[[[[" string(6) "[[[[[[" string(6) "[[[[[[" string(6) "[[[[[[" string(6) "[[[[[[" -HipHop Warning: %a +HipHop Warning: %s string(6) "[[[[[[" string(0) "" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string_variation1.php.expectf index 173202cb5..21e019ee6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_cyr_string_variation1.php.expectf @@ -18,13 +18,13 @@ string(5) "-20.5" -- Iteration 9 -- string(12) "101234567000" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(1) "1" @@ -41,7 +41,7 @@ string(0) "" -- Iteration 19 -- string(13) "sample object" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_error.php.expectf index fbc17e3a7..914de81c4 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_error.php.expectf @@ -1,11 +1,11 @@ *** Testing convert_uudecode() : error conditions *** -- Testing convert_uudecode() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing convert_uudecode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_variation1.php.expectf index 15e7b7ee3..bfc1254f5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_uudecode_variation1.php.expectf @@ -1,47 +1,47 @@ *** Testing convert_uudecode() function: with unexpected inputs for 'data' argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- 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 -- bool(false) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- bool(false) @@ -50,10 +50,10 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_error.php.expectf index ee6ddf1db..0d9e008d6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_error.php.expectf @@ -1,11 +1,11 @@ *** Testing convert_uuencode() : error conditions *** -- Testing chconvert_uuencoder() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing convert_uuencode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_variation1.php.expectf index d193f9c63..313d29ea1 100644 --- a/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/convert_uuencode_variation1.php.expectf @@ -18,13 +18,13 @@ string(24) "252b3328502b4334600a600a" -- Iteration 9 -- string(40) "2c2c3360512c432c542d3338572c2360500a600a" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 13 -- string(16) "212c3060600a600a" @@ -41,7 +41,7 @@ string(0) "" -- Iteration 19 -- string(48) "2d3c56254d3c26514528265d423a4635433d6060600a600a" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 21 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/count_chars_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/count_chars_variation1.php.expectf index 3b7cfebd9..770b8959b 100644 --- a/hphp/test/zend/bad/ext-standard-strings/count_chars_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/count_chars_variation1.php.expectf @@ -105,13 +105,13 @@ array(8) { int(1) } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- array(1) { @@ -163,7 +163,7 @@ array(12) { int(1) } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- array(0) { diff --git a/hphp/test/zend/bad/ext-standard-strings/count_chars_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/count_chars_variation2.php.expectf index d20fdd510..3fb97a985 100644 --- a/hphp/test/zend/bad/ext-standard-strings/count_chars_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/count_chars_variation2.php.expectf @@ -4,32 +4,32 @@ bool(true) -- Iteration 2 -- bool(true) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- bool(true) -- Iteration 7 -- bool(true) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- 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 -- bool(true) @@ -44,20 +44,20 @@ bool(true) -- Iteration 18 -- bool(true) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s bool(true) -- Iteration 22 -- -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- bool(true) diff --git a/hphp/test/zend/bad/ext-standard-strings/crc32_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/crc32_variation1.php.expectf index cba994e8a..3285a17b9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/crc32_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/crc32_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing crc32() : with unexpected values for str argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s -- Iteration 1 -- int(-186917087) @@ -30,23 +30,23 @@ int(1376932222) int(-2036403827) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- @@ -83,6 +83,6 @@ int(0) int(0) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/crc32_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/crc32_variation3.php.expectf index 9d0349e6d..792d8a2ac 100644 --- a/hphp/test/zend/bad/ext-standard-strings/crc32_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/crc32_variation3.php.expectf @@ -1,6 +1,6 @@ *** Testing crc32() : with different strings in double quotes *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s -- Iteration 1 -- int(0) diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php.expectf index 40b4798da..98601404a 100644 --- a/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation1.php.expectf @@ -47,13 +47,13 @@ array(1) { string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- array(2) { @@ -63,7 +63,7 @@ array(2) { string(35) " piece2 piece3 piece4 piece5 piece6" } -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- array(2) { @@ -73,13 +73,13 @@ array(2) { string(35) " piece2 piece3 piece4 piece5 piece6" } -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- array(1) { @@ -87,12 +87,12 @@ array(1) { string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php.expectf index ef68ff54d..a6f159791 100644 --- a/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation2.php.expectf @@ -45,13 +45,13 @@ array(1) { string(12) "101234567000" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- array(1) { @@ -91,7 +91,7 @@ array(2) { string(6) "object" } -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- array(1) { diff --git a/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php.expectf index 3157b6618..fc7768a69 100644 --- a/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/explode_variation3.php.expectf @@ -91,13 +91,13 @@ array(6) { string(6) "piece6" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- array(1) { @@ -130,10 +130,10 @@ array(1) { string(41) "piece1 piece2 piece3 piece4 piece5 piece6" } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- array(1) { diff --git a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php index cc683cad4..299ca53fe 100644 --- a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php @@ -62,7 +62,7 @@ $values = array ( // loop through each element of the array and check the working of get_html_translation_table() -// when $table arugment is supplied with different values +// when $table argument is supplied with different values echo "\n--- Testing get_html_translation_table() by supplying different values for 'table' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php.expectf index 9062cca36..669e1ea65 100644 --- a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation1.php.expectf @@ -2,29 +2,29 @@ --- Testing get_html_translation_table() by supplying different values for 'table' argument --- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- int(252) @@ -75,29 +75,29 @@ array(4) { string(6) """ } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- array(4) { @@ -142,9 +142,9 @@ array(4) { string(6) """ } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- array(4) { diff --git a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php index 0bb14a385..7cfd4480c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php @@ -65,7 +65,7 @@ $values = array ( // loop through each element of the array and check the working of get_html_translation_table() -// when $quote_style arugment is supplied with different values +// when $quote_style argument is supplied with different values echo "\n--- Testing get_html_translation_table() by supplying different values for 'quote_style' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php.expectf index 4136c7aea..f914c80fd 100644 --- a/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/get_html_translation_table_variation2.php.expectf @@ -2,19 +2,19 @@ --- Testing get_html_translation_table() by supplying different values for 'quote_style' argument --- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- array(4) { @@ -57,19 +57,19 @@ array(3) { string(4) ">" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- array(3) { @@ -90,7 +90,7 @@ array(3) { string(4) ">" } -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- array(3) { diff --git a/hphp/test/zend/bad/ext-standard-strings/hebrev_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/hebrev_variation1.php.expectf index 43acada54..1e968f196 100644 --- a/hphp/test/zend/bad/ext-standard-strings/hebrev_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/hebrev_variation1.php.expectf @@ -18,13 +18,13 @@ string(5) "-20.5" -- Iteration 9 -- string(10) "1012345.67" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(1) "1" @@ -41,7 +41,7 @@ bool(false) -- Iteration 19 -- string(13) "sample object" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/hebrev_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/hebrev_variation2.php.expectf index 4563c8e2c..32fa9c432 100644 --- a/hphp/test/zend/bad/ext-standard-strings/hebrev_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/hebrev_variation2.php.expectf @@ -86,13 +86,13 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words " -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(109) "xttel uaisv @@ -133,13 +133,13 @@ string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words " -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s string(109) "textual vis to textrew Heb @@ -154,7 +154,7 @@ riest tionfuncThe . " -- Iteration 22 -- -HipHop Notice: %a +HipHop Notice: %s string(109) ".The hebrev function converts logical Hebrew text to visual text .The function tries to avoid breaking words " @@ -173,10 +173,10 @@ riest tionfuncThe . " -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- string(109) ".The hebrev function converts logical Hebrew text to visual text diff --git a/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation1.php.expectf index 6d2a0f133..8125b6bfc 100644 --- a/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation1.php.expectf @@ -18,13 +18,13 @@ string(5) "-20.5" -- Iteration 9 -- string(10) "1012345.67" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(1) "1" @@ -41,7 +41,7 @@ bool(false) -- Iteration 19 -- string(13) "sample object" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation2.php.expectf index 05fa780e3..658859dcd 100644 --- a/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/hebrevc_variation2.php.expectf @@ -160,13 +160,13 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text< .The function tries to avoid breaking words
" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(331) "xttel uaisv
@@ -241,13 +241,13 @@ string(241) ".The hebrevcc function converts logical Hebrew text to visual text< .The function tries to avoid breaking words
" -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s string(349) "textual vis
to
textrew Heb
@@ -273,7 +273,7 @@ riest
tionfuncThe .
" -- Iteration 22 -- -HipHop Notice: %a +HipHop Notice: %s string(241) ".The hebrevcc function converts logical Hebrew text to visual text
) This function is similar to hebrevc() with the difference that it converts newlines
@@ -306,10 +306,10 @@ riest
tionfuncThe .
" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- string(241) ".The hebrevcc function converts logical Hebrew text to visual text
diff --git a/hphp/test/zend/bad/ext-standard-strings/htmlentities24.php.expectf b/hphp/test/zend/bad/ext-standard-strings/htmlentities24.php.expectf index 34c9f43f0..f7e3d6e2f 100644 --- a/hphp/test/zend/bad/ext-standard-strings/htmlentities24.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/htmlentities24.php.expectf @@ -276,7 +276,7 @@ string(36) "A 'quote' is <b>bold</b>" string(36) "A 'quote' is <b>bold</b>" *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL string(14) "„‘" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation1.php.expectf index 3b554131e..b85f72973 100644 --- a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation1.php.expectf @@ -18,19 +18,19 @@ string(13) "1.07654321E-9" -- Iterator 9 -- string(3) "0.5" -- Iterator 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 15 -- string(0) "" @@ -55,6 +55,6 @@ string(0) "" -- Iterator 25 -- string(0) "" -- Iterator 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation2.php.expectf index 3d65c6144..b5d509129 100644 --- a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation2.php.expectf @@ -16,23 +16,23 @@ string(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = string(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- @@ -54,23 +54,23 @@ string(104) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. &qu string(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- @@ -80,6 +80,6 @@ string(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = string(114) "Roy's height > Sam's height. 13 < 15. 1111 & 0000 = 0000. " double quote string "" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation3.php b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation3.php index 0b10d10b3..5fe37551a 100644 --- a/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation3.php +++ b/hphp/test/zend/bad/ext-standard-strings/htmlspecialchars_decode_variation3.php @@ -27,7 +27,7 @@ $multiline_string = <<Roy's height\r > Sam\t's height 1111\t\t & 0000\v\v = \f0000 diff --git a/hphp/test/zend/bad/ext-standard-strings/implode1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/implode1.php.expectf index 2c455799e..479ec4315 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/implode1.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/implode1.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/join_variation1.php b/hphp/test/zend/bad/ext-standard-strings/join_variation1.php index 189f22e86..6d2d89e14 100644 --- a/hphp/test/zend/bad/ext-standard-strings/join_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/join_variation1.php @@ -81,7 +81,7 @@ $values = array ( // loop through each element of the array and check the working of join() -// when $glue arugment is supplied with different values +// when $glue argument is supplied with different values echo "\n--- Testing join() by supplying different values for 'glue' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/join_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/join_variation1.php.expectf index 3a808f171..ca203771c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/join_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/join_variation1.php.expectf @@ -20,19 +20,19 @@ string(29) "element11.07654321E-9element2" -- Iteration 9 -- string(19) "element10.5element2" -- Iteration 10 -- -HipHop Notice: %a +HipHop Notice: %s string(0) "" -- Iteration 11 -- -HipHop Notice: %a +HipHop Notice: %s string(1) "0" -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s string(1) "1" -- Iteration 13 -- -HipHop Notice: %a +HipHop Notice: %s string(7) "1Array2" -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s string(11) "redArraypen" -- Iteration 15 -- string(17) "element11element2" diff --git a/hphp/test/zend/bad/ext-standard-strings/join_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/join_variation3.php.expectf index 2d7e081d5..d5d075f7d 100644 --- a/hphp/test/zend/bad/ext-standard-strings/join_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/join_variation3.php.expectf @@ -4,8 +4,8 @@ string(6) "1], [2" -- Iteration 2 -- string(10) "1.1], [2.2" -- Iteration 3 -- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(14) "Array], [Array" -- Iteration 4 -- string(5) "], [1" diff --git a/hphp/test/zend/bad/ext-standard-strings/join_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/join_variation4.php.expectf index 81928bef0..fb468922d 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/join_variation4.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/join_variation4.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/join_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/join_variation5.php.expectf index b64c1407b..790ea5206 100644 --- a/hphp/test/zend/bad/ext-standard-strings/join_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/join_variation5.php.expectf @@ -1,11 +1,11 @@ *** Testing implode() : usage variations - sub arrays *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(27) "ArrayTESTArrayTESTPHPTEST50" -HipHop Notice: %a +HipHop Notice: %s string(19) "1Array2Array3Array4" -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(18) "Array2Array2PHP250" string(10) "1, 2, 3, 4" string(8) "one, two" diff --git a/hphp/test/zend/bad/ext-standard-strings/levenshtein.php.expectf b/hphp/test/zend/bad/ext-standard-strings/levenshtein.php.expectf index 2b617420c..6971d6ee6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/levenshtein.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/levenshtein.php.expectf @@ -1,10 +1,10 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s all passed -HipHop Warning: %a +HipHop Warning: %s NULL int(0) int(0) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/ltrim.php.expectf b/hphp/test/zend/bad/ext-standard-strings/ltrim.php.expectf index 3ed673d6b..b0c205313 100644 --- a/hphp/test/zend/bad/ext-standard-strings/ltrim.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/ltrim.php.expectf @@ -1,11 +1,11 @@ *** Output for Error Conditions *** *** Output for zero argument *** -HipHop Warning: %a +HipHop Warning: %s NULL *** Output for more than valid number of arguments (Valid are 1 or 2 arguments) *** -HipHop Warning: %a +HipHop Warning: %s NULL *** Using heredoc string *** diff --git a/hphp/test/zend/bad/ext-standard-strings/ltrim_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/ltrim_variation1.php.expectf index b0c804e39..3ca7b38b7 100644 --- a/hphp/test/zend/bad/ext-standard-strings/ltrim_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/ltrim_variation1.php.expectf @@ -18,13 +18,13 @@ string(4) "20.5" -- Iteration 9 -- string(12) "101234567000" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(1) "1" @@ -41,7 +41,7 @@ string(0) "" -- Iteration 19 -- string(15) "sample object " -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/ltrim_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/ltrim_variation2.php.expectf index afc306aaf..ce0d28528 100644 --- a/hphp/test/zend/bad/ext-standard-strings/ltrim_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/ltrim_variation2.php.expectf @@ -18,13 +18,13 @@ string(19) "!---Hello World---!" -- Iteration 9 -- string(19) "!---Hello World---!" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(19) "!---Hello World---!" @@ -41,7 +41,7 @@ string(19) "!---Hello World---!" -- Iteration 19 -- string(19) "!---Hello World---!" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(19) "!---Hello World---!" diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf index 2bba3f70a..a91d6539e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/md5_error.php.expectf @@ -1,10 +1,10 @@ *** Testing md5() : error conditions *** -- Testing md5() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing md5() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/md5_file.php.expectf b/hphp/test/zend/bad/ext-standard-strings/md5_file.php.expectf index 02e19cf7e..35c917f70 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/md5_file.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/md5_file.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/metaphone.php.expectf b/hphp/test/zend/bad/ext-standard-strings/metaphone.php.expectf index f9835b2d5..25212d588 100644 --- a/hphp/test/zend/bad/ext-standard-strings/metaphone.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/metaphone.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/money_format_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/money_format_variation1.php.expectf index 1782dba67..44a60d27e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/money_format_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/money_format_variation1.php.expectf @@ -18,13 +18,13 @@ string -- Iteration 9 -- string -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string @@ -47,12 +47,12 @@ string -- Iteration 22 -- string -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- string -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- string diff --git a/hphp/test/zend/bad/ext-standard-strings/money_format_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/money_format_variation2.php.expectf index d2f47c0c9..9b7d10f6a 100644 --- a/hphp/test/zend/bad/ext-standard-strings/money_format_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/money_format_variation2.php.expectf @@ -18,13 +18,13 @@ string -- Iteration 9 -- string -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string @@ -39,24 +39,24 @@ string -- Iteration 18 -- string -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- string diff --git a/hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf b/hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf index 55e056762..65df10dfc 100644 --- a/hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/moneyformat.php.expectf @@ -1,3 +1,3 @@ string(7) "X$3.14Y" -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/nl2br_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/nl2br_error.php.expectf index 19ed76d7a..8c478b8f5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/nl2br_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/nl2br_error.php.expectf @@ -1,10 +1,10 @@ *** Testing nl2br() : error conditions *** -- Testing nl2br() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing nl2br() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/nl2br_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/nl2br_variation5.php.expectf index 16b9e8cf3..16e7103c9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/nl2br_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/nl2br_variation5.php.expectf @@ -18,19 +18,19 @@ string(7) "1.06E-9" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(0) "" @@ -45,7 +45,7 @@ string(1) "1" -- Iteration 20 -- string(0) "" -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- string(9) "My String" diff --git a/hphp/test/zend/bad/ext-standard-strings/nl_langinfo_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/nl_langinfo_variation1.php.expectf index 4d698d79f..9497972d9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/nl_langinfo_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/nl_langinfo_variation1.php.expectf @@ -1,26 +1,26 @@ *** Testing nl_langinfo() : with unexpected inputs for 'item' argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/number_format_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/number_format_error.php.expectf index ed6956191..b255d6f11 100644 --- a/hphp/test/zend/bad/ext-standard-strings/number_format_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/number_format_error.php.expectf @@ -1,11 +1,11 @@ *** Testing number_format() : error conditions *** -- Testing number_format() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing number_format() function with 3 arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing number_format() function with more than 4 arguments -- -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/ord_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/ord_variation1.php.expectf index 4707300d9..4ba23a81e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/ord_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/ord_variation1.php.expectf @@ -18,13 +18,13 @@ int(45) -- Iteration 9 -- int(49) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- int(49) @@ -41,7 +41,7 @@ int(0) -- Iteration 19 -- int(115) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- int(0) diff --git a/hphp/test/zend/bad/ext-standard-strings/pack_A.php b/hphp/test/zend/bad/ext-standard-strings/pack_A.php new file mode 100644 index 000000000..b78506998 --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/pack_A.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/pack_A.php.expectf b/hphp/test/zend/bad/ext-standard-strings/pack_A.php.expectf new file mode 100644 index 000000000..71b96bd4e --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/pack_A.php.expectf @@ -0,0 +1,11 @@ +string(5) "foo " +string(4) "fooo" +string(4) "foo " +array(1) { + [1]=> + string(8) "foo%c%cbar" +} +array(1) { + [1]=> + string(3) "foo" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/pack_Z.php b/hphp/test/zend/bad/ext-standard-strings/pack_Z.php new file mode 100644 index 000000000..51d6b69ea --- /dev/null +++ b/hphp/test/zend/bad/ext-standard-strings/pack_Z.php @@ -0,0 +1,15 @@ + + string(3) "foo" +} +array(1) { + [1]=> + string(3) "foo" +} +bool(false) +array(1) { + [1]=> + string(0) "" +} +array(1) { + [1]=> + string(1) "A" +} +array(1) { + [1]=> + string(2) "AB" +} +array(1) { + [1]=> + string(2) "AB" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/pathinfo.php.expectf b/hphp/test/zend/bad/ext-standard-strings/pathinfo.php.expectf index 2a5eb83f0..d999399ea 100644 --- a/hphp/test/zend/bad/ext-standard-strings/pathinfo.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/pathinfo.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL array(2) { ["basename"]=> diff --git a/hphp/test/zend/bad/ext-standard-strings/php_strip_whitespace.php.expectf b/hphp/test/zend/bad/ext-standard-strings/php_strip_whitespace.php.expectf index 98a2a4eaf..7c3cc58a2 100644 --- a/hphp/test/zend/bad/ext-standard-strings/php_strip_whitespace.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/php_strip_whitespace.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s string(0) "" string(18) "/* test comment */" string(9) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/print_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/print_variation1.php.expectf index ae1adc490..6c4406956 100644 --- a/hphp/test/zend/bad/ext-standard-strings/print_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/print_variation1.php.expectf @@ -24,15 +24,15 @@ int(1) 101234567000 int(1) -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s Array int(1) -- Iteration 10 -- -HipHop Notice: %a +HipHop Notice: %s Array int(1) -- Iteration 11 -- -HipHop Notice: %a +HipHop Notice: %s Array int(1) -- Iteration 12 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/printf_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/printf_error.php.expectf index dcb4dd07b..777637ed4 100644 --- a/hphp/test/zend/bad/ext-standard-strings/printf_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/printf_error.php.expectf @@ -1,26 +1,26 @@ *** Testing printf() : error conditions *** -- Testing printf() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing printf() function with less than expected no. of arguments -- -- Call printf with one argument less than expected -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Call printf with two argument less than expected -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Call printf with three argument less than expected -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/printf_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/printf_variation1.php.expectf index fec10acc8..c21e4cb91 100644 --- a/hphp/test/zend/bad/ext-standard-strings/printf_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/printf_variation1.php.expectf @@ -73,57 +73,57 @@ int(3) int(3) -- Iteration 10 -- -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -- Iteration 11 -- -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -- Iteration 13 -- -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) -HipHop Notice: %a +HipHop Notice: %s Array int(5) diff --git a/hphp/test/zend/bad/ext-standard-strings/quoted_printable_decode_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/quoted_printable_decode_variation1.php.expectf index da4a4ae0a..e40bc260e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/quoted_printable_decode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/quoted_printable_decode_variation1.php.expectf @@ -28,23 +28,23 @@ string(26) "312e3037363534333231452d39" string(6) "302e35" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 15 -- @@ -81,6 +81,6 @@ string(0) "" string(0) "" -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/quoted_printable_encode_001.php.expectf b/hphp/test/zend/bad/ext-standard-strings/quoted_printable_encode_001.php.expectf index 9d1e84dd8..1f725a617 100644 --- a/hphp/test/zend/bad/ext-standard-strings/quoted_printable_encode_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/quoted_printable_encode_001.php.expectf @@ -1,10 +1,10 @@ -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" string(4) "test" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(1) "1" string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/rtrim.php.expectf b/hphp/test/zend/bad/ext-standard-strings/rtrim.php.expectf index 1542aa574..1b809c9ba 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/rtrim.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/rtrim.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/rtrim_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/rtrim_variation1.php.expectf index 67ab5782b..068702be6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/rtrim_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/rtrim_variation1.php.expectf @@ -18,13 +18,13 @@ string(5) "-20.5" -- Iteration 9 -- string(12) "101234567000" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(1) "1" @@ -41,7 +41,7 @@ string(0) "" -- Iteration 19 -- string(19) " !---sample object" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/rtrim_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/rtrim_variation2.php.expectf index 402a5274a..f5bb905b3 100644 --- a/hphp/test/zend/bad/ext-standard-strings/rtrim_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/rtrim_variation2.php.expectf @@ -18,13 +18,13 @@ string(19) "!---Hello World---!" -- Iteration 9 -- string(19) "!---Hello World---!" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- string(19) "!---Hello World---!" @@ -41,7 +41,7 @@ string(19) "!---Hello World---!" -- Iteration 19 -- string(19) "!---Hello World---!" -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(19) "!---Hello World---!" diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic1.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic1.php index 5eb5ad2a0..410e98334 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic1.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic1.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , - * or FALSE if locale functinality is not implemented in this platform. + * or FALSE if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic2.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic2.php index 04b9819a6..7fe94b1fb 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic2.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic2.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic3.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic3.php index 95aba3210..a182fba4b 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_basic3.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_basic3.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation1.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation1.php index f70561387..59bfe072f 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation1.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation2.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation2.php index 057f09c0d..4604c7335 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation2.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - if locale functinality is not implemented in this platform. + if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation4.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation4.php index a4e7674d4..8e5c5ecd5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation4.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation4.php @@ -4,7 +4,7 @@ $_ENV[LC_ALL] = en_US.utf8;; /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functinality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation5.php b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation5.php index 7fc2aa745..aeefbf3ba 100644 --- a/hphp/test/zend/bad/ext-standard-strings/setlocale_variation5.php +++ b/hphp/test/zend/bad/ext-standard-strings/setlocale_variation5.php @@ -4,7 +4,7 @@ $_ENV[LC_ALL] = en_US.utf8;; /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functinality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/bad/ext-standard-strings/sha1_file.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sha1_file.php.expectf index 1256fe330..17347c8ed 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sha1_file.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sha1_file.php.expectf @@ -3,27 +3,27 @@ *** Testing for error conditions *** -- No filename -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- invalid filename -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Scalar value as filename -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- NULL as filename -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- More than valid number of arguments ( valid is 2) -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Hexadecimal Output for Empty file as Argument -- diff --git a/hphp/test/zend/bad/ext-standard-strings/sha1_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sha1_variation1.php.expectf index 3a30ed2e3..c852f9fc0 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sha1_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sha1_variation1.php.expectf @@ -18,19 +18,19 @@ string(40) "681b45cae882ad795afd54ccc2a04ad58e056b83" -- Iteration 9 -- string(40) "1b390cd54a0c0d4f27fa7adf23e3c45536e9f37c" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" @@ -55,6 +55,6 @@ string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" -- Iteration 25 -- string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/sha1_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sha1_variation2.php.expectf index dcce20801..0680bcbfa 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sha1_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sha1_variation2.php.expectf @@ -18,19 +18,19 @@ string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0" -- Iteration 9 -- string(40) "0a4d55a8d778e5022fab701977c5d840bbc486d0" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 15 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" @@ -49,13 +49,13 @@ string(80) "30613464353561386437373865353032326661623730313937376335643834306262 -- Iteration 22 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 24 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" -- Iteration 25 -- string(80) "30613464353561386437373865353032326661623730313937376335643834306262633438366430" -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/similar_text_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/similar_text_error.php.expectf index b746a3056..94997a186 100644 --- a/hphp/test/zend/bad/ext-standard-strings/similar_text_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/similar_text_error.php.expectf @@ -1,6 +1,6 @@ -- Testing similar_text() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing similar_text() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/soundex.php.expectf b/hphp/test/zend/bad/ext-standard-strings/soundex.php.expectf index 2ae9dc46c..b3e8c105e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/soundex.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/soundex.php.expectf @@ -1,6 +1,6 @@ bool(false) string(4) "0000" -HipHop Warning: %a +HipHop Warning: %s NULL string(4) "F650" string(4) "T300" diff --git a/hphp/test/zend/bad/ext-standard-strings/soundex_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/soundex_error.php.expectf index 1cdc32220..a83946b97 100644 --- a/hphp/test/zend/bad/ext-standard-strings/soundex_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/soundex_error.php.expectf @@ -1,10 +1,10 @@ *** Testing soundex error conditions ***-- Testing soundex() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing soundex() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sprintf_error.php.expectf index 3b034a858..e6fabfc01 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sprintf_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sprintf_error.php.expectf @@ -1,20 +1,20 @@ *** Testing sprintf() : error conditions *** -- Testing sprintf() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing sprintf() function with less than expected no. of arguments -- -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sprintf_variation1.php.expectf index f2efad66e..437e11c69 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sprintf_variation1.php.expectf @@ -46,43 +46,43 @@ string(3) "0.5" string(3) "0.5" -- Iteration 10 -- -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -- Iteration 11 -- -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -- Iteration 12 -- -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -- Iteration 13 -- -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -- Iteration 14 -- -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" -- Iteration 15 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation52.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sprintf_variation52.php.expectf index 3c897b776..2ef1e2ad3 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sprintf_variation52.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sprintf_variation52.php.expectf @@ -7,7 +7,7 @@ string(15) "%12345678900.00" string(1) "%" -- Testing for precision value more than maximum -- -HipHop Notice: %a +HipHop Notice: %s string(65) "12345678900.00000000000000000000000000000000000000000000000000000" -- Testing for invalid width(-15) specifier -- diff --git a/hphp/test/zend/bad/ext-standard-strings/sscanf_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sscanf_variation1.php.expectf index a38d8dede..e94fccc65 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sscanf_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sscanf_variation1.php.expectf @@ -40,13 +40,13 @@ array(1) { string(12) "101234567000" } -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- array(1) { @@ -72,7 +72,7 @@ array(1) { string(6) "sample" } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- NULL diff --git a/hphp/test/zend/bad/ext-standard-strings/sscanf_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/sscanf_variation2.php.expectf index 5ce22baf2..733a30298 100644 --- a/hphp/test/zend/bad/ext-standard-strings/sscanf_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/sscanf_variation2.php.expectf @@ -24,13 +24,13 @@ array(0) { array(0) { } -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- array(0) { @@ -54,7 +54,7 @@ array(0) { array(0) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- array(0) { diff --git a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation1.php.expectf index d65319b18..4cdf4d583 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation1.php.expectf @@ -16,13 +16,13 @@ string(20) "-20.5 " -- Iteration 8 -- string(20) "101234567000 " -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- string(20) "1 " @@ -39,7 +39,7 @@ string(20) " " -- Iteration 18 -- string(20) "sample object " -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- string(20) " " diff --git a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation2.php.expectf index f2293da8f..b9488a284 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation2.php.expectf @@ -14,13 +14,13 @@ string(11) "Test string" -- Iteration 7 -- string(1012) "Test string " -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- string(11) "Test string" @@ -35,10 +35,10 @@ string(11) "Test string" -- Iteration 16 -- string(11) "Test string" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- string(11) "Test string" diff --git a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation3.php.expectf index e9607cabc..1dc5d7f12 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation3.php.expectf @@ -16,39 +16,39 @@ string(20) "Test string-20.5-20." -- Iteration 8 -- string(20) "Test string101234567" -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- string(20) "Test string111111111" -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- string(20) "Test string111111111" -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- string(20) "Test stringsample ob" -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation4.php.expectf index 78a217ac5..355205878 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_pad_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_pad_variation4.php.expectf @@ -6,28 +6,28 @@ string(20) "Test string*********" -- Iteration 3 -- string(20) "****Test string*****" -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- string(20) "****Test string*****" @@ -36,13 +36,13 @@ string(20) "****Test string*****" -- Iteration 14 -- string(20) "****Test string*****" -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- string(20) "Test string*********" @@ -57,7 +57,7 @@ string(20) "*********Test string" -- Iteration 23 -- string(20) "*********Test string" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- string(20) "*********Test string" diff --git a/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf index 9ce783358..0ae49bdab 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_rot13_error.php.expectf @@ -1,10 +1,10 @@ *** Testing str_rot13() : error conditions *** -- Testing str_rot13() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing str_rot13() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_shuffle_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_shuffle_variation1.php.expectf index 7ee79e48c..85efec7aa 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_shuffle_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_shuffle_variation1.php.expectf @@ -16,13 +16,13 @@ string(5) "%s" -- Iteration 8 -- string(12) "%s" -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- string(1) "1" @@ -39,7 +39,7 @@ string(0) "" -- Iteration 18 -- string(13) "%s" -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_split_variation1.php.expectf index 8a43e75e1..18b4c1a2f 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_split_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_split_variation1.php.expectf @@ -63,19 +63,19 @@ array(1) { string(3) "0.5" } -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- array(1) { @@ -135,6 +135,6 @@ array(1) { string(0) "" } -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_split_variation2.php.expectf index 2edeb013f..75be984d9 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_split_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_split_variation2.php.expectf @@ -9,37 +9,37 @@ array(3) { string(3) "gth" } --Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 13 -- array(23) { @@ -91,7 +91,7 @@ array(23) { string(1) "h" } --Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 15 -- array(23) { @@ -143,30 +143,30 @@ array(23) { string(1) "h" } --Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation2_64bit.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_split_variation2_64bit.php.expectf index 2cdb1fcea..6f6bfa1c6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_split_variation2_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_split_variation2_64bit.php.expectf @@ -9,7 +9,7 @@ array(3) { string(3) "gth" } --Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 3 -- array(1) { @@ -17,31 +17,31 @@ array(1) { string(23) "variation2:split_length" } --Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 13 -- array(23) { @@ -93,7 +93,7 @@ array(23) { string(1) "h" } --Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 15 -- array(23) { @@ -145,30 +145,30 @@ array(23) { string(1) "h" } --Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL --Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation6_64bit.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_split_variation6_64bit.php.expectf index 94e42846a..792bc2ddf 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_split_variation6_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_split_variation6_64bit.php.expectf @@ -1,6 +1,6 @@ *** Testing str_split() : different intger values for 'split_length' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- array(42) { @@ -90,7 +90,7 @@ array(42) { string(1) "t" } -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- array(1) { @@ -115,6 +115,6 @@ array(1) { string(42) "This is a string with 123 & escape char \t" } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_split_variation7_64bit.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_split_variation7_64bit.php.expectf index de3431a2e..cfe87c523 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_split_variation7_64bit.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_split_variation7_64bit.php.expectf @@ -1,6 +1,6 @@ *** Testing str_split() : different intger values for 'split_length' with heredoc 'str' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- array(30) { @@ -66,7 +66,7 @@ array(30) { string(1) "." } -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- array(1) { @@ -91,6 +91,6 @@ array(1) { string(30) "string with 123,escape char ." } -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/str_word_count.php.expectf b/hphp/test/zend/bad/ext-standard-strings/str_word_count.php.expectf index 0b05b8e4d..da094a807 100644 --- a/hphp/test/zend/bad/ext-standard-strings/str_word_count.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/str_word_count.php.expectf @@ -27,26 +27,26 @@ array(6) { string(5) "today" } int(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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(55) "Hello friend, you're looking good today!" int(5) int(6) int(5) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(7) array(5) { @@ -87,9 +87,9 @@ array(5) { [4]=> string(3) "foo" } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(7) { [0]=> @@ -145,9 +145,9 @@ array(5) { [15]=> string(3) "foo" } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(7) { [0]=> diff --git a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation1.php.expectf index bfd1403ef..929d7b43e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation1.php.expectf @@ -46,43 +46,43 @@ int(1) int(1) -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "" @@ -141,10 +141,10 @@ bool(false) bool(false) -- Iteration with str value as "Resource id #%d" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php index c7702dc83..57d2ebad2 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php @@ -12,7 +12,7 @@ error_reporting(E_ALL & ~E_NOTICE); * Testing strcspn() : with different unexpected values for mask argument */ -echo "*** Testing strcspn() : with diferent unexpected values of mask argument ***\n"; +echo "*** Testing strcspn() : with different unexpected values of mask argument ***\n"; $str = 'string_val'; $start = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php.expectf index 8510b9bca..11560ddb0 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation2.php.expectf @@ -1,4 +1,4 @@ -*** Testing strcspn() : with diferent unexpected values of mask argument *** +*** Testing strcspn() : with different unexpected values of mask argument *** -- Iteration with mask value as "0" -- int(10) @@ -46,43 +46,43 @@ int(9) int(9) -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "" -- @@ -141,10 +141,10 @@ int(9) int(9) -- Iteration with mask value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation3.php.expectf index dc1b73a76..12a573b67 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation3.php.expectf @@ -21,33 +21,33 @@ int(0) int(0) -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- @@ -75,33 +75,33 @@ int(0) int(0) -- Iteration with start value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "object" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- @@ -113,8 +113,8 @@ int(0) int(0) -- Iteration with start value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation4.php.expectf index 6a41c74f3..25fdd21ad 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strcspn_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strcspn_variation4.php.expectf @@ -16,23 +16,23 @@ int(0) int(0) -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- @@ -54,23 +54,23 @@ int(0) int(0) -- Iteration with len value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "object" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- @@ -80,6 +80,6 @@ int(0) int(0) -- Iteration with len value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php b/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php index c35bc4d4b..092d327e5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php @@ -78,7 +78,7 @@ $values = array ( // loop through each element of the array and check the working of stripcslashes() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing stripcslashes() by supplying different values for 'str' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php.expectf index a48493aa0..8cd7c0d14 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripcslashes_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing stripcslashes() : with non-string type argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing stripcslashes() by supplying different values for 'str' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(13) "1.07654321E-9" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) "1" @@ -55,7 +55,7 @@ string(0) "" -- Iteration 23 -- string(6) "obj'ct" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_error.php.expectf index 64c5e3725..7c4e51d61 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_error.php.expectf @@ -1,14 +1,14 @@ *** Testing stripos() function: error conditions *** -- With Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_variation10.php.expectf index 2ff18b632..64779f60c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_variation10.php.expectf @@ -28,23 +28,23 @@ bool(false) bool(false) -- 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 -- @@ -60,7 +60,7 @@ bool(false) bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- @@ -76,7 +76,7 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s %s -- Iteration 25 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_variation11.php.expectf index 1af388847..cf6b9c941 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_variation11.php.expectf @@ -27,76 +27,76 @@ bool(false) bool(false) bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- bool(false) bool(false) -- Iteration 16 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- bool(false) bool(false) -- Iteration 18 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 26 -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_variation14.php.expectf index aef478d0a..62265555d 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_variation14.php.expectf @@ -2,29 +2,29 @@ -- Iteration 1 -- int(6) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- int(6) -- Iteration 5 -- int(6) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- int(6) @@ -35,20 +35,20 @@ int(6) -- Iteration 14 -- int(6) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- int(6) -- Iteration 19 -- int(6) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- int(6) diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_variation15.php.expectf index 4481df088..5e3a2dd64 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_variation15.php.expectf @@ -4,38 +4,38 @@ bool(false) -- Iteration 2 -- bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- bool(false) @@ -46,20 +46,20 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/stripos_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripos_variation9.php.expectf index e1e0bdb22..6327b1498 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripos_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripos_variation9.php.expectf @@ -28,23 +28,23 @@ bool(false) bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- @@ -75,7 +75,7 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php b/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php index e278b5958..9acc85b40 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php @@ -77,7 +77,7 @@ $values = array ( // loop through each element of the array and check the working of stripslashes() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing stripslashes() by supplying different values for 'str' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php.expectf index d347d8cad..51e62c627 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stripslashes_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing stripslashes() : with non-string type argument *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing stripslashes() by supplying different values for 'str' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(13) "1.07654321E-9" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) "1" @@ -55,7 +55,7 @@ string(0) "" -- Iteration 23 -- string(6) "obj'ct" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/stristr.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stristr.php.expectf index 81a9d4af7..1333d3032 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stristr.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stristr.php.expectf @@ -1,10 +1,10 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL string(11) "tEsT sTrInG" string(6) "sTrInG" diff --git a/hphp/test/zend/bad/ext-standard-strings/stristr_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stristr_error.php.expectf index 7db3e852b..95c5008f0 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stristr_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stristr_error.php.expectf @@ -1,24 +1,24 @@ *** Testing stristr() : error conditions *** -- Testing stristr() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stristr() function with no needle -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stristr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stristr() function with empty haystack -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing stristr() function with empty needle -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/stristr_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stristr_variation1.php.expectf index 79f899005..39e1ac487 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stristr_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stristr_variation1.php.expectf @@ -14,13 +14,13 @@ bool(false) -- Iteration 7 -- bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- bool(false) @@ -37,7 +37,7 @@ bool(false) -- Iteration 17 -- string(7) " object" -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/stristr_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/stristr_variation2.php.expectf index 88b7cdc7f..dd76cd3f3 100644 --- a/hphp/test/zend/bad/ext-standard-strings/stristr_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/stristr_variation2.php.expectf @@ -14,13 +14,13 @@ bool(false) -- Iteration 7 -- bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- bool(false) @@ -35,10 +35,10 @@ bool(false) -- Iteration 16 -- bool(false) -- Iteration 17 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strlen_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strlen_variation1.php.expectf index fc0f255cc..ac9c3581c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strlen_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strlen_variation1.php.expectf @@ -16,13 +16,13 @@ int(5) -- Iteration 8 -- int(12) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- int(1) @@ -39,7 +39,7 @@ int(0) -- Iteration 18 -- int(13) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- int(0) diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf index b93474846..522c2b6c8 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strnatcasecmp_error.php.expectf @@ -1,10 +1,10 @@ *** Testing strnatcasecmp() : error conditions *** -- Testing strnatcmp() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strnatcasecmp() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf index 994ad8ab1..3c7f751c3 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strnatcmp_error.php.expectf @@ -1,10 +1,10 @@ *** Testing strnatcmp() : error conditions *** -- Testing strnatcmp() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strnatcmp() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_error.php.expectf index af37e433c..71e1d3613 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_error.php.expectf @@ -1,20 +1,20 @@ *** Testing strncasecmp() function: error conditions *** -- Testing strncasecmp() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strncasecmp() function with less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strncasecmp() function with more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strncasecmp() function with invalid argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation10.php.expectf index 79f3c0d2a..e368edf7e 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation10.php.expectf @@ -28,24 +28,24 @@ int(-%d) -- Iteration 14 -- int(-%d) -- Iteration 15 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 20 -- int(-%d) @@ -68,8 +68,8 @@ int(-%d) -- Iteration 29 -- int(-%d) -- Iteration 30 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 31 -- int(-%d) diff --git a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation11.php.expectf index 64227b3ea..6c6251c83 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation11.php.expectf @@ -28,24 +28,24 @@ int(%d) -- Iteration 14 -- int(%d) -- Iteration 15 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 20 -- int(%d) @@ -68,8 +68,8 @@ int(%d) -- Iteration 29 -- int(%d) -- Iteration 30 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 31 -- int(4) diff --git a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation4.php.expectf index 5a16371c3..1096fd498 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation4.php.expectf @@ -28,24 +28,24 @@ int(0) -- Iteration 14 -- int(0) -- Iteration 15 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 20 -- int(0) @@ -68,8 +68,8 @@ int(0) -- Iteration 29 -- int(0) -- Iteration 30 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 31 -- int(0) diff --git a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation5.php.expectf index 1b54239df..8df2348c1 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncasecmp_variation5.php.expectf @@ -14,19 +14,19 @@ int(0) -- Iteration 7 -- int(0) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- int(0) @@ -41,19 +41,19 @@ int(0) -- Iteration 18 -- int(0) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- int(0) -- Iteration 22 -- int(0) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strncmp_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncmp_variation4.php.expectf index d18c30771..67e47f943 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncmp_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncmp_variation4.php.expectf @@ -1,6 +1,6 @@ *** Testing strncmp() function: by supplying all types for 'str1' and 'str2' *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s -- Iteration 1 -- int(0) -- Iteration 2 -- @@ -30,24 +30,24 @@ int(0) -- Iteration 14 -- int(0) -- Iteration 15 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 20 -- int(0) @@ -70,8 +70,8 @@ int(0) -- Iteration 29 -- int(0) -- Iteration 30 -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s NULL -- Iteration 31 -- int(0) diff --git a/hphp/test/zend/bad/ext-standard-strings/strncmp_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strncmp_variation5.php.expectf index 9147ba390..53a42b8df 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strncmp_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strncmp_variation5.php.expectf @@ -1,6 +1,6 @@ *** Test strncmp() function: by supplying all types for 'len' *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s -- Iteration 1 -- int(0) -- Iteration 2 -- @@ -22,19 +22,19 @@ int(0) -- Iteration 10 -- int(0) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- int(0) @@ -49,19 +49,19 @@ int(0) -- Iteration 21 -- int(0) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- int(0) -- Iteration 25 -- int(0) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 27 -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strpbrk_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strpbrk_error.php.expectf index d1e4032b9..d65c32fda 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strpbrk_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strpbrk_error.php.expectf @@ -1,20 +1,20 @@ *** Testing strpbrk() : error conditions *** -- Testing strpbrk() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing strpbrk() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing strpbrk() function with empty second argument -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing strpbrk() function with arrays -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php b/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php index 76a8c83c0..aeab1958d 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php +++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_basic.php @@ -27,7 +27,7 @@ var_dump( strrchr("Hello, World", "Hello, World") ); //needle as haystack //needle string containing one existing and one non-existing char var_dump( strrchr("Hello, World", "Hi") ); -//multiple existance of needle in haystack +//multiple existence of needle in haystack var_dump( strrchr("Hello, World", "o") ); var_dump( strrchr("Hello, World", "ooo") ); diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrchr_error.php.expectf index e74a62dc2..fc70918b5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrchr_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_error.php.expectf @@ -1,14 +1,14 @@ *** Testing strrchr() function: error conditions *** -- Testing strrchr() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strrchr() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strrchr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation10.php.expectf index b298c465c..3a77eb758 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation10.php.expectf @@ -18,19 +18,19 @@ bool(false) -- Iteration 9 -- bool(false) -- 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 -- bool(false) @@ -45,14 +45,14 @@ bool(false) -- Iteration 20 -- bool(false) -- Iteration 21 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 22 -- bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation11.php.expectf index 730d4e1cb..08a2f9f49 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation11.php.expectf @@ -18,19 +18,19 @@ bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- bool(false) @@ -41,7 +41,7 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- bool(false) @@ -52,7 +52,7 @@ bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation9.php.expectf index dd38b8fe1..885e8f366 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrchr_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrchr_variation9.php.expectf @@ -18,19 +18,19 @@ string(7) "1.06E-9" -- Iteration 9 -- string(2) ".5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- bool(false) @@ -51,7 +51,7 @@ bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrev_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrev_error.php.expectf index 76373cc87..0e98b4bc3 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrev_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrev_error.php.expectf @@ -1,9 +1,9 @@ *** Testing strrev() : error conditions *** -- Testing strrev() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strrev() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrev_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrev_variation4.php.expectf index f1407e27b..b3a87ed4c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrev_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrev_variation4.php.expectf @@ -28,23 +28,23 @@ string(7) "9-E60.1" string(3) "5.0" -- Iterator 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 15 -- @@ -75,7 +75,7 @@ string(0) "" string(6) "tcejbo" -- Iterator 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iterator 25 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/strripos_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strripos_error.php.expectf index de1c1c67c..1049f7519 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strripos_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strripos_error.php.expectf @@ -1,13 +1,13 @@ *** Testing strripos() function: error conditions *** -- With Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- With less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- With more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strripos_offset.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strripos_offset.php.expectf index 40b74db5f..2c4810088 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strripos_offset.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strripos_offset.php.expectf @@ -1,19 +1,19 @@ -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) -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) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_error.php.expectf index c8cba32b6..006891ed5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_error.php.expectf @@ -1,13 +1,13 @@ *** Testing strrpos() function: error conditions *** -- With Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- With less than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- With more than expected number of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_offset.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_offset.php.expectf index d206fe12e..f03986d4c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_offset.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_offset.php.expectf @@ -1,17 +1,17 @@ -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation10.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation10.php.expectf index 35c0abec4..789debf79 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation10.php.expectf @@ -18,19 +18,19 @@ bool(false) -- Iteration 9 -- bool(false) -- 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 -- bool(false) @@ -41,7 +41,7 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- bool(false) @@ -52,7 +52,7 @@ bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation11.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation11.php.expectf index c304c8cd7..a7f6c6793 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation11.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation11.php.expectf @@ -27,29 +27,29 @@ bool(false) bool(false) bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- bool(false) @@ -64,9 +64,9 @@ bool(false) bool(false) bool(false) -- Iteration 19 -- -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -- Iteration 20 -- bool(false) @@ -81,9 +81,9 @@ bool(false) bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation14.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation14.php.expectf index 8d7c87e91..807d1eed2 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation14.php.expectf @@ -4,26 +4,26 @@ int(6) -- Iteration 2 -- int(6) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- int(6) -- Iteration 5 -- int(6) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- int(6) @@ -34,20 +34,20 @@ int(6) -- Iteration 14 -- int(6) -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- int(6) -- Iteration 19 -- int(6) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- int(6) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation15.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation15.php.expectf index 1ecd0ab44..97be55d75 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation15.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation15.php.expectf @@ -4,38 +4,38 @@ bool(false) -- Iteration 2 -- bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- bool(false) -- Iteration 9 -- bool(false) -- 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 -- bool(false) @@ -46,20 +46,20 @@ bool(false) -- Iteration 18 -- bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- bool(false) -- Iteration 23 -- bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- bool(false) diff --git a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation9.php.expectf index f031e090b..ff7a86ec8 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strrpos_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strrpos_variation9.php.expectf @@ -28,23 +28,23 @@ bool(false) bool(false) -- 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 -- @@ -75,7 +75,7 @@ bool(false) bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 25 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/strspn_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strspn_variation1.php.expectf index 360bf8f85..8e461b24f 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strspn_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strspn_variation1.php.expectf @@ -46,43 +46,43 @@ int(0) int(0) -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "Array" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with str value as "" @@ -141,10 +141,10 @@ bool(false) bool(false) -- Iteration with str value as "Resource id #%d" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php b/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php index c63565b7a..2203689b6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php @@ -12,7 +12,7 @@ error_reporting(E_ALL & ~E_NOTICE); * Testing strspn() : with different unexpected values for mask argument */ -echo "*** Testing strspn() : with diferent unexpected values of mask argument ***\n"; +echo "*** Testing strspn() : with different unexpected values of mask argument ***\n"; $str = 'string_val'; $start = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php.expectf index 16baad30c..499837d15 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strspn_variation2.php.expectf @@ -1,4 +1,4 @@ -*** Testing strspn() : with diferent unexpected values of mask argument *** +*** Testing strspn() : with different unexpected values of mask argument *** -- Iteration with mask value as "0" -- int(0) @@ -46,43 +46,43 @@ int(0) int(0) -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with mask value as "" -- @@ -141,10 +141,10 @@ int(0) int(0) -- Iteration with mask value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strspn_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strspn_variation3.php.expectf index d9eac1997..b07683d04 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strspn_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strspn_variation3.php.expectf @@ -21,33 +21,33 @@ int(2) int(2) -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- @@ -75,33 +75,33 @@ int(2) int(2) -- Iteration with start value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "object" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with start value as "" -- @@ -113,8 +113,8 @@ int(2) int(2) -- Iteration with start value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strspn_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strspn_variation4.php.expectf index f6431a920..1a6bc9e95 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strspn_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strspn_variation4.php.expectf @@ -16,23 +16,23 @@ int(0) int(0) -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "Array" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- @@ -54,23 +54,23 @@ int(1) int(0) -- Iteration with len value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "string" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "object" -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration with len value as "" -- @@ -80,6 +80,6 @@ int(0) int(0) -- Iteration with len value as "Resource id #%d" -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strstr.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strstr.php.expectf index 44801bf34..8a655f375 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/strstr.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/strstr.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php b/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php index 1e9f24ccf..0e72ea700 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php @@ -78,7 +78,7 @@ $values = array ( // loop through each element of the array and check the working of strtok() -// when $str arugment is supplied with different values +// when $str argument is supplied with different values echo "\n--- Testing strtok() by supplying different values for 'str' argument ---\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php.expectf index af7e04b45..5bf5821f1 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtok_variation1.php.expectf @@ -1,6 +1,6 @@ *** Testing strtok() : with first argument as non-string *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing strtok() by supplying different values for 'str' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(11) "1.07654321E" -- Iteration 9 -- string(3) "0.5" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(1) "1" @@ -59,6 +59,6 @@ bool(false) -- Iteration 25 -- bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php b/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php index f85f5f468..e67591946 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php +++ b/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php @@ -78,7 +78,7 @@ $values = array ( // loop through each element of the array and check the working of strtok() -// when $token arugment is supplied with different values +// when $token argument is supplied with different values echo "\n--- Testing strtok() by supplying different values for 'token' argument ---\n"; $counter = 1; diff --git a/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php.expectf index 4d9ae2b64..9652bf7b5 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtok_variation2.php.expectf @@ -1,6 +1,6 @@ *** Testing strtok() : with different token strings *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s --- Testing strtok() by supplying different values for 'token' argument --- -- Iteration 1 -- @@ -22,19 +22,19 @@ string(37) "this testcase test strtok() function " -- Iteration 9 -- string(37) "this testcase test strtok() function " -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(37) "this testcase test strtok() function " @@ -59,6 +59,6 @@ string(37) "this testcase test strtok() function " -- Iteration 25 -- string(37) "this testcase test strtok() function " -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strtolower-win32.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtolower-win32.php.expectf index 482f62704..5b8827dc3 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/strtolower-win32.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/strtolower-win32.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/strtolower.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtolower.php.expectf index 1f8df09c5..3b81ad2e6 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/strtolower.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/strtolower.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/strtoupper1-win32.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtoupper1-win32.php.expectf index 7254f41b8..07c748486 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/strtoupper1-win32.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/strtoupper1-win32.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/strtoupper1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtoupper1.php.expectf index 7aaeb8c42..10061a2c1 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/strtoupper1.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/strtoupper1.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtr_error.php.expectf index 32aa276aa..e06e831d4 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtr_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtr_error.php.expectf @@ -1,14 +1,14 @@ *** Testing strtr() : error conditions *** -- Testing strtr() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strtr() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strtr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation5.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtr_variation5.php.expectf index 117f53a11..9d74f3adc 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtr_variation5.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtr_variation5.php.expectf @@ -12,13 +12,13 @@ string(5) "-ma.5" -- Iteration 6 -- string(12) "tatm34567aaa" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- string(1) "t" @@ -35,7 +35,7 @@ string(0) "" -- Iteration 16 -- string(13) "s02ple objec1" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- string(0) "" diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation6.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtr_variation6.php.expectf index 83a24cc46..07a7d5152 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtr_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtr_variation6.php.expectf @@ -12,13 +12,13 @@ string(6) "m1tatm" -- Iteration 6 -- string(6) "tm0atm" -- Iteration 7 -- -HipHop Notice: %a +HipHop Notice: %s string(6) "0120tm" -- Iteration 8 -- -HipHop Notice: %a +HipHop Notice: %s string(6) "0120tm" -- Iteration 9 -- -HipHop Notice: %a +HipHop Notice: %s string(6) "0120tm" -- Iteration 10 -- string(6) "0a2atm" diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation7.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtr_variation7.php.expectf index 09cda8703..132c91845 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtr_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtr_variation7.php.expectf @@ -19,15 +19,15 @@ string(6) ".52-20" string(6) "234101" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- @@ -52,7 +52,7 @@ string(6) "012atm" string(6) "plesam" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- diff --git a/hphp/test/zend/bad/ext-standard-strings/strtr_variation9.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strtr_variation9.php.expectf index 551965b27..357868ef8 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strtr_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strtr_variation9.php.expectf @@ -2,112 +2,112 @@ -- Iteration 1 -- string(1) "0" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- string(1) "1" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- string(2) "-2" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- string(4) "10.5" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- string(5) "-20.5" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- string(12) "101234567000" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- string(1) "1" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- string(1) "1" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- string(13) "sample object" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- string(0) "" -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strval.php.expectf b/hphp/test/zend/bad/ext-standard-strings/strval.php.expectf index 2dabaff11..db3490489 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strval.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/strval.php.expectf @@ -5,5 +5,5 @@ string(1) "1" string(3) "1.1" string(1) "1" string(0) "" -HipHop Notice: %a +HipHop Notice: %s string(5) "Array" \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/substr.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr.php.expectf index cf8108dfc..8727f84b5 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/substr.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/substr.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_compare.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr_compare.php.expectf index 64e290eff..df7c9f4bd 100644 --- a/hphp/test/zend/bad/ext-standard-strings/substr_compare.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/substr_compare.php.expectf @@ -3,14 +3,14 @@ int(0) int(0) int(1) int(-1) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(-1) -HipHop Warning: %a +HipHop Warning: %s bool(false) Test -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_count_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr_count_error.php.expectf index 803b781b8..623e257b4 100644 --- a/hphp/test/zend/bad/ext-standard-strings/substr_count_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/substr_count_error.php.expectf @@ -1,22 +1,22 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s NULL -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_count_variation_001.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr_count_variation_001.php.expectf index 7e8465915..ce9a6d21d 100644 --- a/hphp/test/zend/bad/ext-standard-strings/substr_count_variation_001.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/substr_count_variation_001.php.expectf @@ -2,18 +2,18 @@ -- 3rd or 4th arg as string -- int(1) int(1) -HipHop Notice: %a +HipHop Notice: %s int(2) -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(2) -- 3rd or 4th arg as NULL -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(0) int(2) diff --git a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf index 9ba6457e3..c8163e629 100644 --- a/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/substr_replace_error.php.expectf @@ -1,26 +1,26 @@ *** Testing substr_replace() : error conditions *** -- Testing substr_replace() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing substr_replace() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing substr_replace() function with start and length different types -- -HipHop Warning: %a +HipHop Warning: %s string(12) "Good morning" -HipHop Warning: %a +HipHop Warning: %s string(12) "Good morning" -- Testing substr_replace() function with start and length with a different number of elments -- -HipHop Warning: %a +HipHop Warning: %s string(12) "Good morning" -- Testing substr_replace() function with start and length as arrays but string not-- -HipHop Warning: %a +HipHop Warning: %s string(12) "Good morning" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/trim1.php b/hphp/test/zend/bad/ext-standard-strings/trim1.php index 24ef211d8..16b8863c6 100644 --- a/hphp/test/zend/bad/ext-standard-strings/trim1.php +++ b/hphp/test/zend/bad/ext-standard-strings/trim1.php @@ -15,7 +15,7 @@ var_dump( trim($null_var) ); $bool_val = true; var_dump( trim($null_var) ); -/* second arguemnt charlist as null - does not trim any white spaces */ +/* second argument charlist as null - does not trim any white spaces */ var_dump( trim("\ttesting trim", "") ); var_dump( trim(" \ttesting trim ", NULL) ); var_dump( trim("\ttesting trim ", true) ); diff --git a/hphp/test/zend/bad/ext-standard-strings/trim1.php.expectf b/hphp/test/zend/bad/ext-standard-strings/trim1.php.expectf index d5247b2e6..d977731db 100644 Binary files a/hphp/test/zend/bad/ext-standard-strings/trim1.php.expectf and b/hphp/test/zend/bad/ext-standard-strings/trim1.php.expectf differ diff --git a/hphp/test/zend/bad/ext-standard-strings/trim_variation1.php b/hphp/test/zend/bad/ext-standard-strings/trim_variation1.php index 3f3090a66..ec1cb103c 100644 --- a/hphp/test/zend/bad/ext-standard-strings/trim_variation1.php +++ b/hphp/test/zend/bad/ext-standard-strings/trim_variation1.php @@ -1,7 +1,7 @@ \nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- string(25) "testing @@ -24,49 +24,49 @@ string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" string(223) "
\nt
\ne
\ns
\nt
\ni
\nn
\ng
\n
\nw
\no
\nr
\nd
\nw
\nr
\na
\np
\n
\nf
\nu
\nn
\nc
\nt
\ni
\no
\nn" -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- string(25) "testing @@ -81,7 +81,7 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- string(25) "testing @@ -96,34 +96,34 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- string(25) "testing @@ -131,7 +131,7 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- string(25) "testing @@ -139,34 +139,34 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- string(25) "testing @@ -174,7 +174,7 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- string(25) "testing @@ -182,6 +182,6 @@ wordwrap function" string(39) "testing
\nwordwrap
\nfunction" string(39) "testing
\nwordwrap
\nfunction" -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php index 4f4b249a7..6a6ad3e44 100644 --- a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php +++ b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php @@ -72,7 +72,7 @@ $values = array ( ); // loop though each element of the array and check the working of wordwrap() -// when $break arugment is supplied with different values +// when $break argument is supplied with different values echo "\n--- Testing wordwrap() by supplying different values for 'break' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php.expectf b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php.expectf index b0e800d57..b4ca81758 100644 --- a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation3.php.expectf @@ -38,116 +38,116 @@ string(29) "testing0.5wordwrap0.5function" string(29) "testing0.5wordwrap0.5function" string(29) "testing0.5wordwrap0.5function" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(25) "testing1wordwrap1function" string(25) "testing1wordwrap1function" string(25) "testing1wordwrap1function" -- Iteration 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) -- Iteration 17 -- string(25) "testing1wordwrap1function" string(25) "testing1wordwrap1function" string(25) "testing1wordwrap1function" -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php index 4e4fd64f9..0001e8b33 100644 --- a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php +++ b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php @@ -63,7 +63,7 @@ $values = array ( ); // loop though each element of the array and check the working of wordwrap() -// when $cut arugment is supplied with different values +// when $cut argument is supplied with different values echo "\n--- Testing wordwrap() by supplying different values for 'cut' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php.expectf b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php.expectf index 127562beb..ad5cffb84 100644 --- a/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-standard-strings/wordwrap_variation4.php.expectf @@ -20,26 +20,26 @@ string(39) "testing
\nwordwrap
\nfunction" -- Iteration 9 -- string(39) "testing
\nwordwrap
\nfunction" -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- string(39) "testing
\nwordwrap
\nfunction" -- Iteration 16 -- string(39) "testing
\nwordwrap
\nfunction" -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- string(39) "testing
\nwordwrap
\nfunction" diff --git a/hphp/test/zend/bad/ext-standard-url/get_headers_error_002.php.expectf b/hphp/test/zend/bad/ext-standard-url/get_headers_error_002.php.expectf index cea995358..9ac944f04 100644 --- a/hphp/test/zend/bad/ext-standard-url/get_headers_error_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-url/get_headers_error_002.php.expectf @@ -1,14 +1,14 @@ *** Testing get_headers() : error conditions *** -- Testing get_headers() function with format argument as type string -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_headers() function with format argument as type array -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_headers() function with format argument as type object -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-url/parse_url_error_002.php.expectf b/hphp/test/zend/bad/ext-standard-url/parse_url_error_002.php.expectf index 40158e190..294c1f87d 100644 --- a/hphp/test/zend/bad/ext-standard-url/parse_url_error_002.php.expectf +++ b/hphp/test/zend/bad/ext-standard-url/parse_url_error_002.php.expectf @@ -20,6 +20,6 @@ --> Above range: -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php index a71dc4032..7f4c08fe9 100644 --- a/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php +++ b/hphp/test/zend/bad/ext-standard-versioning/php_sapi_name_variation001.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/utf8_decode_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/utf8_decode_variation1.php.expectf index b5fc0b3a1..0baf313ac 100644 --- a/hphp/test/zend/bad/ext-xml/utf8_decode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/utf8_decode_variation1.php.expectf @@ -28,23 +28,23 @@ Arg value 0.5 string(3) "0.5" Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value diff --git a/hphp/test/zend/bad/ext-xml/utf8_encode_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/utf8_encode_variation1.php.expectf index 65843cd72..9987c939a 100644 --- a/hphp/test/zend/bad/ext-xml/utf8_encode_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/utf8_encode_variation1.php.expectf @@ -28,23 +28,23 @@ Arg value 0.5 string(3) "0.5" Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value diff --git a/hphp/test/zend/bad/ext-xml/xml_error_string_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_error_string_variation1.php.expectf index 4532a9540..afd8c4c18 100644 --- a/hphp/test/zend/bad/ext-xml/xml_error_string_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_error_string_variation1.php.expectf @@ -16,23 +16,23 @@ Arg value 0.5 string(8) "No error" Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value @@ -54,23 +54,23 @@ Arg value string(8) "No error" Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value diff --git a/hphp/test/zend/bad/ext-xml/xml_get_current_byte_index_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_get_current_byte_index_variation1.php.expectf index ca65cd660..45e856fa4 100644 --- a/hphp/test/zend/bad/ext-xml/xml_get_current_byte_index_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_get_current_byte_index_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_get_current_byte_index() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_get_current_column_number_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_get_current_column_number_variation1.php.expectf index 1296b9030..17844a14f 100644 --- a/hphp/test/zend/bad/ext-xml/xml_get_current_column_number_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_get_current_column_number_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_get_current_column_number() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_get_current_line_number_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_get_current_line_number_variation1.php.expectf index 1a377bfcb..4289f6016 100644 --- a/hphp/test/zend/bad/ext-xml/xml_get_current_line_number_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_get_current_line_number_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_get_current_line_number() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_get_error_code_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_get_error_code_variation1.php.expectf index 9d308d06b..ed47046ec 100644 --- a/hphp/test/zend/bad/ext-xml/xml_get_error_code_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_get_error_code_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_get_error_code() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parse_into_struct_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parse_into_struct_variation1.php.expectf index 66b7f5fd3..baa1747db 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parse_into_struct_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parse_into_struct_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_parse_into_struct() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parse_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parse_variation1.php.expectf index 25e4d3d18..25cf39012 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parse_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parse_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_parse() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_create_error.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_create_error.php.expectf index 8d3f239f0..da04f73c4 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_create_error.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_create_error.php.expectf @@ -1,6 +1,6 @@ *** Testing xml_parser_create() : error conditions *** -- Testing xml_parser_create() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_error.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_error.php.expectf index bd6b7d9fe..fe3cb72dc 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_error.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_error.php.expectf @@ -1,6 +1,6 @@ *** Testing xml_parser_create_ns() : error conditions *** -- Testing xml_parser_create_ns() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_variation1.php.expectf index 410f3b2c5..891347f91 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_create_ns_variation1.php.expectf @@ -1,59 +1,59 @@ *** Testing xml_parser_create_ns() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value @@ -63,14 +63,14 @@ Arg value resource(%d) of type (xml) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value resource(%d) of type (xml) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value @@ -83,11 +83,11 @@ Arg value resource(%d) of type (xml) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value ISO-8859-1 @@ -100,15 +100,15 @@ Arg value US-ASCII resource(%d) of type (xml) Arg value UTF-32 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_create_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_create_variation1.php.expectf index 207b50660..8dcf76b13 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_create_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_create_variation1.php.expectf @@ -1,59 +1,59 @@ *** Testing xml_parser_create() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value @@ -63,14 +63,14 @@ Arg value resource(%d) of type (xml) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value resource(%d) of type (xml) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value @@ -83,11 +83,11 @@ Arg value resource(%d) of type (xml) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value ISO-8859-1 @@ -100,15 +100,15 @@ Arg value US-ASCII resource(%d) of type (xml) Arg value UTF-32 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_free_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_free_variation1.php.expectf index 55e3fc184..d0a7b4910 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_free_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_free_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_parser_free() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation1.php.expectf index a65b0aa0b..faffcd8a6 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_parser_get_option() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation2.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation2.php.expectf index 6642b86b0..9d049f6a2 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_get_option_variation2.php.expectf @@ -1,104 +1,104 @@ *** Testing xml_parser_get_option() : usage variations *** Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 int(1) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 int(1) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation1.php.expectf index 1bfc87737..6056784d4 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_parser_set_option() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation2.php.expectf b/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation2.php.expectf index 86150039a..726f04724 100644 --- a/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_parser_set_option_variation2.php.expectf @@ -1,100 +1,100 @@ *** Testing xml_parser_set_option() : usage variations *** Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 bool(true) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 bool(true) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_character_data_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_character_data_handler_variation1.php.expectf index f0b531738..828c36d52 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_character_data_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_character_data_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_character_data_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_default_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_default_handler_variation1.php.expectf index f5da68638..2e28f5737 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_default_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_default_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_default_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_element_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_element_handler_variation1.php.expectf index 8e01430d5..2d78cdf8f 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_element_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_element_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_element_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_end_namespace_decl_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_end_namespace_decl_handler_variation1.php.expectf index a64aeead0..05e9badb3 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_end_namespace_decl_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_end_namespace_decl_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_end_namespace_decl_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_external_entity_ref_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_external_entity_ref_handler_variation1.php.expectf index ff35f8de6..096e68eb6 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_external_entity_ref_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_external_entity_ref_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_external_entity_ref_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_notation_decl_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_notation_decl_handler_variation1.php.expectf index 9e9a35743..505695e40 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_notation_decl_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_notation_decl_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_notation_decl_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_object_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_object_variation1.php.expectf index 3e8ed34bc..fd87ee882 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_object_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_object_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_object() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_object_variation2.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_object_variation2.php.expectf index daedb7af0..6667908e4 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_object_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_object_variation2.php.expectf @@ -1,110 +1,110 @@ *** Testing xml_set_object() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_processing_instruction_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_processing_instruction_handler_variation1.php.expectf index 9cc295001..0a3065101 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_processing_instruction_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_processing_instruction_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_processing_instruction_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_start_namespace_decl_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_start_namespace_decl_handler_variation1.php.expectf index 15aad3c70..962df50f1 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_start_namespace_decl_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_start_namespace_decl_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_start_namespace_decl_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xml/xml_set_unparsed_entity_decl_handler_variation1.php.expectf b/hphp/test/zend/bad/ext-xml/xml_set_unparsed_entity_decl_handler_variation1.php.expectf index 51ca63d58..04aaae94d 100644 --- a/hphp/test/zend/bad/ext-xml/xml_set_unparsed_entity_decl_handler_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-xml/xml_set_unparsed_entity_decl_handler_variation1.php.expectf @@ -1,114 +1,114 @@ *** Testing xml_set_unparsed_entity_decl_handler() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Some Ascii Data -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Resource id %s -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlreader/012.php b/hphp/test/zend/bad/ext-xmlreader/012.php similarity index 94% rename from hphp/test/zend/good/ext-xmlreader/012.php rename to hphp/test/zend/bad/ext-xmlreader/012.php index 0adc88092..0ae74d559 100644 --- a/hphp/test/zend/good/ext-xmlreader/012.php +++ b/hphp/test/zend/bad/ext-xmlreader/012.php @@ -33,7 +33,7 @@ $reader->close(); echo "\nUsing URI:\n"; $reader = new XMLReader(); -$file = dirname(__FILE__) . '/012.xml'; +$file = dirname(__FILE__) . '/_012.xml'; if (DIRECTORY_SEPARATOR == '\\') { $file = str_replace('\\',"/", $file); } @@ -47,7 +47,7 @@ var_dump($reader->getAttribute('baz')); $reader->close(); $reader = new XMLReader(); -$reader->open(dirname(__FILE__) . '/012.xml'); +$reader->open(dirname(__FILE__) . '/_012.xml'); $reader->setParserProperty(XMLReader::DEFAULTATTRS, true); while($reader->read() && $reader->nodeType != XMLReader::ELEMENT); var_dump($reader->getAttribute('bar')); diff --git a/hphp/test/zend/good/ext-xmlreader/012.php.expectf b/hphp/test/zend/bad/ext-xmlreader/012.php.expectf similarity index 100% rename from hphp/test/zend/good/ext-xmlreader/012.php.expectf rename to hphp/test/zend/bad/ext-xmlreader/012.php.expectf diff --git a/hphp/test/zend/bad/ext-xmlreader/013.php.expectf b/hphp/test/zend/bad/ext-xmlreader/013.php.expectf index d79e83240..c0ed5f7ae 100644 --- a/hphp/test/zend/bad/ext-xmlreader/013.php.expectf +++ b/hphp/test/zend/bad/ext-xmlreader/013.php.expectf @@ -1,5 +1,5 @@ string(3) "123" string(3) "456" ===FAIL=== -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/010.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/010.php.expectf index b7a5ed421..47ed03eae 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/010.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/010.php.expectf @@ -1,10 +1,10 @@ bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(true) diff --git a/hphp/test/zend/bad/ext-xmlwriter/bug41326.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/bug41326.php.expectf index a44f52844..89d6e49e7 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/bug41326.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/bug41326.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s diff --git a/hphp/test/zend/bad/ext-xmlwriter/bug48204.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/bug48204.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/bug48204.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/bug48204.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_001.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_001.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_001.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_003.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_003.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_003.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_003.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_004.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_004.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_004.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_004.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_005.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_005.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_005.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_open_uri_error_005.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_set_indent_string_error_001.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_set_indent_string_error_001.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_set_indent_string_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_set_indent_string_error_001.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_write_attribute_ns_error_001.php.expectf b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_write_attribute_ns_error_001.php.expectf index 8f28dea9a..cf6bcbfa1 100644 --- a/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_write_attribute_ns_error_001.php.expectf +++ b/hphp/test/zend/bad/ext-xmlwriter/xmlwriter_write_attribute_ns_error_001.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s diff --git a/hphp/test/zend/bad/ext-zlib/005.php.expectf b/hphp/test/zend/bad/ext-zlib/005.php.expectf index d3aa7924c..ebffb9ad3 100644 --- a/hphp/test/zend/bad/ext-zlib/005.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/005.php.expectf @@ -1,21 +1,21 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%a" string(%d) "%a" string(%d) "%a" string(%d) "%a" string(%d) "%a" -HipHop Warning: %a +HipHop Warning: %s NULL -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) string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart @@ -23,6 +23,6 @@ Desolation, grief and agony" string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart Desolation, grief and agony" -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/006.php.expectf b/hphp/test/zend/bad/ext-zlib/006.php.expectf index 8ced1b76e..a028b9757 100644 --- a/hphp/test/zend/bad/ext-zlib/006.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/006.php.expectf @@ -1,23 +1,23 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%a" string(%d) "%a" string(%d) "%a" string(%d) "%a" string(%d) "%a" -HipHop Warning: %a +HipHop Warning: %s NULL -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) string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart @@ -25,6 +25,6 @@ Desolation, grief and agony" string(94) "Answer me, it can't be so hard Cry to relieve what's in your heart Desolation, grief and agony" -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/007.php.expectf b/hphp/test/zend/bad/ext-zlib/007.php.expectf index 29cf17e9f..959cad413 100644 --- a/hphp/test/zend/bad/ext-zlib/007.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/007.php.expectf @@ -1,16 +1,16 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" string(%d) "%s" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" string(%d) "%s" diff --git a/hphp/test/zend/bad/ext-zlib/bug61139.php b/hphp/test/zend/bad/ext-zlib/bug61139.php new file mode 100644 index 000000000..36523cb83 --- /dev/null +++ b/hphp/test/zend/bad/ext-zlib/bug61139.php @@ -0,0 +1,8 @@ + + +unlink('someFile'); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/bug61139.php.expectf b/hphp/test/zend/bad/ext-zlib/bug61139.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/bad/ext-zlib/bug61139.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzclose_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzclose_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzclose_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzclose_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzcompress_error1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzcompress_error1.php.expectf index 75958101a..e16605a9a 100644 --- a/hphp/test/zend/bad/ext-zlib/gzcompress_error1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzcompress_error1.php.expectf @@ -1,22 +1,22 @@ *** Testing gzcompress() : error conditions *** -- Testing gzcompress() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzcompress() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with incorrect compression level -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with invalid encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect parameters -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzdeflate_error1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzdeflate_error1.php.expectf index 8fef412b6..77140dd38 100644 --- a/hphp/test/zend/bad/ext-zlib/gzdeflate_error1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzdeflate_error1.php.expectf @@ -1,24 +1,24 @@ *** Testing gzdeflate() : error conditions *** -- Testing gzdeflate() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzdeflate() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with incorrect compression level -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect parameters -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzencode_error1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzencode_error1.php.expectf index 17997907b..80fd24e19 100644 --- a/hphp/test/zend/bad/ext-zlib/gzencode_error1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzencode_error1.php.expectf @@ -1,30 +1,30 @@ *** Testing gzencode() : error conditions *** -- Testing gzencode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzencode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with incorrect compression level -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect encoding_mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect parameters -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzeof_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzeof_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzeof_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzeof_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation1.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation1.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation10.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation10.php.expectf index bc345f4ca..accab69fd 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation10.php.expectf @@ -38,9 +38,9 @@ array(6) { string(39) "and I know that it descends down on me " } -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(6) { [0]=> diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation14.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation14.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation14.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation2.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation2.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation2.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation3.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation3.php.expectf index 2ec6984df..4c1d0da4d 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation3.php.expectf @@ -1,13 +1,13 @@ -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzfile_variation8.php.expectf b/hphp/test/zend/bad/ext-zlib/gzfile_variation8.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/gzfile_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzfile_variation8.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzgetc_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzgetc_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzgetc_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzgetc_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzgets_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzgets_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzgets_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzgets_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzinflate-bug42663.php.expectf b/hphp/test/zend/bad/ext-zlib/gzinflate-bug42663.php.expectf index b25909bce..ceea9aaba 100644 --- a/hphp/test/zend/bad/ext-zlib/gzinflate-bug42663.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzinflate-bug42663.php.expectf @@ -1,5 +1,5 @@ int(168890) int(66743) int(65535) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzinflate_error1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzinflate_error1.php.expectf index 93efd9b34..0e215d9a7 100644 --- a/hphp/test/zend/bad/ext-zlib/gzinflate_error1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzinflate_error1.php.expectf @@ -1,20 +1,20 @@ *** Testing gzinflate() : error conditions *** -- Testing gzcompress() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzcompress() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with a buffer that is too small -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect parameters -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzinflate_length.php.expectf b/hphp/test/zend/bad/ext-zlib/gzinflate_length.php.expectf index 4995b3a5b..72fcb3fe4 100644 --- a/hphp/test/zend/bad/ext-zlib/gzinflate_length.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzinflate_length.php.expectf @@ -1,5 +1,5 @@ 5 15 Strings are equal Strings are equal -HipHop Warning: %a +HipHop Warning: %s Failed (as expected) \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php.expectf b/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php.expectf index 164a3d3e0..070b666c7 100644 --- a/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php.expectf @@ -2,6 +2,6 @@ testing mode -- w -- This was the information that was written testing mode -- w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzopen_variation4.php.expectf b/hphp/test/zend/bad/ext-zlib/gzopen_variation4.php.expectf index 7ee744960..27fd072f3 100644 --- a/hphp/test/zend/bad/ext-zlib/gzopen_variation4.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzopen_variation4.php.expectf @@ -10,25 +10,25 @@ This is a file in working dir This is a file in script dir ** testing with mode=r+ ** -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s ** testing with mode=rt ** diff --git a/hphp/test/zend/bad/ext-zlib/gzopen_variation9.php.expectf b/hphp/test/zend/bad/ext-zlib/gzopen_variation9.php.expectf index d94fbe64e..9bec46bc2 100644 --- a/hphp/test/zend/bad/ext-zlib/gzopen_variation9.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzopen_variation9.php.expectf @@ -1,17 +1,17 @@ *** Testing gzopen() : variation *** mode=r+ -HipHop Warning: %a +HipHop Warning: %s gzopen=bool(false) mode=rf gzopen=resource(%d) of type (stream) mode=w+ -HipHop Warning: %a +HipHop Warning: %s gzopen=bool(false) mode=e -HipHop Warning: %a +HipHop Warning: %s gzopen=bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzpassthru_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzpassthru_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzpassthru_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzpassthru_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzread_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzread_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzread_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzread_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzread_error2.php.expectf b/hphp/test/zend/bad/ext-zlib/gzread_error2.php.expectf index b22a822c2..dd7b3d4ab 100644 --- a/hphp/test/zend/bad/ext-zlib/gzread_error2.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzread_error2.php.expectf @@ -1,8 +1,8 @@ string(10) "When you'r" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(5) "e tau" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(8) "ght thro" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzrewind_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzrewind_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gzrewind_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzrewind_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzseek_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzseek_error.php.expectf index 4e6c56d42..44fc31b7d 100644 --- a/hphp/test/zend/bad/ext-zlib/gzseek_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzseek_error.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzseek_variation6.php.expectf b/hphp/test/zend/bad/ext-zlib/gzseek_variation6.php.expectf index c25998e24..f85da9a32 100644 --- a/hphp/test/zend/bad/ext-zlib/gzseek_variation6.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzseek_variation6.php.expectf @@ -1,7 +1,7 @@ move 40 bytes tell=int(40) move to the end -HipHop Warning: %a +HipHop Warning: %s int(-1) tell=int(40) eof=bool(false) diff --git a/hphp/test/zend/bad/ext-zlib/gzseek_variation7.php.expectf b/hphp/test/zend/bad/ext-zlib/gzseek_variation7.php.expectf index a0cc780ce..3efa1e1b7 100644 --- a/hphp/test/zend/bad/ext-zlib/gzseek_variation7.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzseek_variation7.php.expectf @@ -1,6 +1,6 @@ tell=int(23) move to the end of the file -HipHop Warning: %a +HipHop Warning: %s int(-1) tell=int(23) tell=int(47) diff --git a/hphp/test/zend/bad/ext-zlib/gztell_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gztell_error.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/bad/ext-zlib/gztell_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gztell_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzuncompress_error1.php.expectf b/hphp/test/zend/bad/ext-zlib/gzuncompress_error1.php.expectf index 7034c97f7..911dfcae5 100644 --- a/hphp/test/zend/bad/ext-zlib/gzuncompress_error1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzuncompress_error1.php.expectf @@ -1,22 +1,22 @@ *** Testing gzuncompress() : error conditions *** -- Testing gzuncompress() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzuncompress() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing with a buffer that is too small -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing with incorrect arguments -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/gzwrite_error.php.expectf b/hphp/test/zend/bad/ext-zlib/gzwrite_error.php.expectf index 4e6c56d42..44fc31b7d 100644 --- a/hphp/test/zend/bad/ext-zlib/gzwrite_error.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/gzwrite_error.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation1.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation1.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation1.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation1.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation10.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation10.php.expectf index 3db4ad64b..5fbac01e0 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation10.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation10.php.expectf @@ -12,9 +12,9 @@ Destiny who cares as it turns around and I know that it descends down on me int(176) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL When you're taught through feelings Destiny flying high above diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation14.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation14.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation14.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation14.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation2.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation2.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation2.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation2.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation3.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation3.php.expectf index 2ec6984df..4c1d0da4d 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation3.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation3.php.expectf @@ -1,13 +1,13 @@ -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/readgzfile_variation8.php.expectf b/hphp/test/zend/bad/ext-zlib/readgzfile_variation8.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/bad/ext-zlib/readgzfile_variation8.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/readgzfile_variation8.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_scheme_dir_basic.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_scheme_dir_basic.php.expectf index d7e325ca0..040c311e7 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_scheme_dir_basic.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_scheme_dir_basic.php.expectf @@ -1,6 +1,6 @@ bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_scheme_rename_basic.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_scheme_rename_basic.php.expectf index 23e9473c3..255b69195 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_scheme_rename_basic.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_scheme_rename_basic.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(true) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic.php.expectf index 3cbce755b..848606afd 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic2.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic2.php.expectf index fa059d808..1efd599b0 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic2.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_scheme_stat_basic2.php.expectf @@ -4,12 +4,12 @@ is_dir=bool(false) is_readable=bool(false) filesize= -HipHop Warning: %a +HipHop Warning: %s bool(false) filetype= -HipHop Warning: %a +HipHop Warning: %s bool(false) fileatime= -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_scheme_unlink_basic.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_scheme_unlink_basic.php.expectf index 23e9473c3..255b69195 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_scheme_unlink_basic.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_scheme_unlink_basic.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(true) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php.expectf b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php.expectf index 3cbce755b..848606afd 100644 --- a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php.expectf +++ b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-basic/bug45986.php.expectf b/hphp/test/zend/bad/tests-basic/bug45986.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/tests-basic/bug45986.php.expectf +++ b/hphp/test/zend/bad/tests-basic/bug45986.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/__call_005.php.expectf b/hphp/test/zend/bad/tests-classes/__call_005.php.expectf index cb33f9f88..6bcc29627 100644 --- a/hphp/test/zend/bad/tests-classes/__call_005.php.expectf +++ b/hphp/test/zend/bad/tests-classes/__call_005.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s In A::__call(test1, array(1,a)) object(B)#1 (0) { } diff --git a/hphp/test/zend/bad/tests-classes/__call_007.php.expectf b/hphp/test/zend/bad/tests-classes/__call_007.php.expectf index 52215747b..f09c352bf 100644 --- a/hphp/test/zend/bad/tests-classes/__call_007.php.expectf +++ b/hphp/test/zend/bad/tests-classes/__call_007.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s ---> Invoke __call via simple method call. NULL Exception caught OK; continuing. diff --git a/hphp/test/zend/bad/tests-classes/abstract_static.php.expectf b/hphp/test/zend/bad/tests-classes/abstract_static.php.expectf index 324fb9d39..99ee8f5e2 100644 --- a/hphp/test/zend/bad/tests-classes/abstract_static.php.expectf +++ b/hphp/test/zend/bad/tests-classes/abstract_static.php.expectf @@ -1,4 +1,4 @@ Call to function show() Strict Standards: Static function fail::func() should not be abstract in %sabstract_static.php(%d) : eval()'d code on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/array_access_004.php.expectf b/hphp/test/zend/bad/tests-classes/array_access_004.php.expectf index 932d79fa7..d26aadd6a 100644 --- a/hphp/test/zend/bad/tests-classes/array_access_004.php.expectf +++ b/hphp/test/zend/bad/tests-classes/array_access_004.php.expectf @@ -3,7 +3,7 @@ string(6) "fooBar" object::offsetGet(2) int(1) object::offsetGet(2) -HipHop Notice: %a +HipHop Notice: %s object::offsetGet(2) int(1) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/array_access_005.php.expectf b/hphp/test/zend/bad/tests-classes/array_access_005.php.expectf index 3014af47f..27f2aa22f 100644 --- a/hphp/test/zend/bad/tests-classes/array_access_005.php.expectf +++ b/hphp/test/zend/bad/tests-classes/array_access_005.php.expectf @@ -12,8 +12,8 @@ array(1) { ["name"]=> string(6) "JoeFoo" } -HipHop Notice: %a +HipHop Notice: %s string(6) "JoeFoo" -HipHop Notice: %a +HipHop Notice: %s string(6) "JoeFoo" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/array_access_008.php.expectf b/hphp/test/zend/bad/tests-classes/array_access_008.php.expectf index b35f3c227..ad392a47b 100644 --- a/hphp/test/zend/bad/tests-classes/array_access_008.php.expectf +++ b/hphp/test/zend/bad/tests-classes/array_access_008.php.expectf @@ -3,10 +3,10 @@ string(6) "FooBar" string(9) "FooBarBaz" ===ArrayOverloading=== string(3) "Foo" -HipHop Notice: %a +HipHop Notice: %s string(3) "Foo" -HipHop Notice: %a +HipHop Notice: %s string(3) "Foo" -HipHop Notice: %a +HipHop Notice: %s string(3) "Foo" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/array_access_012.php.expectf b/hphp/test/zend/bad/tests-classes/array_access_012.php.expectf index aaaa48bec..07eb98c70 100644 --- a/hphp/test/zend/bad/tests-classes/array_access_012.php.expectf +++ b/hphp/test/zend/bad/tests-classes/array_access_012.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/bug26737.php.expectf b/hphp/test/zend/bad/tests-classes/bug26737.php.expectf index de70c7697..a464bedaa 100644 --- a/hphp/test/zend/bad/tests-classes/bug26737.php.expectf +++ b/hphp/test/zend/bad/tests-classes/bug26737.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a +HipHop Notice: %s string(130) "O:3:"foo":4:{s:12:"\0foo\0private";s:7:"private";s:12:"\0*\0protected";s:9:"protected";s:6:"public";s:6:"public";s:7:"no_such";N;}" \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/constants_basic_002.php.expectf b/hphp/test/zend/bad/tests-classes/constants_basic_002.php.expectf index 7ea78b7e7..9b8be9b34 100644 --- a/hphp/test/zend/bad/tests-classes/constants_basic_002.php.expectf +++ b/hphp/test/zend/bad/tests-classes/constants_basic_002.php.expectf @@ -2,7 +2,7 @@ Read class constant. string(5) "hello" Fail to read class constant from instance. -HipHop Notice: %a +HipHop Notice: %s NULL Class constant not visible in object var_dump. diff --git a/hphp/test/zend/bad/tests-classes/constants_error_004.php.expectf b/hphp/test/zend/bad/tests-classes/constants_error_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/constants_error_004.php.expectf +++ b/hphp/test/zend/bad/tests-classes/constants_error_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/destructor_visibility_001.php.expectf b/hphp/test/zend/bad/tests-classes/destructor_visibility_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/destructor_visibility_001.php.expectf +++ b/hphp/test/zend/bad/tests-classes/destructor_visibility_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/destructor_visibility_002.php.expectf b/hphp/test/zend/bad/tests-classes/destructor_visibility_002.php.expectf index 4b87a33d2..48dc93bfb 100644 --- a/hphp/test/zend/bad/tests-classes/destructor_visibility_002.php.expectf +++ b/hphp/test/zend/bad/tests-classes/destructor_visibility_002.php.expectf @@ -1,2 +1,2 @@ ===DONE=== -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_002.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_002.php.expectf index 8c8279869..52ad6b4b5 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_002.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_002.php.expectf @@ -14,4 +14,4 @@ Destruct y int(1) int(1) Done -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_005.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_005.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_006.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_006.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_007.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_007.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_008.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_008.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_008.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_008.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_009.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_009.php.expectf index 4b87a33d2..48dc93bfb 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_009.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_009.php.expectf @@ -1,2 +1,2 @@ ===DONE=== -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/factory_and_singleton_010.php.expectf b/hphp/test/zend/bad/tests-classes/factory_and_singleton_010.php.expectf index 4b87a33d2..48dc93bfb 100644 --- a/hphp/test/zend/bad/tests-classes/factory_and_singleton_010.php.expectf +++ b/hphp/test/zend/bad/tests-classes/factory_and_singleton_010.php.expectf @@ -1,2 +1,2 @@ ===DONE=== -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/final_ctor1.php.expectf b/hphp/test/zend/bad/tests-classes/final_ctor1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/final_ctor1.php.expectf +++ b/hphp/test/zend/bad/tests-classes/final_ctor1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/final_ctor2.php.expectf b/hphp/test/zend/bad/tests-classes/final_ctor2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/final_ctor2.php.expectf +++ b/hphp/test/zend/bad/tests-classes/final_ctor2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php b/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php index daeae5e63..042749b64 100644 --- a/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php +++ b/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php @@ -17,7 +17,7 @@ foreach($c as $name => $value) { echo "\n --> Attempting implicit conversion to object using increment...\n"; $c->$name->prop++; $c->$name = $value; // reset value in case implicit conversion was successful - + echo "\n --> Attempting implicit conversion to object using assignment...\n"; $c->$name->prop = "Implicit instantiation!"; $c->$name = $value; // reset value in case implicit conversion was successful diff --git a/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php.expectf b/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php.expectf index bec4c617c..d02205425 100644 --- a/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php.expectf +++ b/hphp/test/zend/bad/tests-classes/implicit_instantiation_001.php.expectf @@ -1,67 +1,73 @@ ---( $c->boolFalse )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s ---( $c->emptyString )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s ---( $c->null )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s ---( $c->boolTrue )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s ---( $c->nonEmptyString )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s ---( $c->intZero )--- --> Attempting implicit conversion to object using increment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using assignment... -HipHop Warning: %a +HipHop Warning: %s --> Attempting implicit conversion to object using combined assignment... -HipHop Warning: %a +HipHop Warning: %s diff --git a/hphp/test/zend/bad/tests-classes/interface_member.php.expectf b/hphp/test/zend/bad/tests-classes/interface_member.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/interface_member.php.expectf +++ b/hphp/test/zend/bad/tests-classes/interface_member.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/interfaces_003.php.expectf b/hphp/test/zend/bad/tests-classes/interfaces_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/interfaces_003.php.expectf +++ b/hphp/test/zend/bad/tests-classes/interfaces_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/iterators_005.php.expectf b/hphp/test/zend/bad/tests-classes/iterators_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/iterators_005.php.expectf +++ b/hphp/test/zend/bad/tests-classes/iterators_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/static_properties_003.php.expectf b/hphp/test/zend/bad/tests-classes/static_properties_003.php.expectf index 7484701c6..8162d81f7 100644 --- a/hphp/test/zend/bad/tests-classes/static_properties_003.php.expectf +++ b/hphp/test/zend/bad/tests-classes/static_properties_003.php.expectf @@ -4,7 +4,7 @@ bool(false) Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 11 Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 12 -HipHop Notice: %a +HipHop Notice: %s Strict Standards: Accessing static property C::$x as non static in hphp/test/zend/bad/tests-classes/static_properties_003.phpt on line 13 diff --git a/hphp/test/zend/bad/tests-classes/static_properties_003_error1.php.expectf b/hphp/test/zend/bad/tests-classes/static_properties_003_error1.php.expectf index 616fee61d..d0778d368 100644 --- a/hphp/test/zend/bad/tests-classes/static_properties_003_error1.php.expectf +++ b/hphp/test/zend/bad/tests-classes/static_properties_003_error1.php.expectf @@ -1,2 +1,2 @@ --> Access non-visible static prop like instance prop: -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/static_properties_003_error2.php.expectf b/hphp/test/zend/bad/tests-classes/static_properties_003_error2.php.expectf index 616fee61d..d0778d368 100644 --- a/hphp/test/zend/bad/tests-classes/static_properties_003_error2.php.expectf +++ b/hphp/test/zend/bad/tests-classes/static_properties_003_error2.php.expectf @@ -1,2 +1,2 @@ --> Access non-visible static prop like instance prop: -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/static_properties_003_error3.php.expectf b/hphp/test/zend/bad/tests-classes/static_properties_003_error3.php.expectf index 616fee61d..d0778d368 100644 --- a/hphp/test/zend/bad/tests-classes/static_properties_003_error3.php.expectf +++ b/hphp/test/zend/bad/tests-classes/static_properties_003_error3.php.expectf @@ -1,2 +1,2 @@ --> Access non-visible static prop like instance prop: -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/static_properties_003_error4.php.expectf b/hphp/test/zend/bad/tests-classes/static_properties_003_error4.php.expectf index 616fee61d..d0778d368 100644 --- a/hphp/test/zend/bad/tests-classes/static_properties_003_error4.php.expectf +++ b/hphp/test/zend/bad/tests-classes/static_properties_003_error4.php.expectf @@ -1,2 +1,2 @@ --> Access non-visible static prop like instance prop: -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/tostring_003.php.expectf b/hphp/test/zend/bad/tests-classes/tostring_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-classes/tostring_003.php.expectf +++ b/hphp/test/zend/bad/tests-classes/tostring_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/045.php.expectf b/hphp/test/zend/bad/tests-lang/045.php.expectf index d14a7e173..a2473a508 100644 --- a/hphp/test/zend/bad/tests-lang/045.php.expectf +++ b/hphp/test/zend/bad/tests-lang/045.php.expectf @@ -1,2 +1,2 @@ -HipHop Fatal error: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/bug24403.php.expectf b/hphp/test/zend/bad/tests-lang/bug24403.php.expectf index e69de29bb..56ef0b3f2 100644 --- a/hphp/test/zend/bad/tests-lang/bug24403.php.expectf +++ b/hphp/test/zend/bad/tests-lang/bug24403.php.expectf @@ -0,0 +1 @@ +Deprecated: preg_replace(): The /e modifier is deprecated, use preg_replace_callback instead in hphp/test/zend/bad/tests-lang/bug24403.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/bug25145.php b/hphp/test/zend/bad/tests-lang/bug25145.php index 27f2d7689..11e4784a2 100644 --- a/hphp/test/zend/bad/tests-lang/bug25145.php +++ b/hphp/test/zend/bad/tests-lang/bug25145.php @@ -1,5 +1,6 @@ p=f(): -HipHop Warning: %a +HipHop Warning: %s good $i->p->q=f(): -HipHop Warning: %a +HipHop Warning: %s good $i->p[0]=f(): good $i->p[0]->p=f(): -HipHop Warning: %a +HipHop Warning: %s good C::$p=f(): good C::$p[0]=f(): good diff --git a/hphp/test/zend/bad/tests-lang/foreachLoop.003.php.expectf b/hphp/test/zend/bad/tests-lang/foreachLoop.003.php.expectf index 04df1c9c7..55c510585 100644 --- a/hphp/test/zend/bad/tests-lang/foreachLoop.003.php.expectf +++ b/hphp/test/zend/bad/tests-lang/foreachLoop.003.php.expectf @@ -1,7 +1,7 @@ Not an array. -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 done. \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/foreachLoop.011.php.expectf b/hphp/test/zend/bad/tests-lang/foreachLoop.011.php.expectf index 27a24d1aa..2d6251b0c 100644 --- a/hphp/test/zend/bad/tests-lang/foreachLoop.011.php.expectf +++ b/hphp/test/zend/bad/tests-lang/foreachLoop.011.php.expectf @@ -1,7 +1,7 @@ Change from array to non iterable: int(1) -HipHop Warning: %a +HipHop Warning: %s Change from object to non iterable: int(1) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/foreachLoop.016.php.expectf b/hphp/test/zend/bad/tests-lang/foreachLoop.016.php.expectf index c28cf8945..bbfa37bfb 100644 --- a/hphp/test/zend/bad/tests-lang/foreachLoop.016.php.expectf +++ b/hphp/test/zend/bad/tests-lang/foreachLoop.016.php.expectf @@ -29,14 +29,14 @@ array(1) { } $a->b -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> string(8) "original" } $a->b->c -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> string(8) "original" @@ -55,7 +55,7 @@ array(1) { } $a->b[0]->c -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> string(8) "original" @@ -74,7 +74,7 @@ array(1) { } C::$a[0]->b -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> string(8) "original" diff --git a/hphp/test/zend/bad/tests-lang/foreachLoopObjects.004.php.expectf b/hphp/test/zend/bad/tests-lang/foreachLoopObjects.004.php.expectf index 538bda81d..642496a58 100644 --- a/hphp/test/zend/bad/tests-lang/foreachLoopObjects.004.php.expectf +++ b/hphp/test/zend/bad/tests-lang/foreachLoopObjects.004.php.expectf @@ -1,11 +1,11 @@ Removing the current element from an iterated object. string(10) "Original a" string(10) "Original b" -HipHop Notice: %a +HipHop Notice: %s string(10) "Original c" -HipHop Notice: %a +HipHop Notice: %s string(10) "Original d" -HipHop Notice: %a +HipHop Notice: %s string(10) "Original e" object(C)#%d (4) { ["a"]=> diff --git a/hphp/test/zend/bad/tests-lang/func_get_arg.004.php.expectf b/hphp/test/zend/bad/tests-lang/func_get_arg.004.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/tests-lang/func_get_arg.004.php.expectf +++ b/hphp/test/zend/bad/tests-lang/func_get_arg.004.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/func_get_arg_variation.php.expectf b/hphp/test/zend/bad/tests-lang/func_get_arg_variation.php.expectf index 68060b92a..9fbf6d725 100644 --- a/hphp/test/zend/bad/tests-lang/func_get_arg_variation.php.expectf +++ b/hphp/test/zend/bad/tests-lang/func_get_arg_variation.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/passByReference_003.php.expectf b/hphp/test/zend/bad/tests-lang/passByReference_003.php.expectf index 030fa377e..d391e33ca 100644 --- a/hphp/test/zend/bad/tests-lang/passByReference_003.php.expectf +++ b/hphp/test/zend/bad/tests-lang/passByReference_003.php.expectf @@ -1,11 +1,11 @@ Passing undefined by value -HipHop Notice: %a +HipHop Notice: %s Inside passbyVal call: NULL After call -HipHop Notice: %a +HipHop Notice: %s NULL Passing undefined by reference diff --git a/hphp/test/zend/bad/tests-lang/passByReference_005.php.expectf b/hphp/test/zend/bad/tests-lang/passByReference_005.php.expectf index 82c332ffe..33a0a2fc1 100644 --- a/hphp/test/zend/bad/tests-lang/passByReference_005.php.expectf +++ b/hphp/test/zend/bad/tests-lang/passByReference_005.php.expectf @@ -1,20 +1,20 @@ ---- Pass by ref / pass by val: functions ---- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(11) "Ref changed" NULL string(12) "Ref1 changed" @@ -22,32 +22,32 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: static method calls ---- -HipHop Notice: %a +HipHop Notice: %s Strict Standards: Non-static method C::v() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 95 Strict Standards: Non-static method C::r() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 96 -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s Strict Standards: Non-static method C::vv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 100 -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL NULL -HipHop Notice: %a +HipHop Notice: %s Strict Standards: Non-static method C::vr() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 104 -HipHop Notice: %a +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a +HipHop Notice: %s Strict Standards: Non-static method C::rv() should not be called statically in hphp/test/zend/bad/tests-lang/passByReference_005.phpt on line 108 -HipHop Notice: %a +HipHop Notice: %s string(11) "Ref changed" NULL @@ -57,26 +57,26 @@ string(12) "Ref2 changed" ---- Pass by ref / pass by val: instance method calls ---- -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL string(11) "Ref changed" -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(11) "Ref changed" NULL string(12) "Ref1 changed" diff --git a/hphp/test/zend/bad/tests-lang/returnByReference.003.php.expectf b/hphp/test/zend/bad/tests-lang/returnByReference.003.php.expectf index 721a626a0..be0ac28b6 100644 --- a/hphp/test/zend/bad/tests-lang/returnByReference.003.php.expectf +++ b/hphp/test/zend/bad/tests-lang/returnByReference.003.php.expectf @@ -5,7 +5,7 @@ int(5) int(100) ---> 2. Trying to assign by reference the return value of a function that returns a constant by ref: -HipHop Notice: %a +HipHop Notice: %s int(5) int(100) diff --git a/hphp/test/zend/bad/tests-lang/returnByReference.004.php.expectf b/hphp/test/zend/bad/tests-lang/returnByReference.004.php.expectf index 70306615e..ed4619eda 100644 --- a/hphp/test/zend/bad/tests-lang/returnByReference.004.php.expectf +++ b/hphp/test/zend/bad/tests-lang/returnByReference.004.php.expectf @@ -5,7 +5,7 @@ int(5) int(100) ---> 2. Trying to assign by reference the return value of a function that returns a constant by ref: -HipHop Notice: %a +HipHop Notice: %s int(5) int(100) diff --git a/hphp/test/zend/bad/tests-lang/returnByReference.005.php.expectf b/hphp/test/zend/bad/tests-lang/returnByReference.005.php.expectf index 2895c9e81..472f2a11b 100644 --- a/hphp/test/zend/bad/tests-lang/returnByReference.005.php.expectf +++ b/hphp/test/zend/bad/tests-lang/returnByReference.005.php.expectf @@ -5,7 +5,7 @@ int(5) int(100) ---> 2. Trying to assign by reference the return value of a function that returns a constant by ref: -HipHop Notice: %a +HipHop Notice: %s int(5) int(100) diff --git a/hphp/test/zend/bad/tests-lang/returnByReference.009.php.expectf b/hphp/test/zend/bad/tests-lang/returnByReference.009.php.expectf index 85be7adf3..f4383dbf6 100644 --- a/hphp/test/zend/bad/tests-lang/returnByReference.009.php.expectf +++ b/hphp/test/zend/bad/tests-lang/returnByReference.009.php.expectf @@ -1,6 +1,6 @@ ---> 1. Return a variable by reference -> No warning: int(1) ----> 2. Return a value by reference -> HipHop Warning: %a -HipHop Notice: %a +---> 2. Return a value by reference -> HipHop Warning: %s +HipHop Notice: %s int(1) \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/bug46897.php.expectf b/hphp/test/zend/bad/tests-output/bug46897.php.expectf index 3a0de0f5b..5040b12c9 100644 --- a/hphp/test/zend/bad/tests-output/bug46897.php.expectf +++ b/hphp/test/zend/bad/tests-output/bug46897.php.expectf @@ -1,8 +1,8 @@ [callback:1]Attempt to flush unerasable buffer - should fail... -HipHop Notice: %a +HipHop Notice: %s bool(false) string(%d) "Attempt to flush unerasable buffer - should fail... -HipHop Notice: %a +HipHop Notice: %s bool(false) " Done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_010.php.expectf b/hphp/test/zend/bad/tests-output/ob_010.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-output/ob_010.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_010.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_011.php.expectf b/hphp/test/zend/bad/tests-output/ob_011.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-output/ob_011.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_011.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_clean_basic_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_clean_basic_001.php.expectf index db989ad7b..bba846ca1 100644 --- a/hphp/test/zend/bad/tests-output/ob_clean_basic_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_clean_basic_001.php.expectf @@ -1,7 +1,7 @@ *** Testing ob_clean() : basic functionality *** -- Testing ob_clean() function with Zero arguments -- -HipHop Notice: %a +HipHop Notice: %s bool(false) string(61) "bool(true) Ensure the buffer is still active after the clean." diff --git a/hphp/test/zend/bad/tests-output/ob_end_clean_basic_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_end_clean_basic_001.php.expectf index 9e0122595..f497812e2 100644 --- a/hphp/test/zend/bad/tests-output/ob_end_clean_basic_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_end_clean_basic_001.php.expectf @@ -1,6 +1,6 @@ -HipHop Notice: %a +HipHop Notice: %s bool(false) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_end_clean_error_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_end_clean_error_001.php.expectf index 06a142bcf..7e5c196c5 100644 --- a/hphp/test/zend/bad/tests-output/ob_end_clean_error_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_end_clean_error_001.php.expectf @@ -1,3 +1,3 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_end_flush_basic_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_end_flush_basic_001.php.expectf index 92b511d87..6a17fff32 100644 --- a/hphp/test/zend/bad/tests-output/ob_end_flush_basic_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_end_flush_basic_001.php.expectf @@ -1,11 +1,11 @@ *** Testing ob_end_flush() : basic functionality *** -- Testing ob_end_flush() function with Zero arguments -- -HipHop Notice: %a +HipHop Notice: %s bool(false) bool(true) Hello bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_flush_basic_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_flush_basic_001.php.expectf index d4b2fbff1..198627177 100644 --- a/hphp/test/zend/bad/tests-output/ob_flush_basic_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_flush_basic_001.php.expectf @@ -1,7 +1,7 @@ *** Testing ob_flush() : basic functionality *** -- Testing ob_flush() function with Zero arguments -- -HipHop Notice: %a +HipHop Notice: %s bool(false) This should get flushed. bool(true) diff --git a/hphp/test/zend/bad/tests-output/ob_get_clean_error_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_get_clean_error_001.php.expectf index 06a142bcf..7e5c196c5 100644 --- a/hphp/test/zend/bad/tests-output/ob_get_clean_error_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_get_clean_error_001.php.expectf @@ -1,3 +1,3 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_get_length_error_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_get_length_error_001.php.expectf index 06a142bcf..7e5c196c5 100644 --- a/hphp/test/zend/bad/tests-output/ob_get_length_error_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_get_length_error_001.php.expectf @@ -1,3 +1,3 @@ Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_get_level_basic_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_get_level_basic_001.php.expectf index 2a67737f9..ea58b3105 100644 --- a/hphp/test/zend/bad/tests-output/ob_get_level_basic_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_get_level_basic_001.php.expectf @@ -6,6 +6,6 @@ int(1) int(2) int(1) int(0) -HipHop Notice: %a +HipHop Notice: %s int(0) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_005.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_005.php.expectf index 506ace654..115b128e4 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_005.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_005.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(true) Array ( diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_006.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_006.php.expectf index 30604022d..a3560d728 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_006.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_006.php.expectf @@ -1,30 +1,30 @@ ---> Test arrays: -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( ) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( ) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( ) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( ) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( @@ -41,8 +41,8 @@ Array [0] => C::h ) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) Array ( diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_002.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_002.php.expectf index 9bc194d01..f83796090 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_002.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_002.php.expectf @@ -1,9 +1,9 @@ [callback:1]All of the following calls will fail to clean/remove the topmost buffer: -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) The OB nesting will still be 1 level deep: int(1) \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_003.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_003.php.expectf index acec4210a..804d54120 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_003.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_003.php.expectf @@ -1,4 +1,4 @@ [callback:1]This call will obtain the content, but will not clean the buffer. -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(65) "This call will obtain the content, but will not clean the buffer." \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_004.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_004.php.expectf index 11a2b1461..939bb487c 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_004.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_004.php.expectf @@ -1,4 +1,4 @@ [callback:1]This call will obtain the content, but will not flush the buffer. -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s string(65) "This call will obtain the content, but will not flush the buffer." \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_005.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_005.php.expectf index 4d2bc38c1..2e06ae8e1 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_005.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_basic_unerasable_005.php.expectf @@ -1,7 +1,7 @@ [callback:1]Attempt to flush unerasable buffer - should fail... -HipHop Notice: %a +HipHop Notice: %s bool(false) string(%d) "Attempt to flush unerasable buffer - should fail... -HipHop Notice: %a +HipHop Notice: %s bool(false) " \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_error_001.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_error_001.php.expectf index ff628c057..5737c7f5a 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_error_001.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_error_001.php.expectf @@ -1,16 +1,16 @@ - Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL - Arg 1 wrong type -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) - Arg 2 wrong type -HipHop Warning: %a +HipHop Warning: %s NULL - Arg 3 wrong type -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_error_002.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_error_002.php.expectf index f862683ac..164589d81 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_error_002.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_error_002.php.expectf @@ -1,13 +1,13 @@ -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_error_003.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_error_003.php.expectf index 1c5e44f11..2ac458f38 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_error_003.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_error_003.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_error_004.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_error_004.php.expectf index 1c5e44f11..2ac458f38 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_error_004.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_error_004.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s bool(false) done \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-output/ob_start_error_005.php.expectf b/hphp/test/zend/bad/tests-output/ob_start_error_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/tests-output/ob_start_error_005.php.expectf +++ b/hphp/test/zend/bad/tests-output/ob_start_error_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-security/open_basedir_linkinfo.php.expectf b/hphp/test/zend/bad/tests-security/open_basedir_linkinfo.php.expectf index 82977e126..078d96c86 100644 --- a/hphp/test/zend/bad/tests-security/open_basedir_linkinfo.php.expectf +++ b/hphp/test/zend/bad/tests-security/open_basedir_linkinfo.php.expectf @@ -9,7 +9,7 @@ int(%d) int(%d) int(%d) int(%d) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(%d) bool(true) diff --git a/hphp/test/zend/bad/tests-security/open_basedir_readlink.php.expectf b/hphp/test/zend/bad/tests-security/open_basedir_readlink.php.expectf index 733e0957b..4912f1c3e 100644 --- a/hphp/test/zend/bad/tests-security/open_basedir_readlink.php.expectf +++ b/hphp/test/zend/bad/tests-security/open_basedir_readlink.php.expectf @@ -4,18 +4,18 @@ bool(true) bool(true) bool(true) bool(true) -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Finished testing open_basedir configuration [readlink] *** \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php b/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php new file mode 100644 index 000000000..270e0c10d --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php.expectf b/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php.expectf new file mode 100644 index 000000000..a8a08dc56 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.php.expectf @@ -0,0 +1,5 @@ +HipHop Fatal error: %s +Stack trace: +#0 %s(%d): unknown() +#1 {main} + thrown in hphp/test/zend/bad/zend-generators-errors/non_ref_generator_iterated_by_ref_error.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php b/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php new file mode 100644 index 000000000..b0ba22149 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php.expectf b/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php.expectf new file mode 100644 index 000000000..21093ec93 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/serialize_unserialize_error.php.expectf @@ -0,0 +1,15 @@ +exception 'Exception' with message 'Serialization of 'Generator' is not allowed' in %s:%d +Stack trace: +#0 %s(%d): serialize(Object(Generator)) +#1 {main} + +exception 'Exception' with message 'Unserialization of 'Generator' is not allowed' in %s:%d +Stack trace: +#0 [internal function]: Generator->__wakeup() +#1 %s(%d): unserialize('O:9:"Generator"...') +#2 {main} + +exception 'Exception' with message 'Unserialization of 'Generator' is not allowed' in %s:%d +Stack trace: +#0 %s(%d): unserialize('C:9:"Generator"...') +#1 {main} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php b/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php new file mode 100644 index 000000000..a416121ec --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php @@ -0,0 +1,10 @@ +current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php.expectf b/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php.expectf new file mode 100644 index 000000000..3de717aa9 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_const_by_ref_error.php.expectf @@ -0,0 +1,2 @@ +HipHop Notice: %s +string(3) "foo" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php b/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php new file mode 100644 index 000000000..b1726c1e4 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php @@ -0,0 +1,21 @@ +rewind(); +unset($gen); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php.expectf b/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php.expectf new file mode 100644 index 000000000..8821ffd49 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_in_force_closed_finally_error.php.expectf @@ -0,0 +1,3 @@ +before yield +before yield in finally +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php b/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php new file mode 100644 index 000000000..a560397de --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php @@ -0,0 +1,14 @@ +current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php.expectf b/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php.expectf new file mode 100644 index 000000000..d2d6a9966 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-errors/yield_non_ref_function_call_by_ref_error.php.expectf @@ -0,0 +1,2 @@ +HipHop Notice: %s +string(3) "bar" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php b/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php new file mode 100644 index 000000000..1380e4e83 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php @@ -0,0 +1,23 @@ +rewind(); +unset($gen); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php.expectf b/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php.expectf new file mode 100644 index 000000000..2e40cbd5f --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/finally_ran_on_close.php.expectf @@ -0,0 +1,3 @@ +before yield +finally run +second finally run \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/return_return.php b/hphp/test/zend/bad/zend-generators-finally/return_return.php new file mode 100644 index 000000000..6bbe911cb --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/return_return.php @@ -0,0 +1,26 @@ +rewind(); // force run + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/return_return.php.expectf b/hphp/test/zend/bad/zend-generators-finally/return_return.php.expectf new file mode 100644 index 000000000..64cb5f42b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/return_return.php.expectf @@ -0,0 +1,3 @@ +before return +before return in inner finally +outer finally run \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/return_yield.php b/hphp/test/zend/bad/zend-generators-finally/return_yield.php new file mode 100644 index 000000000..70c8d3f04 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/return_yield.php @@ -0,0 +1,13 @@ +rewind(); + +set_error_handler(function() use($gen) {}); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/run_on_dtor.php.expectf b/hphp/test/zend/bad/zend-generators-finally/run_on_dtor.php.expectf new file mode 100644 index 000000000..82beeb215 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/run_on_dtor.php.expectf @@ -0,0 +1,2 @@ +array(0) { +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators-finally/throw_yield.php b/hphp/test/zend/bad/zend-generators-finally/throw_yield.php new file mode 100644 index 000000000..53da33e2a --- /dev/null +++ b/hphp/test/zend/bad/zend-generators-finally/throw_yield.php @@ -0,0 +1,13 @@ + 'rab'; + yield 'oof'; +} + +foreach (gen() as $k => $v) { + echo $k, ' => ', $v, "\n"; +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php.expectf b/hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php.expectf new file mode 100644 index 000000000..33f0c0665 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/auto_incrementing_keys.php.expectf @@ -0,0 +1,4 @@ +0 => foo +1 => bar +5 => rab +6 => oof \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/backtrace.php b/hphp/test/zend/bad/zend-generators/backtrace.php new file mode 100644 index 000000000..3064fa674 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/backtrace.php @@ -0,0 +1,19 @@ +rewind(); // trigger run +} + +$gen = f2('foo', 'bar'); +f3($gen); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/backtrace.php.expectf b/hphp/test/zend/bad/zend-generators/backtrace.php.expectf new file mode 100644 index 000000000..18f1e4cf1 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/backtrace.php.expectf @@ -0,0 +1,4 @@ +#0 f1() called at [%s:%d] +#1 f2(foo, bar) +#2 Generator->rewind() called at [%s:%d] +#3 f3(Generator Object ()) called at [%s:%d] \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/func_get_args.php b/hphp/test/zend/bad/zend-generators/func_get_args.php new file mode 100644 index 000000000..5b685b60b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/func_get_args.php @@ -0,0 +1,11 @@ +rewind(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/func_get_args.php.expectf b/hphp/test/zend/bad/zend-generators/func_get_args.php.expectf new file mode 100644 index 000000000..634c80966 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/func_get_args.php.expectf @@ -0,0 +1,6 @@ +array(2) { + [0]=> + string(3) "foo" + [1]=> + string(3) "bar" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php b/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php new file mode 100644 index 000000000..eb51469f6 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php @@ -0,0 +1,14 @@ +getGenFactory(); +var_dump($genFactory()->current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php.expectf b/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php.expectf new file mode 100644 index 000000000..f1260cb13 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_closure_with_this.php.expectf @@ -0,0 +1,2 @@ +object(Test)#1 (0) { +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php b/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php new file mode 100644 index 000000000..2b245dd87 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php @@ -0,0 +1,21 @@ +attachIterator(gen1()); +$it->attachIterator(gen2()); + +foreach ($it as $values) { + var_dump($values); +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php.expectf b/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php.expectf new file mode 100644 index 000000000..06b90a281 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_in_multipleiterator.php.expectf @@ -0,0 +1,12 @@ +array(2) { + [0]=> + string(1) "a" + [1]=> + string(1) "b" +} +array(2) { + [0]=> + string(2) "aa" + [1]=> + string(2) "bb" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php b/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php new file mode 100644 index 000000000..145f1f79a --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php @@ -0,0 +1,28 @@ +data = $data; + } + + public function getData() { + return $this->data; + } + + public function &getIterator() { + foreach ($this->data as $key => &$value) { + yield $key => $value; + } + } +} + +$test = new Test([1, 2, 3, 4, 5]); +foreach ($test as &$value) { + $value *= -1; +} + +var_dump($test->getData()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php.expectf b/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php.expectf new file mode 100644 index 000000000..719d30cc8 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_method_by_ref.php.expectf @@ -0,0 +1,12 @@ +array(5) { + [0]=> + int(-1) + [1]=> + int(-2) + [2]=> + int(-3) + [3]=> + int(-4) + [4]=> + &int(-5) +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_returns_generator.php b/hphp/test/zend/bad/zend-generators/generator_returns_generator.php new file mode 100644 index 000000000..e535cb0ae --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_returns_generator.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_returns_generator.php.expectf b/hphp/test/zend/bad/zend-generators/generator_returns_generator.php.expectf new file mode 100644 index 000000000..254d25151 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_returns_generator.php.expectf @@ -0,0 +1 @@ +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_rewind.php b/hphp/test/zend/bad/zend-generators/generator_rewind.php new file mode 100644 index 000000000..b897adc09 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_rewind.php @@ -0,0 +1,44 @@ +rewind(); +$gen->rewind(); +$gen->next(); + +try { + $gen->rewind(); +} catch (Exception $e) { + echo "\n", $e, "\n\n"; +} + +function &gen2() { + $foo = 'bar'; + yield $foo; + yield $foo; +} + +$gen = gen2(); +foreach ($gen as $v) { } +try { + foreach ($gen as $v) { } +} catch (Exception $e) { + echo $e, "\n\n"; +} + +function gen3() { + echo "in generator\n"; + + if (false) yield; +} + +$gen = gen3(); +$gen->rewind(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_rewind.php.expectf b/hphp/test/zend/bad/zend-generators/generator_rewind.php.expectf new file mode 100644 index 000000000..8821f979c --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_rewind.php.expectf @@ -0,0 +1,14 @@ +before yield +after yield + +exception 'Exception' with message 'Cannot rewind a generator that was already run' in %s:%d +Stack trace: +#0 %s(%d): Generator->rewind() +#1 {main} + +exception 'Exception' with message 'Cannot traverse an already closed generator' in %s:%d +Stack trace: +#0 %s(%d): unknown() +#1 {main} + +in generator \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_send.php b/hphp/test/zend/bad/zend-generators/generator_send.php new file mode 100644 index 000000000..56599e016 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_send.php @@ -0,0 +1,14 @@ +current()); +$gen->send("send bar"); +var_dump($gen->current()); +$gen->send("send foo"); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_send.php.expectf b/hphp/test/zend/bad/zend-generators/generator_send.php.expectf new file mode 100644 index 000000000..2944d0559 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_send.php.expectf @@ -0,0 +1,4 @@ +string(9) "yield foo" +string(8) "send bar" +string(9) "yield bar" +string(8) "send foo" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php b/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php new file mode 100644 index 000000000..978b9513f --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php @@ -0,0 +1,25 @@ +current()); + +try { + $gen->next(); +} catch (Exception $e) { + echo 'Caught exception with message "', $e->getMessage(), '"', "\n"; +} + +var_dump($gen->current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php.expectf b/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php.expectf new file mode 100644 index 000000000..56cf61413 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_during_function_call.php.expectf @@ -0,0 +1,3 @@ +string(3) "foo" +Caught exception with message "test" +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php b/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php new file mode 100644 index 000000000..997a2e63e --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php @@ -0,0 +1,21 @@ +current()); + +try { + $gen->next(); +} catch (Exception $e) { + echo 'Caught exception with message "', $e->getMessage(), '"', "\n"; +} + +var_dump($gen->current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php.expectf b/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php.expectf new file mode 100644 index 000000000..56cf61413 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_exception.php.expectf @@ -0,0 +1,3 @@ +string(3) "foo" +Caught exception with message "test" +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php b/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php new file mode 100644 index 000000000..c4ff5b245 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php.expectf b/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php.expectf new file mode 100644 index 000000000..02af946a5 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.php.expectf @@ -0,0 +1,5 @@ +HipHop Fatal error: %s +Stack trace: +#0 %s(%d): gen() +#1 {main} + thrown in hphp/test/zend/bad/zend-generators/generator_throwing_in_foreach.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_with_keys.php b/hphp/test/zend/bad/zend-generators/generator_with_keys.php new file mode 100644 index 000000000..44683f4c9 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_with_keys.php @@ -0,0 +1,20 @@ + current($array); + prev($array); + } +} + +$array = [ + 'foo' => 'bar', + 'bar' => 'foo', +]; + +foreach (reverse($array) as $key => $value) { + echo $key, ' => ', $value, "\n"; +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_with_keys.php.expectf b/hphp/test/zend/bad/zend-generators/generator_with_keys.php.expectf new file mode 100644 index 000000000..1970c1700 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_with_keys.php.expectf @@ -0,0 +1,2 @@ +bar => foo +foo => bar \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php b/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php new file mode 100644 index 000000000..b1dcdd6b8 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php @@ -0,0 +1,16 @@ + [4, 5, 6]; + yield (object) ['a' => 'b'] => (object) ['b' => 'a']; + yield 3.14 => 2.73; + yield false => true; + yield true => false; + yield null => null; +} + +foreach (gen() as $k => $v) { + var_dump($k, $v); +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php.expectf b/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php.expectf new file mode 100644 index 000000000..3577dd8d5 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/generator_with_nonscalar_keys.php.expectf @@ -0,0 +1,32 @@ +array(3) { + [0]=> + int(1) + [1]=> + int(2) + [2]=> + int(3) +} +array(3) { + [0]=> + int(4) + [1]=> + int(5) + [2]=> + int(6) +} +object(stdClass)#3 (1) { + ["a"]=> + string(1) "b" +} +object(stdClass)#4 (1) { + ["b"]=> + string(1) "a" +} +float(3.14) +float(2.73) +bool(false) +bool(true) +bool(true) +bool(false) +NULL +NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/ignored_send_leak.php b/hphp/test/zend/bad/zend-generators/ignored_send_leak.php new file mode 100644 index 000000000..e81526947 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/ignored_send_leak.php @@ -0,0 +1,12 @@ +send(NULL); + +echo "DONE"; + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-spl/bug46160.php.expectf b/hphp/test/zend/bad/zend-generators/ignored_send_leak.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-spl/bug46160.php.expectf rename to hphp/test/zend/bad/zend-generators/ignored_send_leak.php.expectf diff --git a/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php b/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php new file mode 100644 index 000000000..4f68e720b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php @@ -0,0 +1,25 @@ +rewind(); +} + +function function_with_4_args() { + function_with_3_args(4, 5, 6); +} + +function outerGen() { + function_with_4_args(0, 1, 2, 3); + yield; // force generator +} + +$outerGen = outerGen(); +$outerGen->rewind(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php.expectf b/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php.expectf new file mode 100644 index 000000000..8318c86b3 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/nested_calls_with_die.php.expectf @@ -0,0 +1 @@ +Test \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/nested_method_calls.php b/hphp/test/zend/bad/zend-generators/nested_method_calls.php new file mode 100644 index 000000000..5563eda1b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/nested_method_calls.php @@ -0,0 +1,28 @@ +foo($obj->foo(yield)); +} + +$g1 = gen(new A); +$g1->current(); + +$g2 = gen(new B); +$g2->current(); + +$g1->next(); +$g2->next(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/nested_method_calls.php.expectf b/hphp/test/zend/bad/zend-generators/nested_method_calls.php.expectf new file mode 100644 index 000000000..54fcb6017 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/nested_method_calls.php.expectf @@ -0,0 +1,4 @@ +Called A::foo +Called A::foo +Called B::foo +Called B::foo \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php b/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php new file mode 100644 index 000000000..3c4d60235 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php @@ -0,0 +1,14 @@ +current()); + +// generator is closed here, without running SWITCH_FREE + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php.expectf b/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php.expectf new file mode 100644 index 000000000..2c9726ef4 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/no_foreach_var_leaks.php.expectf @@ -0,0 +1 @@ +string(3) "Foo" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/send_after_close.php b/hphp/test/zend/bad/zend-generators/send_after_close.php new file mode 100644 index 000000000..e01d00ad8 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/send_after_close.php @@ -0,0 +1,9 @@ +send('foo'); +$gen->send('bar'); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/send_after_close.php.expectf b/hphp/test/zend/bad/zend-generators/send_after_close.php.expectf new file mode 100644 index 000000000..f64a23f41 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/send_after_close.php.expectf @@ -0,0 +1 @@ +string(3) "foo" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/send_returns_current.php b/hphp/test/zend/bad/zend-generators/send_returns_current.php new file mode 100644 index 000000000..b6755aa52 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/send_returns_current.php @@ -0,0 +1,14 @@ +send('foo')); +var_dump($gen->send('bar')); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/send_returns_current.php.expectf b/hphp/test/zend/bad/zend-generators/send_returns_current.php.expectf new file mode 100644 index 000000000..74def7a27 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/send_returns_current.php.expectf @@ -0,0 +1,2 @@ +string(3) "oof" +string(3) "rab" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_already_closed.php b/hphp/test/zend/bad/zend-generators/throw_already_closed.php new file mode 100644 index 000000000..27587e66b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_already_closed.php @@ -0,0 +1,13 @@ +next(); +$gen->next(); +var_dump($gen->valid()); +$gen->throw(new Exception('test')); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_already_closed.php.expectf b/hphp/test/zend/bad/zend-generators/throw_already_closed.php.expectf new file mode 100644 index 000000000..c9c38ee82 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_already_closed.php.expectf @@ -0,0 +1,5 @@ +bool(false) +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in hphp/test/zend/bad/zend-generators/throw_already_closed.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_caught.php b/hphp/test/zend/bad/zend-generators/throw_caught.php new file mode 100644 index 000000000..1e841d6a3 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_caught.php @@ -0,0 +1,16 @@ +throw(new RuntimeException('Test'))); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_caught.php.expectf b/hphp/test/zend/bad/zend-generators/throw_caught.php.expectf new file mode 100644 index 000000000..9e49a91b4 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_caught.php.expectf @@ -0,0 +1,5 @@ +exception 'RuntimeException' with message 'Test' in %s:%d +Stack trace: +#0 {main} + +string(6) "result" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_rethrow.php b/hphp/test/zend/bad/zend-generators/throw_rethrow.php new file mode 100644 index 000000000..cbd1d6d82 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_rethrow.php @@ -0,0 +1,16 @@ +throw(new RuntimeException('throw'))); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_rethrow.php.expectf b/hphp/test/zend/bad/zend-generators/throw_rethrow.php.expectf new file mode 100644 index 000000000..229ce420d --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_rethrow.php.expectf @@ -0,0 +1,10 @@ +Caught: exception 'RuntimeException' with message 'throw' in %s:%d +Stack trace: +#0 {main} + +HipHop Fatal error: %s +Stack trace: +#0 [internal function]: gen() +#1 %s(%d): Generator->throw(Object(RuntimeException)) +#2 {main} + thrown in hphp/test/zend/bad/zend-generators/throw_rethrow.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_uncaught.php b/hphp/test/zend/bad/zend-generators/throw_uncaught.php new file mode 100644 index 000000000..f9e8733fa --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_uncaught.php @@ -0,0 +1,11 @@ +throw(new RuntimeException('test'))); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/throw_uncaught.php.expectf b/hphp/test/zend/bad/zend-generators/throw_uncaught.php.expectf new file mode 100644 index 000000000..ab283c65d --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/throw_uncaught.php.expectf @@ -0,0 +1,4 @@ +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in hphp/test/zend/bad/zend-generators/throw_uncaught.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/unused_return_value.php b/hphp/test/zend/bad/zend-generators/unused_return_value.php new file mode 100644 index 000000000..31b20a0ab --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/unused_return_value.php @@ -0,0 +1,8 @@ + +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/unused_return_value.php.expectf b/hphp/test/zend/bad/zend-generators/unused_return_value.php.expectf new file mode 100644 index 000000000..922a780ce --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/unused_return_value.php.expectf @@ -0,0 +1 @@ +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_array_key.php b/hphp/test/zend/bad/zend-generators/yield_array_key.php new file mode 100644 index 000000000..cb25cac46 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_array_key.php @@ -0,0 +1,11 @@ + 1; +} + +$gen = gen(); +var_dump($gen->key()); +var_dump($gen->current()); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_array_key.php.expectf b/hphp/test/zend/bad/zend-generators/yield_array_key.php.expectf new file mode 100644 index 000000000..636f55fcf --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_array_key.php.expectf @@ -0,0 +1,3 @@ +array(0) { +} +int(1) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php b/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php new file mode 100644 index 000000000..8f640fde6 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php.expectf b/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php.expectf new file mode 100644 index 000000000..11b06ad28 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_array_offset_by_ref.php.expectf @@ -0,0 +1,8 @@ +array(3) { + [0]=> + &int(-1) + [1]=> + int(2) + [2]=> + int(3) +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_by_reference.php b/hphp/test/zend/bad/zend-generators/yield_by_reference.php new file mode 100644 index 000000000..f113713e7 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_by_reference.php @@ -0,0 +1,22 @@ + &$value) { + yield $key => $value; + } +} + +$array = [1, 2, 3]; +$iter = iter($array); +foreach ($iter as &$value) { + $value *= -1; +} +var_dump($array); + +$array = [1, 2, 3]; +foreach (iter($array) as &$value) { + $value *= -1; +} +var_dump($array); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_by_reference.php.expectf b/hphp/test/zend/bad/zend-generators/yield_by_reference.php.expectf new file mode 100644 index 000000000..ebdf89190 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_by_reference.php.expectf @@ -0,0 +1,16 @@ +array(3) { + [0]=> + int(-1) + [1]=> + int(-2) + [2]=> + &int(-3) +} +array(3) { + [0]=> + int(-1) + [1]=> + int(-2) + [2]=> + &int(-3) +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_during_function_call.php b/hphp/test/zend/bad/zend-generators/yield_during_function_call.php new file mode 100644 index 000000000..c61a207f1 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_during_function_call.php @@ -0,0 +1,10 @@ +send(10); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_during_function_call.php.expectf b/hphp/test/zend/bad/zend-generators/yield_during_function_call.php.expectf new file mode 100644 index 000000000..963ee7005 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_during_function_call.php.expectf @@ -0,0 +1 @@ +string(10) "xxxxxxxxxx" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_during_method_call.php b/hphp/test/zend/bad/zend-generators/yield_during_method_call.php new file mode 100644 index 000000000..92dc94bb3 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_during_method_call.php @@ -0,0 +1,22 @@ +b(yield); +} + +$gen = gen(); +$gen->send('foo'); + +// test resource cleanup +$gen = gen(); +$gen->rewind(); +unset($gen); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_during_method_call.php.expectf b/hphp/test/zend/bad/zend-generators/yield_during_method_call.php.expectf new file mode 100644 index 000000000..191028156 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_during_method_call.php.expectf @@ -0,0 +1 @@ +foo \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_in_finally.php b/hphp/test/zend/bad/zend-generators/yield_in_finally.php new file mode 100644 index 000000000..164953d40 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_in_finally.php @@ -0,0 +1,21 @@ +current()); +$gen->next(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_in_finally.php.expectf b/hphp/test/zend/bad/zend-generators/yield_in_finally.php.expectf new file mode 100644 index 000000000..f68103430 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_in_finally.php.expectf @@ -0,0 +1,4 @@ +before return +before yield +string(%d) "yielded value" +after yield \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php b/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php new file mode 100644 index 000000000..bc0f59f9b --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php @@ -0,0 +1,18 @@ +func(yield $foo); + new Foo(yield $foo); +} + +echo "Done"; + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php.expectf b/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php.expectf new file mode 100644 index 000000000..8ad96f878 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_in_parenthesis.php.expectf @@ -0,0 +1 @@ +Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php b/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php new file mode 100644 index 000000000..2821db358 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php.expectf b/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php.expectf new file mode 100644 index 000000000..6258c8a98 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_ref_function_call_by_reference.php.expectf @@ -0,0 +1 @@ +string(3) "bar" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_without_value.php b/hphp/test/zend/bad/zend-generators/yield_without_value.php new file mode 100644 index 000000000..7483e32c6 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_without_value.php @@ -0,0 +1,17 @@ +current()); +$receiver->send(1); +var_dump($receiver->current()); +$receiver->send(2); +var_dump($receiver->current()); +$receiver->send(3); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-generators/yield_without_value.php.expectf b/hphp/test/zend/bad/zend-generators/yield_without_value.php.expectf new file mode 100644 index 000000000..54a773699 --- /dev/null +++ b/hphp/test/zend/bad/zend-generators/yield_without_value.php.expectf @@ -0,0 +1,6 @@ +NULL +int(1) +NULL +int(2) +NULL +int(3) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits-bugs/abstract-methods05.php.expectf b/hphp/test/zend/bad/zend-traits-bugs/abstract-methods05.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits-bugs/abstract-methods05.php.expectf +++ b/hphp/test/zend/bad/zend-traits-bugs/abstract-methods05.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits-bugs/abstract-methods06.php.expectf b/hphp/test/zend/bad/zend-traits-bugs/abstract-methods06.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits-bugs/abstract-methods06.php.expectf +++ b/hphp/test/zend/bad/zend-traits-bugs/abstract-methods06.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits-bugs/interfaces.php.expectf b/hphp/test/zend/bad/zend-traits-bugs/interfaces.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits-bugs/interfaces.php.expectf +++ b/hphp/test/zend/bad/zend-traits-bugs/interfaces.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug55554b.php.expectf b/hphp/test/zend/bad/zend-traits/bug55554b.php.expectf index 64ab0d4f0..c5317dd7e 100644 --- a/hphp/test/zend/bad/zend-traits/bug55554b.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug55554b.php.expectf @@ -1,3 +1,3 @@ OverridingIsSilent1 __construct OverridingIsSilent2 OverridingIsSilent2 -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug55554d.php.expectf b/hphp/test/zend/bad/zend-traits/bug55554d.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/bug55554d.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug55554d.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug55554f.php.expectf b/hphp/test/zend/bad/zend-traits/bug55554f.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/bug55554f.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug55554f.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug55554g.php.expectf b/hphp/test/zend/bad/zend-traits/bug55554g.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/bug55554g.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug55554g.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug60217b.php.expectf b/hphp/test/zend/bad/zend-traits/bug60217b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/bug60217b.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug60217b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/bug60217c.php.expectf b/hphp/test/zend/bad/zend-traits/bug60217c.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/bug60217c.php.expectf +++ b/hphp/test/zend/bad/zend-traits/bug60217c.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/language008b.php.expectf b/hphp/test/zend/bad/zend-traits/language008b.php.expectf index 639044cf4..eb406e941 100644 --- a/hphp/test/zend/bad/zend-traits/language008b.php.expectf +++ b/hphp/test/zend/bad/zend-traits/language008b.php.expectf @@ -1,2 +1,2 @@ Hello World!Hello World! -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/language017.php.expectf b/hphp/test/zend/bad/zend-traits/language017.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/language017.php.expectf +++ b/hphp/test/zend/bad/zend-traits/language017.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/language019.php.expectf b/hphp/test/zend/bad/zend-traits/language019.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend-traits/language019.php.expectf +++ b/hphp/test/zend/bad/zend-traits/language019.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend-traits/property005.php.expectf b/hphp/test/zend/bad/zend-traits/property005.php.expectf index 424258e65..86a557fc9 100644 --- a/hphp/test/zend/bad/zend-traits/property005.php.expectf +++ b/hphp/test/zend/bad/zend-traits/property005.php.expectf @@ -2,4 +2,4 @@ PRE-CLASS-GUARD Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend-traits/property005.phpt on line %d POST-CLASS-GUARD -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/008.php.expectf b/hphp/test/zend/bad/zend/008.php.expectf index aa6dcabb2..f402247c0 100644 --- a/hphp/test/zend/bad/zend/008.php.expectf +++ b/hphp/test/zend/bad/zend/008.php.expectf @@ -1,20 +1,20 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(1) int(2) diff --git a/hphp/test/zend/bad/zend/009.php.expectf b/hphp/test/zend/bad/zend/009.php.expectf index 84d3c9c2f..c0f70d585 100644 --- a/hphp/test/zend/bad/zend/009.php.expectf +++ b/hphp/test/zend/bad/zend/009.php.expectf @@ -5,9 +5,9 @@ Strict Standards: Non-static method foo::bar() should not be called statically i string(3) "foo" string(3) "foo" string(3) "foo" -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(3) "foo" string(4) "foo2" diff --git a/hphp/test/zend/bad/zend/012.php.expectf b/hphp/test/zend/bad/zend/012.php.expectf index a86313416..4e66459eb 100644 --- a/hphp/test/zend/bad/zend/012.php.expectf +++ b/hphp/test/zend/bad/zend/012.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) diff --git a/hphp/test/zend/bad/zend/013.php.expectf b/hphp/test/zend/bad/zend/013.php.expectf index 0c2bd4c18..ef27efcea 100644 --- a/hphp/test/zend/bad/zend/013.php.expectf +++ b/hphp/test/zend/bad/zend/013.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) bool(true) diff --git a/hphp/test/zend/bad/zend/014.php.expectf b/hphp/test/zend/bad/zend/014.php.expectf index 4b395b5c5..905a8450a 100644 --- a/hphp/test/zend/bad/zend/014.php.expectf +++ b/hphp/test/zend/bad/zend/014.php.expectf @@ -8,7 +8,7 @@ array(2) { [1]=> string(%d) "%s" } -HipHop Warning: %a +HipHop Warning: %s NULL array(2) { [0]=> @@ -16,7 +16,7 @@ array(2) { [1]=> string(%d) "%s" } -HipHop Warning: %a +HipHop Warning: %s NULL array(2) { [0]=> diff --git a/hphp/test/zend/bad/zend/015.php.expectf b/hphp/test/zend/bad/zend/015.php.expectf index ebf76c9a0..08f275de3 100644 --- a/hphp/test/zend/bad/zend/015.php.expectf +++ b/hphp/test/zend/bad/zend/015.php.expectf @@ -1,14 +1,14 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(true) Deprecated: error in hphp/test/zend/bad/zend/015.phpt on line %d diff --git a/hphp/test/zend/bad/zend/017.php.expectf b/hphp/test/zend/bad/zend/017.php.expectf index 3492d951f..a1e4b19cb 100644 --- a/hphp/test/zend/bad/zend/017.php.expectf +++ b/hphp/test/zend/bad/zend/017.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(6) "stream" string(7) "Unknown" @@ -8,22 +8,22 @@ string(5) "array" int(%d) string(5) "array" int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(5) "array" string(5) "array" int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL string(5) "array" int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL string(5) "array" int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) string(5) "array" diff --git a/hphp/test/zend/bad/zend/018.php.expectf b/hphp/test/zend/bad/zend/018.php.expectf index 0de158402..b80ecfb31 100644 --- a/hphp/test/zend/bad/zend/018.php.expectf +++ b/hphp/test/zend/bad/zend/018.php.expectf @@ -1,10 +1,10 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL int(1) string(4) "test" diff --git a/hphp/test/zend/bad/zend/019.php b/hphp/test/zend/bad/zend/019.php index 41b4ac941..352bc3dca 100644 --- a/hphp/test/zend/bad/zend/019.php +++ b/hphp/test/zend/bad/zend/019.php @@ -354,7 +354,7 @@ var_dump($global_var); test_unset3(); var_dump($global_var); -//Note: No error conditions relating to passing arugments can be tested +//Note: No error conditions relating to passing arguments can be tested // because these are not functions but statements, it will result in syntax error. ?> ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/019.php.expectf b/hphp/test/zend/bad/zend/019.php.expectf index 5f907adb2..a2cc29cb8 100644 --- a/hphp/test/zend/bad/zend/019.php.expectf +++ b/hphp/test/zend/bad/zend/019.php.expectf @@ -3,7 +3,7 @@ bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -14,7 +14,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -25,7 +25,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -36,7 +36,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -47,7 +47,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -58,7 +58,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -69,7 +69,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -80,7 +80,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -91,7 +91,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -102,7 +102,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -113,7 +113,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -124,7 +124,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -135,7 +135,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -146,7 +146,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -157,7 +157,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -168,7 +168,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -179,7 +179,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -190,7 +190,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -201,7 +201,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -212,7 +212,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -223,7 +223,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -234,7 +234,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -245,7 +245,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -256,7 +256,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -267,7 +267,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -278,7 +278,7 @@ bool(false) bool(true) bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -289,7 +289,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -305,7 +305,7 @@ bool(false) bool(true) bool(true) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -320,15 +320,15 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 2 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -343,15 +343,15 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 3 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -366,15 +366,15 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 4 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -389,15 +389,15 @@ bool(true) -- Innerloop Iteration 1 of Outerloop Iteration 5 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -418,11 +418,11 @@ array(3) { [3]=> int(4) } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(3) { [1]=> @@ -439,11 +439,11 @@ array(2) { [3]=> int(4) } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(2) { [2]=> @@ -456,11 +456,11 @@ array(1) { [3]=> int(4) } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(1) { [3]=> @@ -469,15 +469,15 @@ array(1) { -- Innerloop Iteration 4 of Outerloop Iteration 6 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -496,11 +496,11 @@ array(2) { [2]=> float(5.6) } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(2) { [1]=> @@ -513,11 +513,11 @@ array(1) { [2]=> float(5.6) } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(1) { [2]=> @@ -526,15 +526,15 @@ array(1) { -- Innerloop Iteration 3 of Outerloop Iteration 7 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -551,11 +551,11 @@ array(1) { [2]=> string(3) "two" } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(1) { [2]=> @@ -564,15 +564,15 @@ array(1) { -- Innerloop Iteration 2 of Outerloop Iteration 8 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -589,11 +589,11 @@ array(1) { ["Age"]=> string(2) "30" } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(1) { ["Age"]=> @@ -602,15 +602,15 @@ array(1) { -- Innerloop Iteration 2 of Outerloop Iteration 9 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -633,11 +633,11 @@ array(4) { [""]=> string(0) "" } -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(4) { [1]=> @@ -658,11 +658,11 @@ array(3) { [""]=> string(0) "" } -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(3) { ["One"]=> @@ -679,11 +679,11 @@ array(2) { [""]=> string(0) "" } -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(2) { [2]=> @@ -696,11 +696,11 @@ array(1) { [""]=> string(0) "" } -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(1) { [""]=> @@ -709,15 +709,15 @@ array(1) { -- Innerloop Iteration 5 of Outerloop Iteration 10 -- array(0) { } -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) array(0) { } -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(false) @@ -734,7 +734,7 @@ bool(false) bool(true) bool(false) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL -- Iteration 2 -- resource(%d) of type (stream) @@ -746,9 +746,9 @@ bool(false) bool(true) bool(false) bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(true) @@ -764,13 +764,13 @@ object(Point)#%d (3) { } bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) object(Point)#%d (3) { ["x"]=> @@ -794,7 +794,7 @@ bool(true) bool(false) bool(false) bool(true) -HipHop Notice: %a +HipHop Notice: %s NULL bool(false) bool(true) @@ -823,7 +823,7 @@ object(Point)#%d (3) { value of static_var before unset: 1 bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s value of static_var after unset: bool(false) bool(true) @@ -831,7 +831,7 @@ value of static_var after new assignment: 20 value of static_var before unset: 2 bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s value of static_var after unset: bool(false) bool(true) @@ -839,7 +839,7 @@ value of static_var after new assignment: 20 value of static_var before unset: 3 bool(true) bool(false) -HipHop Notice: %a +HipHop Notice: %s value of static_var after unset: bool(false) bool(true) diff --git a/hphp/test/zend/bad/zend/024.php.expectf b/hphp/test/zend/bad/zend/024.php.expectf index 0f57c59c2..2f337a9e8 100644 --- a/hphp/test/zend/bad/zend/024.php.expectf +++ b/hphp/test/zend/bad/zend/024.php.expectf @@ -1,22 +1,22 @@ -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s int(1) -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(0) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s int(1) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/026.php.expectf b/hphp/test/zend/bad/zend/026.php.expectf index 00904afa7..4aae85658 100644 --- a/hphp/test/zend/bad/zend/026.php.expectf +++ b/hphp/test/zend/bad/zend/026.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s ok -HipHop Warning: %a +HipHop Warning: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/031.php.expectf b/hphp/test/zend/bad/zend/031.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/031.php.expectf +++ b/hphp/test/zend/bad/zend/031.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/033.php.expectf b/hphp/test/zend/bad/zend/033.php.expectf index 59902bc05..5a0a08c84 100644 --- a/hphp/test/zend/bad/zend/033.php.expectf +++ b/hphp/test/zend/bad/zend/033.php.expectf @@ -1,6 +1,6 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/access_modifiers_001.php.expectf b/hphp/test/zend/bad/zend/access_modifiers_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/access_modifiers_001.php.expectf +++ b/hphp/test/zend/bad/zend/access_modifiers_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/access_modifiers_005.php.expectf b/hphp/test/zend/bad/zend/access_modifiers_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/access_modifiers_005.php.expectf +++ b/hphp/test/zend/bad/zend/access_modifiers_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/access_modifiers_006.php.expectf b/hphp/test/zend/bad/zend/access_modifiers_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/access_modifiers_006.php.expectf +++ b/hphp/test/zend/bad/zend/access_modifiers_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/access_modifiers_008.php.expectf b/hphp/test/zend/bad/zend/access_modifiers_008.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/access_modifiers_008.php.expectf +++ b/hphp/test/zend/bad/zend/access_modifiers_008.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/access_modifiers_009.php.expectf b/hphp/test/zend/bad/zend/access_modifiers_009.php.expectf index 08b4ecb30..58b404643 100644 --- a/hphp/test/zend/bad/zend/access_modifiers_009.php.expectf +++ b/hphp/test/zend/bad/zend/access_modifiers_009.php.expectf @@ -1,2 +1,2 @@ bool(false) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/add_002.php.expectf b/hphp/test/zend/bad/zend/add_002.php.expectf index aaaa48bec..07eb98c70 100644 --- a/hphp/test/zend/bad/zend/add_002.php.expectf +++ b/hphp/test/zend/bad/zend/add_002.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/add_003.php.expectf b/hphp/test/zend/bad/zend/add_003.php.expectf index aaaa48bec..07eb98c70 100644 --- a/hphp/test/zend/bad/zend/add_003.php.expectf +++ b/hphp/test/zend/bad/zend/add_003.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/array_type_hint_001.php.expectf b/hphp/test/zend/bad/zend/array_type_hint_001.php.expectf deleted file mode 100644 index 605d003b4..000000000 --- a/hphp/test/zend/bad/zend/array_type_hint_001.php.expectf +++ /dev/null @@ -1,3 +0,0 @@ -3 - -HipHop Fatal error: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug26166.php.expectf b/hphp/test/zend/bad/zend/bug26166.php.expectf index 7b6853daa..262f7fa15 100644 --- a/hphp/test/zend/bad/zend/bug26166.php.expectf +++ b/hphp/test/zend/bad/zend/bug26166.php.expectf @@ -2,4 +2,4 @@ Hello World! ===NONE=== string(52) "Method None::__toString() must return a string value" ===THROW=== -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug29689.php.expectf b/hphp/test/zend/bad/zend/bug29689.php.expectf index 27f6b4bc0..bde68a792 100644 --- a/hphp/test/zend/bad/zend/bug29689.php.expectf +++ b/hphp/test/zend/bad/zend/bug29689.php.expectf @@ -1,6 +1,6 @@ foo: foo foo2 bar: bar -HipHop Notice: %a +HipHop Notice: %s ---baz-- foo: foo foo2 diff --git a/hphp/test/zend/bad/zend/bug30998.php.expectf b/hphp/test/zend/bad/zend/bug30998.php.expectf index f97b241ba..f4083c0a6 100644 --- a/hphp/test/zend/bad/zend/bug30998.php.expectf +++ b/hphp/test/zend/bad/zend/bug30998.php.expectf @@ -1,3 +1,3 @@ fopen(/tmp/blah): failed to open stream: %s (2) in %s:%d -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug31098.php.expectf b/hphp/test/zend/bad/zend/bug31098.php.expectf index 70b52f469..7f9a70d90 100644 --- a/hphp/test/zend/bad/zend/bug31098.php.expectf +++ b/hphp/test/zend/bad/zend/bug31098.php.expectf @@ -11,10 +11,10 @@ ok ok ok ok -HipHop Notice: %a +HipHop Notice: %s ok -HipHop Warning: %a +HipHop Warning: %s ok ok -HipHop Warning: %a +HipHop Warning: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug32660.php.expectf b/hphp/test/zend/bad/zend/bug32660.php.expectf index 35094e5c7..7d5c20202 100644 --- a/hphp/test/zend/bad/zend/bug32660.php.expectf +++ b/hphp/test/zend/bad/zend/bug32660.php.expectf @@ -1,7 +1,7 @@ -HipHop Notice: %a +HipHop Notice: %s A Object ( [q] => 3 ) -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug34064.php.expectf b/hphp/test/zend/bad/zend/bug34064.php.expectf index 93014e112..c770f4113 100644 --- a/hphp/test/zend/bad/zend/bug34064.php.expectf +++ b/hphp/test/zend/bad/zend/bug34064.php.expectf @@ -2,4 +2,4 @@ array(1) { [0]=> string(2) "ok" } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug36268.php.expectf b/hphp/test/zend/bad/zend/bug36268.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug36268.php.expectf +++ b/hphp/test/zend/bad/zend/bug36268.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug36303.php.expectf b/hphp/test/zend/bad/zend/bug36303.php.expectf index a499ec225..2df0490c0 100644 --- a/hphp/test/zend/bad/zend/bug36303.php.expectf +++ b/hphp/test/zend/bad/zend/bug36303.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug37632.php.expectf b/hphp/test/zend/bad/zend/bug37632.php.expectf index d3378597f..3f9747fcd 100644 --- a/hphp/test/zend/bad/zend/bug37632.php.expectf +++ b/hphp/test/zend/bad/zend/bug37632.php.expectf @@ -3,4 +3,4 @@ C1::test B2::doTest C2::test B4::doTest -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug37667.php.expectf b/hphp/test/zend/bad/zend/bug37667.php.expectf index e89befb21..e2e3037e3 100644 --- a/hphp/test/zend/bad/zend/bug37667.php.expectf +++ b/hphp/test/zend/bad/zend/bug37667.php.expectf @@ -1,5 +1,5 @@ string(3) "bar" -HipHop Notice: %a +HipHop Notice: %s NULL object(Test)#%d (1) { ["property":protected]=> @@ -8,8 +8,8 @@ object(Test)#%d (1) { string(3) "bar" } } -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s object(Test)#%d (1) { ["property":protected]=> array(1) { diff --git a/hphp/test/zend/bad/zend/bug37811.php.expectf b/hphp/test/zend/bad/zend/bug37811.php.expectf index 312000df0..466c60183 100644 --- a/hphp/test/zend/bad/zend/bug37811.php.expectf +++ b/hphp/test/zend/bad/zend/bug37811.php.expectf @@ -1,5 +1,5 @@ string(3) "Foo" -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s string(3) "Baz" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug38624.php.expectf b/hphp/test/zend/bad/zend/bug38624.php.expectf index 8072260b3..bda058e93 100644 --- a/hphp/test/zend/bad/zend/bug38624.php.expectf +++ b/hphp/test/zend/bad/zend/bug38624.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): impl->__get('counter') #1 %s(%d): impl->__construct() diff --git a/hphp/test/zend/bad/zend/bug39018.php.expectf b/hphp/test/zend/bad/zend/bug39018.php.expectf index e16ba870a..305bd8c9c 100644 --- a/hphp/test/zend/bad/zend/bug39018.php.expectf +++ b/hphp/test/zend/bad/zend/bug39018.php.expectf @@ -1,21 +1,22 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s b Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug39036.php.expectf b/hphp/test/zend/bad/zend/bug39036.php.expectf index 5bc7b338a..84865675e 100644 --- a/hphp/test/zend/bad/zend/bug39036.php.expectf +++ b/hphp/test/zend/bad/zend/bug39036.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a +HipHop Notice: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug39304.php.expectf b/hphp/test/zend/bad/zend/bug39304.php.expectf index 0e028007d..70444814d 100644 --- a/hphp/test/zend/bad/zend/bug39304.php.expectf +++ b/hphp/test/zend/bad/zend/bug39304.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s I am alive \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug39304_2_4.php.expectf b/hphp/test/zend/bad/zend/bug39304_2_4.php.expectf index 933d3577c..8514dc04a 100644 --- a/hphp/test/zend/bad/zend/bug39304_2_4.php.expectf +++ b/hphp/test/zend/bad/zend/bug39304_2_4.php.expectf @@ -1,5 +1,5 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s string(0) "" string(0) "" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug39775.php.expectf b/hphp/test/zend/bad/zend/bug39775.php.expectf index 004bd20a9..f7004189f 100644 --- a/hphp/test/zend/bad/zend/bug39775.php.expectf +++ b/hphp/test/zend/bad/zend/bug39775.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s Array ( ) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug40621.php.expectf b/hphp/test/zend/bad/zend/bug40621.php.expectf index 9431c7ead..2d66e0de7 100644 --- a/hphp/test/zend/bad/zend/bug40621.php.expectf +++ b/hphp/test/zend/bad/zend/bug40621.php.expectf @@ -1,2 +1,2 @@ Strict Standards: Non-static method Foo::get() should not be called statically in hphp/test/zend/bad/zend/bug40621.phpt on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug41209.php.expectf b/hphp/test/zend/bad/zend/bug41209.php.expectf index 415de6af2..43078f6af 100644 --- a/hphp/test/zend/bad/zend/bug41209.php.expectf +++ b/hphp/test/zend/bad/zend/bug41209.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array) #1 {main} diff --git a/hphp/test/zend/bad/zend/bug41421.php.expectf b/hphp/test/zend/bad/zend/bug41421.php.expectf index 0669deed1..e7c74adfa 100644 --- a/hphp/test/zend/bad/zend/bug41421.php.expectf +++ b/hphp/test/zend/bad/zend/bug41421.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Fatal error: %a +HipHop Warning: %s +HipHop Fatal error: %s Stack trace: #0 [internal function]: wrapper->stream_eof() #1 %s(%d): feof(Resource id #6) diff --git a/hphp/test/zend/bad/zend/bug41633_3.php.expectf b/hphp/test/zend/bad/zend/bug41633_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug41633_3.php.expectf +++ b/hphp/test/zend/bad/zend/bug41633_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug42802.php.expectf b/hphp/test/zend/bad/zend/bug42802.php.expectf deleted file mode 100644 index 57078f01a..000000000 --- a/hphp/test/zend/bad/zend/bug42802.php.expectf +++ /dev/null @@ -1,6 +0,0 @@ -ok -ok -ok -ok - -HipHop Fatal error: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug43201.php.expectf b/hphp/test/zend/bad/zend/bug43201.php.expectf index e75af8147..3803d728e 100644 --- a/hphp/test/zend/bad/zend/bug43201.php.expectf +++ b/hphp/test/zend/bad/zend/bug43201.php.expectf @@ -1,16 +1,16 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug44660.php.expectf b/hphp/test/zend/bad/zend/bug44660.php.expectf index 8e8844ae1..a3fe738fc 100644 --- a/hphp/test/zend/bad/zend/bug44660.php.expectf +++ b/hphp/test/zend/bad/zend/bug44660.php.expectf @@ -1,20 +1,20 @@ --> read access: -HipHop Notice: %a +HipHop Notice: %s --> direct assignment: -HipHop Warning: %a +HipHop Warning: %s --> increment: -HipHop Warning: %a +HipHop Warning: %s --> reference assignment: -HipHop Warning: %a +HipHop Warning: %s --> reference assignment: -HipHop Warning: %a +HipHop Warning: %s --> indexed assignment: -HipHop Warning: %a +HipHop Warning: %s --> Confirm assignments have had no impact: bool(true) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug44827.php.expectf b/hphp/test/zend/bad/zend/bug44827.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/bad/zend/bug44827.php.expectf +++ b/hphp/test/zend/bad/zend/bug44827.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug44899.php.expectf b/hphp/test/zend/bad/zend/bug44899.php.expectf index 2612f29fe..4c026767f 100644 --- a/hphp/test/zend/bad/zend/bug44899.php.expectf +++ b/hphp/test/zend/bad/zend/bug44899.php.expectf @@ -1,4 +1,4 @@ isset empty -HipHop Notice: %a +HipHop Notice: %s empty \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug45805.php.expectf b/hphp/test/zend/bad/zend/bug45805.php.expectf index a9183ee34..30c2599bf 100644 --- a/hphp/test/zend/bad/zend/bug45805.php.expectf +++ b/hphp/test/zend/bad/zend/bug45805.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %sbug45805.php(%d): PHPUnit_Util_ErrorHandler::handleError(2048, 'Only variables ...', '%s', %d, Array) #1 [internal function]: B->foo() diff --git a/hphp/test/zend/bad/zend/bug46304.php.expectf b/hphp/test/zend/bad/zend/bug46304.php.expectf index 4edbceb8e..30897a533 100644 --- a/hphp/test/zend/bad/zend/bug46304.php.expectf +++ b/hphp/test/zend/bad/zend/bug46304.php.expectf @@ -19,4 +19,4 @@ value6 value6 value6 value6 -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug47054.php.expectf b/hphp/test/zend/bad/zend/bug47054.php.expectf index 36e266926..e4c5fc8c0 100644 --- a/hphp/test/zend/bad/zend/bug47054.php.expectf +++ b/hphp/test/zend/bad/zend/bug47054.php.expectf @@ -1,7 +1,7 @@ Called class: D Called class: C Called class: C -HipHop Warning: %a +HipHop Warning: %s Strict Standards: Non-static method D::m() should not be called statically in hphp/test/zend/bad/zend/bug47054.phpt on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug47109.php.expectf b/hphp/test/zend/bad/zend/bug47109.php.expectf index 1afcacf2e..3ea0e7145 100644 --- a/hphp/test/zend/bad/zend/bug47109.php.expectf +++ b/hphp/test/zend/bad/zend/bug47109.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug47699.php.expectf b/hphp/test/zend/bad/zend/bug47699.php.expectf index dcb8889a0..dbd313be2 100644 --- a/hphp/test/zend/bad/zend/bug47699.php.expectf +++ b/hphp/test/zend/bad/zend/bug47699.php.expectf @@ -1,2 +1,2 @@ BB -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug48228.php.expectf b/hphp/test/zend/bad/zend/bug48228.php.expectf index fdbe0991c..84ef75b5c 100644 --- a/hphp/test/zend/bad/zend/bug48228.php.expectf +++ b/hphp/test/zend/bad/zend/bug48228.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): do_throw() #1 %s(%d): aa->dosome() diff --git a/hphp/test/zend/bad/zend/bug48248.php.expectf b/hphp/test/zend/bad/zend/bug48248.php.expectf index 2766af0ff..93a46de97 100644 --- a/hphp/test/zend/bad/zend/bug48248.php.expectf +++ b/hphp/test/zend/bad/zend/bug48248.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug48408.php.expectf b/hphp/test/zend/bad/zend/bug48408.php.expectf index aba7721f9..6b0f0ac5e 100644 --- a/hphp/test/zend/bad/zend/bug48408.php.expectf +++ b/hphp/test/zend/bad/zend/bug48408.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(%d): C->generate(0) #1 {main} diff --git a/hphp/test/zend/bad/zend/bug48667_1.php.expectf b/hphp/test/zend/bad/zend/bug48667_1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug48667_1.php.expectf +++ b/hphp/test/zend/bad/zend/bug48667_1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug48667_2.php.expectf b/hphp/test/zend/bad/zend/bug48667_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug48667_2.php.expectf +++ b/hphp/test/zend/bad/zend/bug48667_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug48770_2.php.expectf b/hphp/test/zend/bad/zend/bug48770_2.php.expectf index 46ddceb77..caabb7030 100644 --- a/hphp/test/zend/bad/zend/bug48770_2.php.expectf +++ b/hphp/test/zend/bad/zend/bug48770_2.php.expectf @@ -1,4 +1,4 @@ %unicode|string%(27) "A::func2: This should work!" %unicode|string%(27) "A::func3: This should work!" -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug49908.php.expectf b/hphp/test/zend/bad/zend/bug49908.php.expectf index 5cd3903c0..66c9c4cd5 100644 --- a/hphp/test/zend/bad/zend/bug49908.php.expectf +++ b/hphp/test/zend/bad/zend/bug49908.php.expectf @@ -1,6 +1,6 @@ %unicode|string%(3) "Foo" %unicode|string%(3) "Bar" -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %s(7): __autoload('Bar') #1 %s(13): __autoload('Foo') diff --git a/hphp/test/zend/bad/zend/bug50005.php.expectf b/hphp/test/zend/bad/zend/bug50005.php.expectf index ad89a1107..331d90776 100644 --- a/hphp/test/zend/bad/zend/bug50005.php.expectf +++ b/hphp/test/zend/bad/zend/bug50005.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 {main} thrown in Unknown on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug50146.php.expectf b/hphp/test/zend/bad/zend/bug50146.php.expectf index dd6dfd2b8..ec61a3abf 100644 --- a/hphp/test/zend/bad/zend/bug50146.php.expectf +++ b/hphp/test/zend/bad/zend/bug50146.php.expectf @@ -1,4 +1,3 @@ bool(false) bool(false) - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug51421.php.expectf b/hphp/test/zend/bad/zend/bug51421.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug51421.php.expectf +++ b/hphp/test/zend/bad/zend/bug51421.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug52041.php.expectf b/hphp/test/zend/bad/zend/bug52041.php.expectf index e832655d4..414371e9d 100644 --- a/hphp/test/zend/bad/zend/bug52041.php.expectf +++ b/hphp/test/zend/bad/zend/bug52041.php.expectf @@ -1,26 +1,32 @@ -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: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug52160.php.expectf b/hphp/test/zend/bad/zend/bug52160.php.expectf index 6c37ca3c5..99716c687 100644 --- a/hphp/test/zend/bad/zend/bug52160.php.expectf +++ b/hphp/test/zend/bad/zend/bug52160.php.expectf @@ -1,2 +1,2 @@ Strict Standards: Redefining already defined constructor for class foo in hphp/test/zend/bad/zend/bug52160.phpt on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug52237.php.expectf b/hphp/test/zend/bad/zend/bug52237.php.expectf index da3e262e9..7898411de 100644 --- a/hphp/test/zend/bad/zend/bug52237.php.expectf +++ b/hphp/test/zend/bad/zend/bug52237.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s string(4) "test" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug53305.php.expectf b/hphp/test/zend/bad/zend/bug53305.php.expectf index 1af769168..43652a890 100644 --- a/hphp/test/zend/bad/zend/bug53305.php.expectf +++ b/hphp/test/zend/bad/zend/bug53305.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a +HipHop Notice: %s int(1) int(4) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug53511.php.expectf b/hphp/test/zend/bad/zend/bug53511.php.expectf index 1fe0f7945..cea5f02c0 100644 --- a/hphp/test/zend/bad/zend/bug53511.php.expectf +++ b/hphp/test/zend/bad/zend/bug53511.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 %sbug53511.php(17): test() #1 {main} diff --git a/hphp/test/zend/bad/zend/bug54262.php.expectf b/hphp/test/zend/bad/zend/bug54262.php.expectf index a3a5e3f61..ba9eebeb1 100644 --- a/hphp/test/zend/bad/zend/bug54262.php.expectf +++ b/hphp/test/zend/bad/zend/bug54262.php.expectf @@ -1,4 +1,4 @@ bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ok \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug60536_001.php b/hphp/test/zend/bad/zend/bug60536_001.php similarity index 75% rename from hphp/test/zend/good/zend/bug60536_001.php rename to hphp/test/zend/bad/zend/bug60536_001.php index f83fb90e4..b887a18cc 100644 --- a/hphp/test/zend/good/zend/bug60536_001.php +++ b/hphp/test/zend/bad/zend/bug60536_001.php @@ -1,17 +1,17 @@ x; + return ++$this->x; } } class Z extends Y { function z() { - return ++$this->x; + return ++$this->x; } } $a = new Z(); diff --git a/hphp/test/zend/bad/zend/bug60536_001.php.expectf b/hphp/test/zend/bad/zend/bug60536_001.php.expectf new file mode 100644 index 000000000..4b225a855 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60536_001.php.expectf @@ -0,0 +1,2 @@ +HipHop Notice: %s +DONE \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60536_002.php.expectf b/hphp/test/zend/bad/zend/bug60536_002.php.expectf index b1696b531..de55b9559 100644 --- a/hphp/test/zend/bad/zend/bug60536_002.php.expectf +++ b/hphp/test/zend/bad/zend/bug60536_002.php.expectf @@ -2,4 +2,4 @@ PRE-CLASS-GUARD Strict Standards: Notice and THello1 define the same property ($hello) in the composition of Notice. This might be incompatible, to improve maintainability consider using accessor methods in traits instead. Class was composed in hphp/test/zend/bad/zend/bug60536_002.phpt on line %d POST-CLASS-GUARD -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60573.php.expectf b/hphp/test/zend/bad/zend/bug60573.php.expectf index b9b5e1cb9..2bfcf7dbd 100644 --- a/hphp/test/zend/bad/zend/bug60573.php.expectf +++ b/hphp/test/zend/bad/zend/bug60573.php.expectf @@ -1,4 +1,4 @@ Strict Standards: Declaration of Bar4::setSelf() should be compatible with Foo4::setSelf(Foo4 $s) in %sbug60573.php on line %d Strict Standards: Declaration of Bar5::setSelf() should be compatible with Foo5::setSelf(Base $s) in %sbug60573.php on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60738.php b/hphp/test/zend/bad/zend/bug60738.php new file mode 100644 index 000000000..61aa86411 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60738.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60738.php.expectf b/hphp/test/zend/bad/zend/bug60738.php.expectf new file mode 100644 index 000000000..d6c29e4ad --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60738.php.expectf @@ -0,0 +1,5 @@ +NULL +Intercepted error! +object(Closure)#1 (0) { +} +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60738_variation.php b/hphp/test/zend/bad/zend/bug60738_variation.php new file mode 100644 index 000000000..6aac7a5c4 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60738_variation.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60738_variation.php.expectf b/hphp/test/zend/bad/zend/bug60738_variation.php.expectf new file mode 100644 index 000000000..d225cee98 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60738_variation.php.expectf @@ -0,0 +1,7 @@ +NULL +object(Closure)#1 (0) { +} +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in hphp/test/zend/bad/zend/bug60738_variation.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60771.php b/hphp/test/zend/bad/zend/bug60771.php index ed3946f52..373ef0aa7 100644 --- a/hphp/test/zend/bad/zend/bug60771.php +++ b/hphp/test/zend/bad/zend/bug60771.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60833.php b/hphp/test/zend/bad/zend/bug60833.php new file mode 100644 index 000000000..69f76e045 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60833.php @@ -0,0 +1,22 @@ +v1 = new sELF; + $this->v2 = new SELF; + } +} + +class B extends A { + static $x = "B"; + function testit() { + PARENT::testit(); + $this->v3 = new sELF; + $this->v4 = new PARENT; + $this->v4 = STATIC::$x; + } +} +$t = new B(); +$t->testit(); +var_dump($t); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60833.php.expectf b/hphp/test/zend/bad/zend/bug60833.php.expectf new file mode 100644 index 000000000..22dc3ba6a --- /dev/null +++ b/hphp/test/zend/bad/zend/bug60833.php.expectf @@ -0,0 +1,13 @@ +object(B)#%d (4) { + ["v1"]=> + object(A)#%d (0) { + } + ["v2"]=> + object(A)#%d (0) { + } + ["v3"]=> + object(B)#%d (0) { + } + ["v4"]=> + string(1) "B" +} \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60909_1.php.expectf b/hphp/test/zend/bad/zend/bug60909_1.php.expectf index fbde2b144..6a214e68a 100644 --- a/hphp/test/zend/bad/zend/bug60909_1.php.expectf +++ b/hphp/test/zend/bad/zend/bug60909_1.php.expectf @@ -1,11 +1,11 @@ error(require(notfound.php): failed to open stream: %s) -HipHop Warning: %a +HipHop Warning: %s Stack trace: #0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array) #1 %sbug60909_1.php(8): require() #2 {main} thrown in %sbug60909_1.php on line 5 -HipHop Fatal error: %a +HipHop Fatal error: %s !!!shutdown!!! \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug60909_2.php.expectf b/hphp/test/zend/bad/zend/bug60909_2.php.expectf index b0d836b83..a1ff7641a 100644 --- a/hphp/test/zend/bad/zend/bug60909_2.php.expectf +++ b/hphp/test/zend/bad/zend/bug60909_2.php.expectf @@ -1,4 +1,4 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s !!!shutdown!!! \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61025.php b/hphp/test/zend/bad/zend/bug61025.php new file mode 100644 index 000000000..c2aa31225 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug61025.php @@ -0,0 +1,18 @@ +__invoke(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61025.php.expectf b/hphp/test/zend/bad/zend/bug61025.php.expectf new file mode 100644 index 000000000..96b0b7a92 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug61025.php.expectf @@ -0,0 +1,4 @@ +HipHop Warning: %s +HipHop Warning: %s +Bar +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61087.php.expectf b/hphp/test/zend/bad/zend/bug61087.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/bug61087.php.expectf +++ b/hphp/test/zend/bad/zend/bug61087.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61681.php b/hphp/test/zend/bad/zend/bug61681.php new file mode 100644 index 000000000..5a859f082 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug61681.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61681.php.expectf b/hphp/test/zend/bad/zend/bug61681.php.expectf new file mode 100644 index 000000000..5c8a14786 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug61681.php.expectf @@ -0,0 +1 @@ +ooxx \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug61767.php.expectf b/hphp/test/zend/bad/zend/bug61767.php.expectf index 8bec1e18c..f53a3e5c6 100644 --- a/hphp/test/zend/bad/zend/bug61767.php.expectf +++ b/hphp/test/zend/bad/zend/bug61767.php.expectf @@ -1,15 +1,14 @@ Error handler called (Undefined variable: undefined) -HipHop Warning: %a +HipHop Fatal error: %s Stack trace: -#0 %sbug61767.php(13): {closure}(8, 'Undefined varia...', '%s', 13, Array) +#0 %sbug61767.php(%d): {closure}(%s, 'Undefined varia...', '%s', %d, Array) #1 {main} - thrown in %sbug61767.php on line 13 -HipHop Fatal error: %a + thrown in %sbug61767.php on line %d Shutting down Array ( [type] => 1 - [message] => Call to a member function foo() on a non-object + [message] => %a [file] => %sbug61767.php - [line] => 13 + [line] => %d ) \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug62005.php b/hphp/test/zend/bad/zend/bug62005.php similarity index 100% rename from hphp/test/zend/good/zend/bug62005.php rename to hphp/test/zend/bad/zend/bug62005.php diff --git a/hphp/test/zend/good/zend/bug62005.php.expectf b/hphp/test/zend/bad/zend/bug62005.php.expectf similarity index 50% rename from hphp/test/zend/good/zend/bug62005.php.expectf rename to hphp/test/zend/bad/zend/bug62005.php.expectf index 1f43726db..5e6dbd30d 100644 --- a/hphp/test/zend/good/zend/bug62005.php.expectf +++ b/hphp/test/zend/bad/zend/bug62005.php.expectf @@ -1,4 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s +HipHop Notice: %s stdClass Object ( [energy] => 2 diff --git a/hphp/test/zend/bad/zend/bug62343.php b/hphp/test/zend/bad/zend/bug62343.php new file mode 100644 index 000000000..67bb22380 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug62343.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug62343.php.expectf b/hphp/test/zend/bad/zend/bug62343.php.expectf new file mode 100644 index 000000000..105ede7ad --- /dev/null +++ b/hphp/test/zend/bad/zend/bug62343.php.expectf @@ -0,0 +1,2 @@ +string(1) "b" +string(1) "a" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug63111.php.expectf b/hphp/test/zend/bad/zend/bug63111.php.expectf index 0de7fc5ce..857a914d9 100644 --- a/hphp/test/zend/bad/zend/bug63111.php.expectf +++ b/hphp/test/zend/bad/zend/bug63111.php.expectf @@ -6,4 +6,4 @@ bool(false) bool(true) bool(true) ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug63762.php.expectf b/hphp/test/zend/bad/zend/bug63762.php.expectf index ba24e9b9b..9269140e6 100644 --- a/hphp/test/zend/bad/zend/bug63762.php.expectf +++ b/hphp/test/zend/bad/zend/bug63762.php.expectf @@ -1,5 +1,5 @@ Array of NULL: -HipHop Warning: %a +HipHop Warning: %s string(9) "#0 {main}" Array of empty array: @@ -7,10 +7,10 @@ string(36) "#0 [internal function]: () #1 {main}" Array of array of NULL values: -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 string(60) "#0 [unknown function][unknown][unknown][unknown]() #1 {main}" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug63882.php.expectf b/hphp/test/zend/bad/zend/bug63882.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/bug63882.php.expectf +++ b/hphp/test/zend/bad/zend/bug63882.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64239_1.php b/hphp/test/zend/bad/zend/bug64239_1.php new file mode 100644 index 000000000..9854b616f --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64239_1.php @@ -0,0 +1,14 @@ + Bmethod + [1] => t2method +) +Array +( + [0] => Bmethod + [1] => t2method +) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64578.php b/hphp/test/zend/bad/zend/bug64578.php new file mode 100644 index 000000000..a64d1957e --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64578.php @@ -0,0 +1,8 @@ +trace = debug_backtrace(1); + } +} + +class Bar { + public function __destruct() { + Stat::getInstance(); + new Error(); + } + + public function test() { + new Error(); + } +} + +$foo = new Foo(); +$bar = new Bar(); +$bar->test(); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64720.php.expectf b/hphp/test/zend/bad/zend/bug64720.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64720.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.1.php b/hphp/test/zend/bad/zend/bug64821.1.php new file mode 100644 index 000000000..fcb586a62 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.1.php @@ -0,0 +1,14 @@ +message = NULL; + $this->string = NULL; + $this->code = array(); + $this->line = "hello"; + } +} + +throw new a; + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.1.php.expectf b/hphp/test/zend/bad/zend/bug64821.1.php.expectf new file mode 100644 index 000000000..a5ab9112a --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.1.php.expectf @@ -0,0 +1,4 @@ +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in hphp/test/zend/bad/zend/bug64821.1.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.2.php b/hphp/test/zend/bad/zend/bug64821.2.php new file mode 100644 index 000000000..11cd84df5 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.2.php @@ -0,0 +1,11 @@ +line = array(); + } +} + +throw new a; + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.2.php.expectf b/hphp/test/zend/bad/zend/bug64821.2.php.expectf new file mode 100644 index 000000000..0ba82fc7f --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.2.php.expectf @@ -0,0 +1,4 @@ +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in hphp/test/zend/bad/zend/bug64821.2.phpt on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.3.php b/hphp/test/zend/bad/zend/bug64821.3.php new file mode 100644 index 000000000..358a52dd3 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.3.php @@ -0,0 +1,12 @@ +line = array(); + $this->file = NULL; + } +} + +throw new a; + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64821.3.php.expectf b/hphp/test/zend/bad/zend/bug64821.3.php.expectf new file mode 100644 index 000000000..331d90776 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64821.3.php.expectf @@ -0,0 +1,4 @@ +HipHop Fatal error: %s +Stack trace: +#0 {main} + thrown in Unknown on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64960.php b/hphp/test/zend/bad/zend/bug64960.php new file mode 100644 index 000000000..d800229e8 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64960.php @@ -0,0 +1,27 @@ +_trace = debug_backtrace(); + + throw $e; +}); + +// trigger error handler +$a['waa']; +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64960.php.expectf b/hphp/test/zend/bad/zend/bug64960.php.expectf new file mode 100644 index 000000000..06b3e9830 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64960.php.expectf @@ -0,0 +1,8 @@ +HipHop Notice: %s +HipHop Fatal error: %s +Stack trace: +#0 [internal function]: {closure}(8, 'ob_end_clean():...', '%s', 9, Array) +#1 %sbug64960.php(9): ob_end_clean() +#2 [internal function]: ExceptionHandler->__invoke(Object(Exception)) +#3 {main} + thrown in %sbug64960.php on line 19 \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64966.php b/hphp/test/zend/bad/zend/bug64966.php new file mode 100644 index 000000000..11a48cba9 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64966.php @@ -0,0 +1,18 @@ +b(); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64966.php.expectf b/hphp/test/zend/bad/zend/bug64966.php.expectf new file mode 100644 index 000000000..a7f5c3927 --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64966.php.expectf @@ -0,0 +1,8 @@ +HipHop Fatal error: %s +Stack trace: +#0 [internal function]: {closure}(4096, 'Argument 1 pass...', '%s', 6, Array) +#1 %sbug64966.php(6): iterator_apply('') +#2 %sbug64966.php(12): test('iterator_apply') +#3 %sbug64966.php(17): A->b() +#4 {main} + thrown in %sbug64966.php on line 3 \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64988.php b/hphp/test/zend/bad/zend/bug64988.php new file mode 100644 index 000000000..c66d9d80a --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64988.php @@ -0,0 +1,24 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug64988.php.expectf b/hphp/test/zend/bad/zend/bug64988.php.expectf new file mode 100644 index 000000000..06ca014df --- /dev/null +++ b/hphp/test/zend/bad/zend/bug64988.php.expectf @@ -0,0 +1,2 @@ +Strict Standards: Declaration of Smooth1::insert() should be compatible with Noisy1::insert(array $data, $option1 = NULL) in %sbug64988.php on line 20 +okey \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/call_static_006.php.expectf b/hphp/test/zend/bad/zend/call_static_006.php.expectf index 8e167d88b..78de090cf 100644 --- a/hphp/test/zend/bad/zend/call_static_006.php.expectf +++ b/hphp/test/zend/bad/zend/call_static_006.php.expectf @@ -3,4 +3,4 @@ ok Strict Standards: Non-static method foo::aa() should not be called statically in hphp/test/zend/bad/zend/call_static_006.phpt on line %d ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/call_user_func_002.php.expectf b/hphp/test/zend/bad/zend/call_user_func_002.php.expectf index 8631ba029..6fbcd1b65 100644 --- a/hphp/test/zend/bad/zend/call_user_func_002.php.expectf +++ b/hphp/test/zend/bad/zend/call_user_func_002.php.expectf @@ -1,7 +1,7 @@ %unicode|string%(3) "foo" -HipHop Warning: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/call_user_func_004.php.expectf b/hphp/test/zend/bad/zend/call_user_func_004.php.expectf index 9da0a0f0f..6b48dc837 100644 --- a/hphp/test/zend/bad/zend/call_user_func_004.php.expectf +++ b/hphp/test/zend/bad/zend/call_user_func_004.php.expectf @@ -1,2 +1,2 @@ Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method foo::teste() should not be called statically in hphp/test/zend/bad/zend/call_user_func_004.phpt on line %d -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/cast_to_string.php.expectf b/hphp/test/zend/bad/zend/cast_to_string.php.expectf index 0c1841d6f..e4a8da4d3 100644 Binary files a/hphp/test/zend/bad/zend/cast_to_string.php.expectf and b/hphp/test/zend/bad/zend/cast_to_string.php.expectf differ diff --git a/hphp/test/zend/bad/zend/catch_finally_001.php b/hphp/test/zend/bad/zend/catch_finally_001.php new file mode 100644 index 000000000..9c1143883 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_001.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_001.php.expectf b/hphp/test/zend/bad/zend/catch_finally_001.php.expectf new file mode 100644 index 000000000..5cf5519f6 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_001.php.expectf @@ -0,0 +1,8 @@ +try +finally +end + +try +catch +finally +end \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_002.php b/hphp/test/zend/bad/zend/catch_finally_002.php new file mode 100644 index 000000000..1ab51ff02 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_002.php @@ -0,0 +1,14 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_002.php.expectf b/hphp/test/zend/bad/zend/catch_finally_002.php.expectf new file mode 100644 index 000000000..e1704e817 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_002.php.expectf @@ -0,0 +1,3 @@ +try +finally +int(1) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_003.php b/hphp/test/zend/bad/zend/catch_finally_003.php new file mode 100644 index 000000000..73d884da3 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_003.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_003.php.expectf b/hphp/test/zend/bad/zend/catch_finally_003.php.expectf new file mode 100644 index 000000000..d1c827e14 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_003.php.expectf @@ -0,0 +1,5 @@ +string(3) "try" +string(7) "finally" +string(7) "finally" +try +string(4) "para" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_004.php b/hphp/test/zend/bad/zend/catch_finally_004.php new file mode 100644 index 000000000..85e90efc2 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_004.php @@ -0,0 +1,34 @@ +getMessage()); +} while ($ex = $ex->getPrevious()); +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_004.php.expectf b/hphp/test/zend/bad/zend/catch_finally_004.php.expectf new file mode 100644 index 000000000..2e3d1e0c0 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_004.php.expectf @@ -0,0 +1,3 @@ +123432int(1) +string(7) "finally" +string(5) "catch" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_005.php b/hphp/test/zend/bad/zend/catch_finally_005.php new file mode 100644 index 000000000..0c9f4e60a --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_005.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_005.php.expectf b/hphp/test/zend/bad/zend/catch_finally_005.php.expectf new file mode 100644 index 000000000..fa7276a82 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_005.php.expectf @@ -0,0 +1 @@ +int(3) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_006.php b/hphp/test/zend/bad/zend/catch_finally_006.php new file mode 100644 index 000000000..51a8c2741 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_006.php @@ -0,0 +1,21 @@ +getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/catch_finally_006.php.expectf b/hphp/test/zend/bad/zend/catch_finally_006.php.expectf new file mode 100644 index 000000000..d9a60f587 --- /dev/null +++ b/hphp/test/zend/bad/zend/catch_finally_006.php.expectf @@ -0,0 +1,3 @@ +string(4) "para" +string(7) "finally" +string(6) "return" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_alias_006.php.expectf b/hphp/test/zend/bad/zend/class_alias_006.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/class_alias_006.php.expectf +++ b/hphp/test/zend/bad/zend/class_alias_006.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_alias_009.php.expectf b/hphp/test/zend/bad/zend/class_alias_009.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/class_alias_009.php.expectf +++ b/hphp/test/zend/bad/zend/class_alias_009.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_alias_014.php.expectf b/hphp/test/zend/bad/zend/class_alias_014.php.expectf deleted file mode 100644 index cfb6a8593..000000000 --- a/hphp/test/zend/bad/zend/class_alias_014.php.expectf +++ /dev/null @@ -1 +0,0 @@ -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_exists_002.php.expectf b/hphp/test/zend/bad/zend/class_exists_002.php.expectf index f72fee83c..99d94cfe5 100644 --- a/hphp/test/zend/bad/zend/class_exists_002.php.expectf +++ b/hphp/test/zend/bad/zend/class_exists_002.php.expectf @@ -3,5 +3,5 @@ bool(false) bool(true) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_name_as_scalar.php b/hphp/test/zend/bad/zend/class_name_as_scalar.php new file mode 100644 index 000000000..f1f3ce253 --- /dev/null +++ b/hphp/test/zend/bad/zend/class_name_as_scalar.php @@ -0,0 +1,50 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_name_as_scalar.php.expectf b/hphp/test/zend/bad/zend/class_name_as_scalar.php.expectf new file mode 100644 index 000000000..f167bc2e8 --- /dev/null +++ b/hphp/test/zend/bad/zend/class_name_as_scalar.php.expectf @@ -0,0 +1,23 @@ +In NS +string(11) "Foo\Bar\Moo" +Top +string(11) "Foo\Bar\One" +string(3) "Boo" +string(7) "Bee\Bop" +string(3) "Moo" +object(Foo\Bar\One)#1 (0) { +} +string(11) "Foo\Bar\Two" +string(11) "Foo\Bar\Two" +string(11) "Foo\Bar\One" +string(11) "Foo\Bar\Baz" +Parent +string(11) "Foo\Bar\Two" +string(13) "Foo\Bar\Three" +string(11) "Foo\Bar\One" +string(11) "Foo\Bar\Baz" +Compile Check +string(13) "Foo\Bar\Three" +string(11) "Foo\Bar\Baz" +string(11) "Foo\Bar\One" +string(11) "Foo\Bar\Two" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_005.php.expectf b/hphp/test/zend/bad/zend/closure_005.php.expectf index a9e0cd167..c39ff5286 100644 --- a/hphp/test/zend/bad/zend/closure_005.php.expectf +++ b/hphp/test/zend/bad/zend/closure_005.php.expectf @@ -5,4 +5,4 @@ 7 7 Destroyed -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_017.php.expectf b/hphp/test/zend/bad/zend/closure_017.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/closure_017.php.expectf +++ b/hphp/test/zend/bad/zend/closure_017.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_020.php.expectf b/hphp/test/zend/bad/zend/closure_020.php.expectf index 0eca2c303..e45372b9a 100644 --- a/hphp/test/zend/bad/zend/closure_020.php.expectf +++ b/hphp/test/zend/bad/zend/closure_020.php.expectf @@ -14,4 +14,4 @@ object(foo)#%d (2) { } bool(true) bool(true) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_027.php.expectf b/hphp/test/zend/bad/zend/closure_027.php.expectf deleted file mode 100644 index c9807430a..000000000 --- a/hphp/test/zend/bad/zend/closure_027.php.expectf +++ /dev/null @@ -1,8 +0,0 @@ -object(stdClass)#%d (0) { -} -NULL -HipHop Notice: %a -HipHop Warning: %a -NULL - -HipHop Fatal error: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_033.php.expectf b/hphp/test/zend/bad/zend/closure_033.php.expectf deleted file mode 100644 index aa451a735..000000000 --- a/hphp/test/zend/bad/zend/closure_033.php.expectf +++ /dev/null @@ -1,2 +0,0 @@ -Test::{closure}() -HipHop Fatal error: %a \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_038.php.expectf b/hphp/test/zend/bad/zend/closure_038.php.expectf index 2fd3ef4c0..846911ad2 100644 --- a/hphp/test/zend/bad/zend/closure_038.php.expectf +++ b/hphp/test/zend/bad/zend/closure_038.php.expectf @@ -5,4 +5,4 @@ int(22) Testing with scope as string int(23) int(24) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_039.php.expectf b/hphp/test/zend/bad/zend/closure_039.php.expectf index 507665681..6ae71377b 100644 --- a/hphp/test/zend/bad/zend/closure_039.php.expectf +++ b/hphp/test/zend/bad/zend/closure_039.php.expectf @@ -5,4 +5,4 @@ int(22) Testing with scope as string int(23) int(24) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_040.php.expectf b/hphp/test/zend/bad/zend/closure_040.php.expectf index 301121e62..46ec0b688 100644 --- a/hphp/test/zend/bad/zend/closure_040.php.expectf +++ b/hphp/test/zend/bad/zend/closure_040.php.expectf @@ -1,6 +1,6 @@ -HipHop Notice: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Notice: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_041.php.expectf b/hphp/test/zend/bad/zend/closure_041.php.expectf index 058ce1cac..e7fff9fb3 100644 --- a/hphp/test/zend/bad/zend/closure_041.php.expectf +++ b/hphp/test/zend/bad/zend/closure_041.php.expectf @@ -16,14 +16,14 @@ scoped to A: bool(true) bound: no scoped to A: bool(true) bound: no -HipHop Warning: %a +HipHop Warning: %s After binding, with same-class instance for the bound ones -HipHop Warning: %a +HipHop Warning: %s scoped to A: bool(false) bound: no scoped to A: bool(false) bound: A (should be scoped to dummy class) -HipHop Warning: %a +HipHop Warning: %s scoped to A: bool(true) bound: no scoped to A: bool(true) diff --git a/hphp/test/zend/bad/zend/closure_043.php.expectf b/hphp/test/zend/bad/zend/closure_043.php.expectf index 7a1dcf456..04d8e8179 100644 --- a/hphp/test/zend/bad/zend/closure_043.php.expectf +++ b/hphp/test/zend/bad/zend/closure_043.php.expectf @@ -13,11 +13,11 @@ bool(false) bool(false) After binding, null scope, with instance -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) @@ -29,11 +29,11 @@ bool(true) bool(false) After binding, with scope, with instance -HipHop Warning: %a +HipHop Warning: %s bool(true) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(true) bool(false) diff --git a/hphp/test/zend/bad/zend/closure_045.php.expectf b/hphp/test/zend/bad/zend/closure_045.php.expectf index 354edaff8..c545a90e5 100644 --- a/hphp/test/zend/bad/zend/closure_045.php.expectf +++ b/hphp/test/zend/bad/zend/closure_045.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_046.php.expectf b/hphp/test/zend/bad/zend/closure_046.php.expectf index d60d9cd0c..5c67be617 100644 --- a/hphp/test/zend/bad/zend/closure_046.php.expectf +++ b/hphp/test/zend/bad/zend/closure_046.php.expectf @@ -12,7 +12,7 @@ bool(false) bool(true) bool(false) -HipHop Warning: %a +HipHop Warning: %s After binding, with same-class instance for the bound one bool(false) bool(true) diff --git a/hphp/test/zend/bad/zend/compare_001.php.expectf b/hphp/test/zend/bad/zend/compare_001.php.expectf index b47f3ac11..f4554c29a 100644 --- a/hphp/test/zend/bad/zend/compare_001.php.expectf +++ b/hphp/test/zend/bad/zend/compare_001.php.expectf @@ -44,13 +44,13 @@ int(1) != NULL int(1) == bool(true) int(1) != bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s == object(stdClass)#1 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s == object(stdClass)#2 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s == object(test)#3 (0) {} int(1) != array(0) {} int(1) != int(-2147483648) @@ -67,13 +67,13 @@ float(2.5) != NULL float(2.5) == bool(true) float(2.5) != bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#1 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#2 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(test)#3 (0) {} float(2.5) != array(0) {} float(2.5) != int(-2147483648) @@ -90,13 +90,13 @@ int(0) == NULL int(0) != bool(true) int(0) == bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#1 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#2 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s != object(test)#3 (0) {} int(0) != array(0) {} int(0) != int(-2147483648) @@ -206,13 +206,13 @@ bool(false) != string(11) "-2147483648" object(stdClass)#1 (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#1 (0) {} != string(0) "" object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(stdClass)#1 (0) {} != string(6) "string" object(stdClass)#1 (0) {} != string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#1 (0) {} == object(stdClass)#2 (0) {} object(stdClass)#1 (0) {} != object(test)#3 (0) {} object(stdClass)#1 (0) {} != array(0) {} object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-2147483648) object(stdClass)#1 (0) {} != string(11) "-2147483648" object(stdClass)#2 (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#2 (0) {} != string(0) "" object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(stdClass)#2 (0) {} != string(6) "string" object(stdClass)#2 (0) {} != string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#2 (0) {} == object(stdClass)#2 (0) {} object(stdClass)#2 (0) {} != object(test)#3 (0) {} object(stdClass)#2 (0) {} != array(0) {} object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-2147483648) object(stdClass)#2 (0) {} != string(11) "-2147483648" object(test)#3 (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#3 (0) {} != string(0) "" object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(test)#3 (0) {} != string(6) "string" object(test)#3 (0) {} != string(3) "123" @@ -275,7 +275,7 @@ object(test)#3 (0) {} != object(stdClass)#2 (0) {} object(test)#3 (0) {} == object(test)#3 (0) {} object(test)#3 (0) {} != array(0) {} object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-2147483648) object(test)#3 (0) {} != string(11) "-2147483648" array(0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-2147483648) != NULL int(-2147483648) == bool(true) int(-2147483648) != bool(false) int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#1 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#2 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s != object(test)#3 (0) {} int(-2147483648) != array(0) {} int(-2147483648) == int(-2147483648) diff --git a/hphp/test/zend/bad/zend/compare_001_64bit.php.expectf b/hphp/test/zend/bad/zend/compare_001_64bit.php.expectf index abf0c3c27..99f41cc2d 100644 --- a/hphp/test/zend/bad/zend/compare_001_64bit.php.expectf +++ b/hphp/test/zend/bad/zend/compare_001_64bit.php.expectf @@ -44,13 +44,13 @@ int(1) != NULL int(1) == bool(true) int(1) != bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s == object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s == object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s == object(test)#%d (0) {} int(1) != array(0) {} int(1) != int(-9223372036854775808) @@ -67,13 +67,13 @@ float(2.5) != NULL float(2.5) == bool(true) float(2.5) != bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s != object(test)#%d (0) {} float(2.5) != array(0) {} float(2.5) != int(-9223372036854775808) @@ -90,13 +90,13 @@ int(0) == NULL int(0) != bool(true) int(0) == bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s != object(test)#%d (0) {} int(0) != array(0) {} int(0) != int(-9223372036854775808) @@ -206,13 +206,13 @@ bool(false) != string(20) "-9223372036854775808" object(stdClass)#%d (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} != string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(stdClass)#%d (0) {} != string(6) "string" object(stdClass)#%d (0) {} != string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} != object(test)#%d (0) {} object(stdClass)#%d (0) {} != array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-9223372036854775808) object(stdClass)#%d (0) {} != string(20) "-9223372036854775808" object(stdClass)#%d (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} != string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(stdClass)#%d (0) {} != string(6) "string" object(stdClass)#%d (0) {} != string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#%d (0) {} == object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} != object(test)#%d (0) {} object(stdClass)#%d (0) {} != array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-9223372036854775808) object(stdClass)#%d (0) {} != string(20) "-9223372036854775808" object(test)#%d (0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#%d (0) {} != string(0) "" object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s == int(1) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != float(2.5) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(0) object(test)#%d (0) {} != string(6) "string" object(test)#%d (0) {} != string(3) "123" @@ -275,7 +275,7 @@ object(test)#%d (0) {} != object(stdClass)#%d (0) {} object(test)#%d (0) {} == object(test)#%d (0) {} object(test)#%d (0) {} != array(0) {} object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s != int(-9223372036854775808) object(test)#%d (0) {} != string(20) "-9223372036854775808" array(0) {} != array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-9223372036854775808) != NULL int(-9223372036854775808) == bool(true) int(-9223372036854775808) != bool(false) int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s != object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s != object(test)#%d (0) {} int(-9223372036854775808) != array(0) {} int(-9223372036854775808) == int(-9223372036854775808) diff --git a/hphp/test/zend/bad/zend/compare_003.php.expectf b/hphp/test/zend/bad/zend/compare_003.php.expectf index 25930796d..17a504862 100644 --- a/hphp/test/zend/bad/zend/compare_003.php.expectf +++ b/hphp/test/zend/bad/zend/compare_003.php.expectf @@ -44,13 +44,13 @@ int(1) > NULL int(1) <= bool(true) int(1) > bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(1) <= array(0) {} int(1) > int(-2147483648) @@ -67,13 +67,13 @@ float(2.5) > NULL float(2.5) <= bool(true) float(2.5) > bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#1 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#2 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(test)#3 (0) {} float(2.5) <= array(0) {} float(2.5) > int(-2147483648) @@ -90,13 +90,13 @@ int(0) <= NULL int(0) <= bool(true) int(0) <= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(0) <= array(0) {} int(0) > int(-2147483648) @@ -206,13 +206,13 @@ bool(false) <= string(11) "-2147483648" object(stdClass)#1 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#1 (0) {} > string(0) "" object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#1 (0) {} > string(6) "string" object(stdClass)#1 (0) {} > string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#1 (0) {} <= object(stdClass)#2 (0) {} object(stdClass)#1 (0) {} <= object(test)#3 (0) {} object(stdClass)#1 (0) {} > array(0) {} object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(stdClass)#1 (0) {} > string(11) "-2147483648" object(stdClass)#2 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#2 (0) {} > string(0) "" object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#2 (0) {} > string(6) "string" object(stdClass)#2 (0) {} > string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#2 (0) {} <= object(stdClass)#2 (0) {} object(stdClass)#2 (0) {} <= object(test)#3 (0) {} object(stdClass)#2 (0) {} > array(0) {} object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(stdClass)#2 (0) {} > string(11) "-2147483648" object(test)#3 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#3 (0) {} > string(0) "" object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(test)#3 (0) {} > string(6) "string" object(test)#3 (0) {} > string(3) "123" @@ -275,7 +275,7 @@ object(test)#3 (0) {} <= object(stdClass)#2 (0) {} object(test)#3 (0) {} <= object(test)#3 (0) {} object(test)#3 (0) {} > array(0) {} object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(test)#3 (0) {} > string(11) "-2147483648" array(0) {} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-2147483648) > NULL int(-2147483648) <= bool(true) int(-2147483648) > bool(false) int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(-2147483648) <= array(0) {} int(-2147483648) <= int(-2147483648) diff --git a/hphp/test/zend/bad/zend/compare_003_64bit.php.expectf b/hphp/test/zend/bad/zend/compare_003_64bit.php.expectf index 8a41e16bb..ff6f44806 100644 --- a/hphp/test/zend/bad/zend/compare_003_64bit.php.expectf +++ b/hphp/test/zend/bad/zend/compare_003_64bit.php.expectf @@ -44,13 +44,13 @@ int(1) > NULL int(1) <= bool(true) int(1) > bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(1) <= array(0) {} int(1) > int(-9223372036854775808) @@ -67,13 +67,13 @@ float(2.5) > NULL float(2.5) <= bool(true) float(2.5) > bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(test)#%d (0) {} float(2.5) <= array(0) {} float(2.5) > int(-9223372036854775808) @@ -90,13 +90,13 @@ int(0) <= NULL int(0) <= bool(true) int(0) <= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(0) <= array(0) {} int(0) > int(-9223372036854775808) @@ -206,13 +206,13 @@ bool(false) <= string(20) "-9223372036854775808" object(stdClass)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} > string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#%d (0) {} > string(6) "string" object(stdClass)#%d (0) {} > string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} <= object(test)#%d (0) {} object(stdClass)#%d (0) {} > array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(stdClass)#%d (0) {} > string(20) "-9223372036854775808" object(stdClass)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} > string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#%d (0) {} > string(6) "string" object(stdClass)#%d (0) {} > string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} <= object(test)#%d (0) {} object(stdClass)#%d (0) {} > array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(stdClass)#%d (0) {} > string(20) "-9223372036854775808" object(test)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#%d (0) {} > string(0) "" object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(test)#%d (0) {} > string(6) "string" object(test)#%d (0) {} > string(3) "123" @@ -275,7 +275,7 @@ object(test)#%d (0) {} <= object(stdClass)#%d (0) {} object(test)#%d (0) {} <= object(test)#%d (0) {} object(test)#%d (0) {} > array(0) {} object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(test)#%d (0) {} > string(20) "-9223372036854775808" array(0) {} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-9223372036854775808) > NULL int(-9223372036854775808) <= bool(true) int(-9223372036854775808) > bool(false) int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(-9223372036854775808) <= array(0) {} int(-9223372036854775808) <= int(-9223372036854775808) diff --git a/hphp/test/zend/bad/zend/compare_004.php.expectf b/hphp/test/zend/bad/zend/compare_004.php.expectf index c29a4170d..d026bdd04 100644 --- a/hphp/test/zend/bad/zend/compare_004.php.expectf +++ b/hphp/test/zend/bad/zend/compare_004.php.expectf @@ -44,13 +44,13 @@ int(1) >= NULL int(1) >= bool(true) int(1) >= bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#1 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#2 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#3 (0) {} int(1) < array(0) {} int(1) >= int(-2147483648) @@ -67,13 +67,13 @@ float(2.5) >= NULL float(2.5) >= bool(true) float(2.5) >= bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#1 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#2 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#3 (0) {} float(2.5) < array(0) {} float(2.5) >= int(-2147483648) @@ -90,13 +90,13 @@ int(0) >= NULL int(0) < bool(true) int(0) >= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#1 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#2 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(test)#3 (0) {} int(0) < array(0) {} int(0) >= int(-2147483648) @@ -206,13 +206,13 @@ bool(false) < string(11) "-2147483648" object(stdClass)#1 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#1 (0) {} >= string(0) "" object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#1 (0) {} >= string(6) "string" object(stdClass)#1 (0) {} >= string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#1 (0) {} >= object(stdClass)#2 (0) {} object(stdClass)#1 (0) {} >= object(test)#3 (0) {} object(stdClass)#1 (0) {} >= array(0) {} object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(stdClass)#1 (0) {} >= string(11) "-2147483648" object(stdClass)#2 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#2 (0) {} >= string(0) "" object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#2 (0) {} >= string(6) "string" object(stdClass)#2 (0) {} >= string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#2 (0) {} >= object(stdClass)#2 (0) {} object(stdClass)#2 (0) {} >= object(test)#3 (0) {} object(stdClass)#2 (0) {} >= array(0) {} object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(stdClass)#2 (0) {} >= string(11) "-2147483648" object(test)#3 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#3 (0) {} >= string(0) "" object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(test)#3 (0) {} >= string(6) "string" object(test)#3 (0) {} >= string(3) "123" @@ -275,7 +275,7 @@ object(test)#3 (0) {} >= object(stdClass)#2 (0) {} object(test)#3 (0) {} >= object(test)#3 (0) {} object(test)#3 (0) {} >= array(0) {} object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(test)#3 (0) {} >= string(11) "-2147483648" array(0) {} < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-2147483648) >= NULL int(-2147483648) >= bool(true) int(-2147483648) >= bool(false) int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#1 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#2 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(test)#3 (0) {} int(-2147483648) < array(0) {} int(-2147483648) >= int(-2147483648) diff --git a/hphp/test/zend/bad/zend/compare_004_64bit.php.expectf b/hphp/test/zend/bad/zend/compare_004_64bit.php.expectf index ad12b0966..ea7737b11 100644 --- a/hphp/test/zend/bad/zend/compare_004_64bit.php.expectf +++ b/hphp/test/zend/bad/zend/compare_004_64bit.php.expectf @@ -44,13 +44,13 @@ int(1) >= NULL int(1) >= bool(true) int(1) >= bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#%d (0) {} int(1) < array(0) {} int(1) >= int(-9223372036854775808) @@ -67,13 +67,13 @@ float(2.5) >= NULL float(2.5) >= bool(true) float(2.5) >= bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#%d (0) {} float(2.5) < array(0) {} float(2.5) >= int(-9223372036854775808) @@ -90,13 +90,13 @@ int(0) >= NULL int(0) < bool(true) int(0) >= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(test)#%d (0) {} int(0) < array(0) {} int(0) >= int(-9223372036854775808) @@ -206,13 +206,13 @@ bool(false) < string(20) "-9223372036854775808" object(stdClass)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} >= string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#%d (0) {} >= string(6) "string" object(stdClass)#%d (0) {} >= string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} >= object(test)#%d (0) {} object(stdClass)#%d (0) {} >= array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808" object(stdClass)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} >= string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#%d (0) {} >= string(6) "string" object(stdClass)#%d (0) {} >= string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} >= object(test)#%d (0) {} object(stdClass)#%d (0) {} >= array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808" object(test)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#%d (0) {} >= string(0) "" object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(test)#%d (0) {} >= string(6) "string" object(test)#%d (0) {} >= string(3) "123" @@ -275,7 +275,7 @@ object(test)#%d (0) {} >= object(stdClass)#%d (0) {} object(test)#%d (0) {} >= object(test)#%d (0) {} object(test)#%d (0) {} >= array(0) {} object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(test)#%d (0) {} >= string(20) "-9223372036854775808" array(0) {} < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-9223372036854775808) >= NULL int(-9223372036854775808) >= bool(true) int(-9223372036854775808) >= bool(false) int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(test)#%d (0) {} int(-9223372036854775808) < array(0) {} int(-9223372036854775808) >= int(-9223372036854775808) diff --git a/hphp/test/zend/bad/zend/compare_005.php.expectf b/hphp/test/zend/bad/zend/compare_005.php.expectf index 5e9364bea..8433403a8 100644 --- a/hphp/test/zend/bad/zend/compare_005.php.expectf +++ b/hphp/test/zend/bad/zend/compare_005.php.expectf @@ -44,13 +44,13 @@ int(1) >= NULL int(1) >= bool(true) int(1) >= bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#1 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#2 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#3 (0) {} int(1) < array(0) {} int(1) >= int(-2147483648) @@ -67,13 +67,13 @@ float(2.5) >= NULL float(2.5) >= bool(true) float(2.5) >= bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#1 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#2 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#3 (0) {} float(2.5) < array(0) {} float(2.5) >= int(-2147483648) @@ -90,13 +90,13 @@ int(0) >= NULL int(0) < bool(true) int(0) >= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#1 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#2 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(test)#3 (0) {} int(0) < array(0) {} int(0) >= int(-2147483648) @@ -206,13 +206,13 @@ bool(false) < string(11) "-2147483648" object(stdClass)#1 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#1 (0) {} >= string(0) "" object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#1 (0) {} >= string(6) "string" object(stdClass)#1 (0) {} >= string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#1 (0) {} >= object(stdClass)#2 (0) {} object(stdClass)#1 (0) {} < object(test)#3 (0) {} object(stdClass)#1 (0) {} >= array(0) {} object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(stdClass)#1 (0) {} >= string(11) "-2147483648" object(stdClass)#2 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#2 (0) {} >= string(0) "" object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#2 (0) {} >= string(6) "string" object(stdClass)#2 (0) {} >= string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#2 (0) {} >= object(stdClass)#2 (0) {} object(stdClass)#2 (0) {} < object(test)#3 (0) {} object(stdClass)#2 (0) {} >= array(0) {} object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(stdClass)#2 (0) {} >= string(11) "-2147483648" object(test)#3 (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#3 (0) {} >= string(0) "" object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(test)#3 (0) {} >= string(6) "string" object(test)#3 (0) {} >= string(3) "123" @@ -275,7 +275,7 @@ object(test)#3 (0) {} < object(stdClass)#2 (0) {} object(test)#3 (0) {} >= object(test)#3 (0) {} object(test)#3 (0) {} >= array(0) {} object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-2147483648) object(test)#3 (0) {} >= string(11) "-2147483648" array(0) {} < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-2147483648) >= NULL int(-2147483648) >= bool(true) int(-2147483648) >= bool(false) int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#1 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#2 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s < object(test)#3 (0) {} int(-2147483648) < array(0) {} int(-2147483648) >= int(-2147483648) diff --git a/hphp/test/zend/bad/zend/compare_005_64bit.php.expectf b/hphp/test/zend/bad/zend/compare_005_64bit.php.expectf index 3ae14e89f..868c0be4a 100644 --- a/hphp/test/zend/bad/zend/compare_005_64bit.php.expectf +++ b/hphp/test/zend/bad/zend/compare_005_64bit.php.expectf @@ -44,13 +44,13 @@ int(1) >= NULL int(1) >= bool(true) int(1) >= bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#%d (0) {} int(1) < array(0) {} int(1) >= int(-9223372036854775808) @@ -67,13 +67,13 @@ float(2.5) >= NULL float(2.5) >= bool(true) float(2.5) >= bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s >= object(test)#%d (0) {} float(2.5) < array(0) {} float(2.5) >= int(-9223372036854775808) @@ -90,13 +90,13 @@ int(0) >= NULL int(0) < bool(true) int(0) >= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s < object(test)#%d (0) {} int(0) < array(0) {} int(0) >= int(-9223372036854775808) @@ -206,13 +206,13 @@ bool(false) < string(20) "-9223372036854775808" object(stdClass)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} >= string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#%d (0) {} >= string(6) "string" object(stdClass)#%d (0) {} >= string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} < object(test)#%d (0) {} object(stdClass)#%d (0) {} >= array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808" object(stdClass)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} >= string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(stdClass)#%d (0) {} >= string(6) "string" object(stdClass)#%d (0) {} >= string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#%d (0) {} >= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} < object(test)#%d (0) {} object(stdClass)#%d (0) {} >= array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(stdClass)#%d (0) {} >= string(20) "-9223372036854775808" object(test)#%d (0) {} >= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#%d (0) {} >= string(0) "" object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(1) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s < float(2.5) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(0) object(test)#%d (0) {} >= string(6) "string" object(test)#%d (0) {} >= string(3) "123" @@ -275,7 +275,7 @@ object(test)#%d (0) {} < object(stdClass)#%d (0) {} object(test)#%d (0) {} >= object(test)#%d (0) {} object(test)#%d (0) {} >= array(0) {} object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s >= int(-9223372036854775808) object(test)#%d (0) {} >= string(20) "-9223372036854775808" array(0) {} < array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-9223372036854775808) >= NULL int(-9223372036854775808) >= bool(true) int(-9223372036854775808) >= bool(false) int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s < object(test)#%d (0) {} int(-9223372036854775808) < array(0) {} int(-9223372036854775808) >= int(-9223372036854775808) diff --git a/hphp/test/zend/bad/zend/compare_006.php.expectf b/hphp/test/zend/bad/zend/compare_006.php.expectf index 721ec4b25..1ee370c18 100644 --- a/hphp/test/zend/bad/zend/compare_006.php.expectf +++ b/hphp/test/zend/bad/zend/compare_006.php.expectf @@ -44,13 +44,13 @@ int(1) > NULL int(1) <= bool(true) int(1) > bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(1) <= array(0) {} int(1) > int(-2147483648) @@ -67,13 +67,13 @@ float(2.5) > NULL float(2.5) <= bool(true) float(2.5) > bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#1 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#2 (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(test)#3 (0) {} float(2.5) <= array(0) {} float(2.5) > int(-2147483648) @@ -90,13 +90,13 @@ int(0) <= NULL int(0) <= bool(true) int(0) <= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(0) <= array(0) {} int(0) > int(-2147483648) @@ -206,13 +206,13 @@ bool(false) <= string(11) "-2147483648" object(stdClass)#1 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#1 (0) {} > string(0) "" object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#1 (0) {} > string(6) "string" object(stdClass)#1 (0) {} > string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#1 (0) {} <= object(stdClass)#2 (0) {} object(stdClass)#1 (0) {} > object(test)#3 (0) {} object(stdClass)#1 (0) {} > array(0) {} object(stdClass)#1 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(stdClass)#1 (0) {} > string(11) "-2147483648" object(stdClass)#2 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#2 (0) {} > string(0) "" object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#2 (0) {} > string(6) "string" object(stdClass)#2 (0) {} > string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#2 (0) {} <= object(stdClass)#2 (0) {} object(stdClass)#2 (0) {} > object(test)#3 (0) {} object(stdClass)#2 (0) {} > array(0) {} object(stdClass)#2 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(stdClass)#2 (0) {} > string(11) "-2147483648" object(test)#3 (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#3 (0) {} > string(0) "" object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(test)#3 (0) {} > string(6) "string" object(test)#3 (0) {} > string(3) "123" @@ -275,7 +275,7 @@ object(test)#3 (0) {} > object(stdClass)#2 (0) {} object(test)#3 (0) {} <= object(test)#3 (0) {} object(test)#3 (0) {} > array(0) {} object(test)#3 (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-2147483648) object(test)#3 (0) {} > string(11) "-2147483648" array(0) {} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-2147483648) > NULL int(-2147483648) <= bool(true) int(-2147483648) > bool(false) int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#1 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#2 (0) {} int(-2147483648) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#3 (0) {} int(-2147483648) <= array(0) {} int(-2147483648) <= int(-2147483648) diff --git a/hphp/test/zend/bad/zend/compare_006_64bit.php.expectf b/hphp/test/zend/bad/zend/compare_006_64bit.php.expectf index a304fe14d..fe68f613d 100644 --- a/hphp/test/zend/bad/zend/compare_006_64bit.php.expectf +++ b/hphp/test/zend/bad/zend/compare_006_64bit.php.expectf @@ -44,13 +44,13 @@ int(1) > NULL int(1) <= bool(true) int(1) > bool(false) int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(1) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(1) <= array(0) {} int(1) > int(-9223372036854775808) @@ -67,13 +67,13 @@ float(2.5) > NULL float(2.5) <= bool(true) float(2.5) > bool(false) float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(stdClass)#%d (0) {} float(2.5) -HipHop Notice: %a +HipHop Notice: %s > object(test)#%d (0) {} float(2.5) <= array(0) {} float(2.5) > int(-9223372036854775808) @@ -90,13 +90,13 @@ int(0) <= NULL int(0) <= bool(true) int(0) <= bool(false) int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(0) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(0) <= array(0) {} int(0) > int(-9223372036854775808) @@ -206,13 +206,13 @@ bool(false) <= string(20) "-9223372036854775808" object(stdClass)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} > string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#%d (0) {} > string(6) "string" object(stdClass)#%d (0) {} > string(3) "123" @@ -225,19 +225,19 @@ object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} > object(test)#%d (0) {} object(stdClass)#%d (0) {} > array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(stdClass)#%d (0) {} > string(20) "-9223372036854775808" object(stdClass)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(stdClass)#%d (0) {} > string(0) "" object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(stdClass)#%d (0) {} > string(6) "string" object(stdClass)#%d (0) {} > string(3) "123" @@ -250,19 +250,19 @@ object(stdClass)#%d (0) {} <= object(stdClass)#%d (0) {} object(stdClass)#%d (0) {} > object(test)#%d (0) {} object(stdClass)#%d (0) {} > array(0) {} object(stdClass)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(stdClass)#%d (0) {} > string(20) "-9223372036854775808" object(test)#%d (0) {} > array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} object(test)#%d (0) {} > string(0) "" object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= int(1) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s <= float(2.5) object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(0) object(test)#%d (0) {} > string(6) "string" object(test)#%d (0) {} > string(3) "123" @@ -275,7 +275,7 @@ object(test)#%d (0) {} > object(stdClass)#%d (0) {} object(test)#%d (0) {} <= object(test)#%d (0) {} object(test)#%d (0) {} > array(0) {} object(test)#%d (0) {} -HipHop Notice: %a +HipHop Notice: %s > int(-9223372036854775808) object(test)#%d (0) {} > string(20) "-9223372036854775808" array(0) {} <= array(3) { [0]=> int(1) [1]=> int(2) [2]=> int(3)} @@ -307,13 +307,13 @@ int(-9223372036854775808) > NULL int(-9223372036854775808) <= bool(true) int(-9223372036854775808) > bool(false) int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(stdClass)#%d (0) {} int(-9223372036854775808) -HipHop Notice: %a +HipHop Notice: %s <= object(test)#%d (0) {} int(-9223372036854775808) <= array(0) {} int(-9223372036854775808) <= int(-9223372036854775808) diff --git a/hphp/test/zend/bad/zend/const_dereference_002.php b/hphp/test/zend/bad/zend/const_dereference_002.php new file mode 100644 index 000000000..454047f51 --- /dev/null +++ b/hphp/test/zend/bad/zend/const_dereference_002.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/dval_to_lval_32.php.expectf b/hphp/test/zend/bad/zend/dval_to_lval_32.php.expectf new file mode 100644 index 000000000..cc8b21671 --- /dev/null +++ b/hphp/test/zend/bad/zend/dval_to_lval_32.php.expectf @@ -0,0 +1,6 @@ +int(-2056257536) +int(-2055733248) +int(-2055208960) +int(-2054684672) +int(-2054160384) +int(2147483647) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/dval_to_lval_64.php b/hphp/test/zend/bad/zend/dval_to_lval_64.php new file mode 100644 index 000000000..d7901735b --- /dev/null +++ b/hphp/test/zend/bad/zend/dval_to_lval_64.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/dval_to_lval_64.php.expectf b/hphp/test/zend/bad/zend/dval_to_lval_64.php.expectf new file mode 100644 index 000000000..2551b92c3 --- /dev/null +++ b/hphp/test/zend/bad/zend/dval_to_lval_64.php.expectf @@ -0,0 +1,5 @@ +int(2943463994971652096) +int(2943463994972176384) +int(2943463994972700672) +int(2943463994973224960) +int(2943463994973749248) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/dynamic_call_001.php.expectf b/hphp/test/zend/bad/zend/dynamic_call_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/dynamic_call_001.php.expectf +++ b/hphp/test/zend/bad/zend/dynamic_call_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/empty_with_expr.php b/hphp/test/zend/bad/zend/empty_with_expr.php new file mode 100644 index 000000000..a13dc5312 --- /dev/null +++ b/hphp/test/zend/bad/zend/empty_with_expr.php @@ -0,0 +1,18 @@ +__destruct() #1 {main} diff --git a/hphp/test/zend/bad/zend/exception_009.php.expectf b/hphp/test/zend/bad/zend/exception_009.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/exception_009.php.expectf +++ b/hphp/test/zend/bad/zend/exception_009.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/exception_010.php.expectf b/hphp/test/zend/bad/zend/exception_010.php.expectf index ca12b2195..c5faaafc1 100644 --- a/hphp/test/zend/bad/zend/exception_010.php.expectf +++ b/hphp/test/zend/bad/zend/exception_010.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/exception_before_fatal.php b/hphp/test/zend/bad/zend/exception_before_fatal.php new file mode 100644 index 000000000..95d6a52a0 --- /dev/null +++ b/hphp/test/zend/bad/zend/exception_before_fatal.php @@ -0,0 +1,53 @@ +a(); +} catch(Exception $e) { + var_dump($e->getMessage()); +} + +try { + new $foo(); +} catch(Exception $e) { + var_dump($e->getMessage()); +} + +try { + throw $foo; +} catch(Exception $e) { + var_dump($e->getMessage()); +} + +try { + $foo(); +} catch(Exception $e) { + var_dump($e->getMessage()); +} + +try { + $foo::b(); +} catch(Exception $e) { + var_dump($e->getMessage()); +} + + +try { + $b = clone $foo; +} catch(Exception $e) { + var_dump($e->getMessage()); +} + +class b { +} + +try { + b::$foo(); +} catch(Exception $e) { + var_dump($e->getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/exception_before_fatal.php.expectf b/hphp/test/zend/bad/zend/exception_before_fatal.php.expectf new file mode 100644 index 000000000..c5d81def1 --- /dev/null +++ b/hphp/test/zend/bad/zend/exception_before_fatal.php.expectf @@ -0,0 +1,7 @@ +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" +string(23) "Undefined variable: foo" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/exception_handler_002.php.expectf b/hphp/test/zend/bad/zend/exception_handler_002.php.expectf index eb3e010cf..86a463868 100644 --- a/hphp/test/zend/bad/zend/exception_handler_002.php.expectf +++ b/hphp/test/zend/bad/zend/exception_handler_002.php.expectf @@ -1,5 +1,5 @@ string(12) "test thrown!" -HipHop Fatal error: %a +HipHop Fatal error: %s Stack trace: #0 [internal function]: foo(Object(test)) #1 {main} diff --git a/hphp/test/zend/bad/zend/exception_handler_004.php.expectf b/hphp/test/zend/bad/zend/exception_handler_004.php.expectf index 1c1bc515b..e8d06f44e 100644 --- a/hphp/test/zend/bad/zend/exception_handler_004.php.expectf +++ b/hphp/test/zend/bad/zend/exception_handler_004.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/foreach_list_001.php b/hphp/test/zend/bad/zend/foreach_list_001.php new file mode 100644 index 000000000..635aec1b4 --- /dev/null +++ b/hphp/test/zend/bad/zend/foreach_list_001.php @@ -0,0 +1,31 @@ + list(list($a, $b), list($c, $d))) { + var_dump($key . $a . $b . $c . $d); +} + + +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/foreach_list_001.php.expectf b/hphp/test/zend/bad/zend/foreach_list_001.php.expectf new file mode 100644 index 000000000..9860698b8 --- /dev/null +++ b/hphp/test/zend/bad/zend/foreach_list_001.php.expectf @@ -0,0 +1,8 @@ +string(2) "12" +string(2) "34" +string(2) "ab" +string(2) "cd" +string(4) "1234" +string(4) "5678" +string(5) "01234" +string(5) "15678" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/foreach_list_002.php b/hphp/test/zend/bad/zend/foreach_list_002.php new file mode 100644 index 000000000..6088a1b2d --- /dev/null +++ b/hphp/test/zend/bad/zend/foreach_list_002.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/foreach_list_002.php.expectf b/hphp/test/zend/bad/zend/foreach_list_002.php.expectf new file mode 100644 index 000000000..d7e0b2ff4 --- /dev/null +++ b/hphp/test/zend/bad/zend/foreach_list_002.php.expectf @@ -0,0 +1,7 @@ +int(1) +int(3) +string(1) "b" +HipHop Notice: %s +string(0) "" +HipHop Notice: %s +string(0) "" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/fr47160.php.expectf b/hphp/test/zend/bad/zend/fr47160.php.expectf index b00e0a906..909812f78 100644 --- a/hphp/test/zend/bad/zend/fr47160.php.expectf +++ b/hphp/test/zend/bad/zend/fr47160.php.expectf @@ -1,11 +1,11 @@ Strict Standards: Non-static method Hello::world() should not be called statically in hphp/test/zend/bad/zend/fr47160.phpt on line %d Hello, you -HipHop Notice: %a +HipHop Notice: %s NULL Strict Standards: call_user_func() expects parameter 1 to be a valid callback, non-static method Hello::world() should not be called statically in hphp/test/zend/bad/zend/fr47160.phpt on line %d Hello, you -HipHop Notice: %a +HipHop Notice: %s NULL ----- Hello, again diff --git a/hphp/test/zend/bad/zend/function_exists_error.php.expectf b/hphp/test/zend/bad/zend/function_exists_error.php.expectf index 1e148bd06..22b317756 100644 --- a/hphp/test/zend/bad/zend/function_exists_error.php.expectf +++ b/hphp/test/zend/bad/zend/function_exists_error.php.expectf @@ -1,10 +1,10 @@ *** Testing function_exists() : error conditions *** Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/function_exists_variation1.php.expectf b/hphp/test/zend/bad/zend/function_exists_variation1.php.expectf index 1c7219df6..974567ab3 100644 --- a/hphp/test/zend/bad/zend/function_exists_variation1.php.expectf +++ b/hphp/test/zend/bad/zend/function_exists_variation1.php.expectf @@ -18,13 +18,13 @@ bool(false) -- Iteration 9 -- bool(false) -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- bool(false) @@ -41,7 +41,7 @@ bool(false) -- Iteration 19 -- bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- bool(false) diff --git a/hphp/test/zend/bad/zend/get_called_class_001.php.expectf b/hphp/test/zend/bad/zend/get_called_class_001.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/bad/zend/get_called_class_001.php.expectf +++ b/hphp/test/zend/bad/zend/get_called_class_001.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/zend/halt_compiler2.php b/hphp/test/zend/bad/zend/halt_compiler2.php similarity index 96% rename from hphp/test/zend/good/zend/halt_compiler2.php rename to hphp/test/zend/bad/zend/halt_compiler2.php index 8ec84be32..efda2deed 100644 --- a/hphp/test/zend/good/zend/halt_compiler2.php +++ b/hphp/test/zend/bad/zend/halt_compiler2.php @@ -8,7 +8,8 @@ file_put_contents(dirname(__FILE__) . '/test2.php', $text); include dirname(__FILE__) . '/test1.php'; include dirname(__FILE__) . '/test2.php'; ?> -==DONE== + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/halt_compiler2.php.expectf b/hphp/test/zend/bad/zend/halt_compiler2.php.expectf similarity index 100% rename from hphp/test/zend/good/zend/halt_compiler2.php.expectf rename to hphp/test/zend/bad/zend/halt_compiler2.php.expectf diff --git a/hphp/test/zend/bad/zend/halt_compiler3.php.expectf b/hphp/test/zend/bad/zend/halt_compiler3.php.expectf index 1b94e8ebc..53c415832 100644 --- a/hphp/test/zend/bad/zend/halt_compiler3.php.expectf +++ b/hphp/test/zend/bad/zend/halt_compiler3.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a +HipHop Notice: %s ==DONE== \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/halt_compiler4.php.expectf b/hphp/test/zend/bad/zend/halt_compiler4.php.expectf index 0136aab3f..2ff4b661d 100644 --- a/hphp/test/zend/bad/zend/halt_compiler4.php.expectf +++ b/hphp/test/zend/bad/zend/halt_compiler4.php.expectf @@ -1 +1 @@ -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/heredoc_009.php.expectf b/hphp/test/zend/bad/zend/heredoc_009.php.expectf index 46fb03d08..1fca3c11b 100644 --- a/hphp/test/zend/bad/zend/heredoc_009.php.expectf +++ b/hphp/test/zend/bad/zend/heredoc_009.php.expectf @@ -1,10 +1,10 @@ -HipHop Notice: %a +HipHop Notice: %s ENDOFHEREDOC ; ENDOFHEREDOC; ENDOFHEREDOC ENDOFHEREDOC ; -HipHop Notice: %a +HipHop Notice: %s ENDOFHEREDOC ; ENDOFHEREDOC; ENDOFHEREDOC diff --git a/hphp/test/zend/bad/zend/indexing_001.php.expectf b/hphp/test/zend/bad/zend/indexing_001.php.expectf index 9221c0f6e..e98c70154 100644 --- a/hphp/test/zend/bad/zend/indexing_001.php.expectf +++ b/hphp/test/zend/bad/zend/indexing_001.php.expectf @@ -6,11 +6,11 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s int(0) -HipHop Warning: %a +HipHop Warning: %s int(1) -HipHop Warning: %a +HipHop Warning: %s bool(true) array(1) { ["foo"]=> @@ -26,10 +26,10 @@ array(1) { int(1) } } -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s string(1) "A" -HipHop Warning: %a +HipHop Warning: %s float(0.1) array(1) { ["foo"]=> @@ -47,11 +47,11 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s int(0) -HipHop Warning: %a +HipHop Warning: %s int(1) -HipHop Warning: %a +HipHop Warning: %s bool(true) array(1) { ["foo"]=> @@ -67,7 +67,7 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s float(0.1) array(1) { ["foo"]=> @@ -84,11 +84,11 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s int(0) -HipHop Warning: %a +HipHop Warning: %s int(1) -HipHop Warning: %a +HipHop Warning: %s bool(true) array(1) { [0]=> @@ -104,7 +104,7 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s float(0.1) array(1) { [0]=> @@ -122,11 +122,11 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s int(0) -HipHop Warning: %a +HipHop Warning: %s int(1) -HipHop Warning: %a +HipHop Warning: %s bool(true) array(1) { [0]=> @@ -142,7 +142,7 @@ array(1) { int(1) } } -HipHop Warning: %a +HipHop Warning: %s float(0.1) array(1) { [0]=> diff --git a/hphp/test/zend/bad/zend/indirect_call_array_003.php.expectf b/hphp/test/zend/bad/zend/indirect_call_array_003.php.expectf index 6fad149ca..c9c15d1f6 100644 --- a/hphp/test/zend/bad/zend/indirect_call_array_003.php.expectf +++ b/hphp/test/zend/bad/zend/indirect_call_array_003.php.expectf @@ -1,6 +1,6 @@ From foo::__callStatic: string(3) "abc" -HipHop Notice: %a +HipHop Notice: %s NULL From foo::__call: string(3) "abc" diff --git a/hphp/test/zend/bad/zend/inter_007.php.expectf b/hphp/test/zend/bad/zend/inter_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/inter_007.php.expectf +++ b/hphp/test/zend/bad/zend/inter_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/interface_exists_001.php.expectf b/hphp/test/zend/bad/zend/interface_exists_001.php.expectf index 1ab42e625..c3ef11015 100644 --- a/hphp/test/zend/bad/zend/interface_exists_001.php.expectf +++ b/hphp/test/zend/bad/zend/interface_exists_001.php.expectf @@ -1,5 +1,5 @@ bool(true) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/isset_003.php.expectf b/hphp/test/zend/bad/zend/isset_003.php.expectf index b8878ac6e..f55a16e2f 100644 --- a/hphp/test/zend/bad/zend/isset_003.php.expectf +++ b/hphp/test/zend/bad/zend/isset_003.php.expectf @@ -2,9 +2,9 @@ bool(true) bool(true) bool(false) bool(false) -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s bool(false) bool(true) bool(false) diff --git a/hphp/test/zend/bad/zend/isset_003_2_4.php.expectf b/hphp/test/zend/bad/zend/isset_003_2_4.php.expectf index b8878ac6e..f55a16e2f 100644 --- a/hphp/test/zend/bad/zend/isset_003_2_4.php.expectf +++ b/hphp/test/zend/bad/zend/isset_003_2_4.php.expectf @@ -2,9 +2,9 @@ bool(true) bool(true) bool(false) bool(false) -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s bool(false) bool(true) bool(false) diff --git a/hphp/test/zend/bad/zend/list_005.php.expectf b/hphp/test/zend/bad/zend/list_005.php.expectf index ce3c5f827..9dfcb9a26 100644 --- a/hphp/test/zend/bad/zend/list_005.php.expectf +++ b/hphp/test/zend/bad/zend/list_005.php.expectf @@ -6,4 +6,4 @@ NULL NULL NULL ---- -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_002.php.expectf b/hphp/test/zend/bad/zend/magic_methods_002.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_002.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_002.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_003.php.expectf b/hphp/test/zend/bad/zend/magic_methods_003.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_003.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_003.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_004.php.expectf b/hphp/test/zend/bad/zend/magic_methods_004.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_004.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_004.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_005.php.expectf b/hphp/test/zend/bad/zend/magic_methods_005.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_005.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_005.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_006.php.expectf b/hphp/test/zend/bad/zend/magic_methods_006.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_006.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_006.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_007.php.expectf b/hphp/test/zend/bad/zend/magic_methods_007.php.expectf index 4f3b1c58b..952830e88 100644 --- a/hphp/test/zend/bad/zend/magic_methods_007.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_007.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_008.php.expectf b/hphp/test/zend/bad/zend/magic_methods_008.php.expectf index 4f3b1c58b..952830e88 100644 --- a/hphp/test/zend/bad/zend/magic_methods_008.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_008.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_009.php.expectf b/hphp/test/zend/bad/zend/magic_methods_009.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/magic_methods_009.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_009.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/magic_methods_010.php.expectf b/hphp/test/zend/bad/zend/magic_methods_010.php.expectf index 4f3b1c58b..952830e88 100644 --- a/hphp/test/zend/bad/zend/magic_methods_010.php.expectf +++ b/hphp/test/zend/bad/zend/magic_methods_010.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/ns_033.php.expectf b/hphp/test/zend/bad/zend/ns_033.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/bad/zend/ns_033.php.expectf +++ b/hphp/test/zend/bad/zend/ns_033.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/ns_059.php.expectf b/hphp/test/zend/bad/zend/ns_059.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/ns_059.php.expectf +++ b/hphp/test/zend/bad/zend/ns_059.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/ns_075.php.expectf b/hphp/test/zend/bad/zend/ns_075.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/ns_075.php.expectf +++ b/hphp/test/zend/bad/zend/ns_075.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/objects_013.php.expectf b/hphp/test/zend/bad/zend/objects_013.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/objects_013.php.expectf +++ b/hphp/test/zend/bad/zend/objects_013.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/objects_014.php.expectf b/hphp/test/zend/bad/zend/objects_014.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/objects_014.php.expectf +++ b/hphp/test/zend/bad/zend/objects_014.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/objects_029.php.expectf b/hphp/test/zend/bad/zend/objects_029.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/objects_029.php.expectf +++ b/hphp/test/zend/bad/zend/objects_029.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/objects_030.php.expectf b/hphp/test/zend/bad/zend/objects_030.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/bad/zend/objects_030.php.expectf +++ b/hphp/test/zend/bad/zend/objects_030.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/offset_array.php.expectf b/hphp/test/zend/bad/zend/offset_array.php.expectf index a3dc3bbf6..4af57c879 100644 --- a/hphp/test/zend/bad/zend/offset_array.php.expectf +++ b/hphp/test/zend/bad/zend/offset_array.php.expectf @@ -1,16 +1,16 @@ int(2) int(1) -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL int(2) int(1) Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in hphp/test/zend/bad/zend/offset_array.phpt on line %d int(%d) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/offset_assign.php b/hphp/test/zend/bad/zend/offset_assign.php index fdbcf3f15..e5f7fa513 100644 --- a/hphp/test/zend/bad/zend/offset_assign.php +++ b/hphp/test/zend/bad/zend/offset_assign.php @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/offset_assign.php.expectf b/hphp/test/zend/bad/zend/offset_assign.php.expectf index 4f3b1c58b..952830e88 100644 --- a/hphp/test/zend/bad/zend/offset_assign.php.expectf +++ b/hphp/test/zend/bad/zend/offset_assign.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/offset_string.php.expectf b/hphp/test/zend/bad/zend/offset_string.php.expectf index fa5cada33..2181a2bc1 100644 --- a/hphp/test/zend/bad/zend/offset_string.php.expectf +++ b/hphp/test/zend/bad/zend/offset_string.php.expectf @@ -1,24 +1,24 @@ string(1) "i" -HipHop Notice: %a +HipHop Notice: %s string(1) "S" -HipHop Notice: %a +HipHop Notice: %s string(1) "S" -HipHop Warning: %a +HipHop Warning: %s string(1) "S" string(1) "c" -HipHop Warning: %a +HipHop Warning: %s string(1) "o" -HipHop Notice: %a +HipHop Notice: %s string(1) "r" -HipHop Notice: %a +HipHop Notice: %s string(1) "i" -HipHop Notice: %a +HipHop Notice: %s string(1) "S" -HipHop Warning: %a +HipHop Warning: %s string(1) "%s" -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s string(1) "%s" -HipHop Warning: %a +HipHop Warning: %s string(1) "i" Done \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/result_unused.php.expectf b/hphp/test/zend/bad/zend/result_unused.php.expectf index b22b5e687..b7b095c27 100644 --- a/hphp/test/zend/bad/zend/result_unused.php.expectf +++ b/hphp/test/zend/bad/zend/result_unused.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a +HipHop Notice: %s ok \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/settype_resource.php.expectf b/hphp/test/zend/bad/zend/settype_resource.php.expectf index 379cd2da1..ab2296942 100644 Binary files a/hphp/test/zend/bad/zend/settype_resource.php.expectf and b/hphp/test/zend/bad/zend/settype_resource.php.expectf differ diff --git a/hphp/test/zend/bad/zend/settype_string.php.expectf b/hphp/test/zend/bad/zend/settype_string.php.expectf index 0c1841d6f..e4a8da4d3 100644 Binary files a/hphp/test/zend/bad/zend/settype_string.php.expectf and b/hphp/test/zend/bad/zend/settype_string.php.expectf differ diff --git a/hphp/test/zend/bad/zend/str_offset_001.php.expectf b/hphp/test/zend/bad/zend/str_offset_001.php.expectf index dd9825877..ffbbddc1c 100644 --- a/hphp/test/zend/bad/zend/str_offset_001.php.expectf +++ b/hphp/test/zend/bad/zend/str_offset_001.php.expectf @@ -1,20 +1,20 @@ -HipHop Notice: %a +HipHop Notice: %s string(0) "" string(1) "a" string(1) "b" string(1) "c" -HipHop Notice: %a +HipHop Notice: %s string(0) "" string(1) "b" -HipHop Notice: %a +HipHop Notice: %s string(0) "" -HipHop Notice: %a +HipHop Notice: %s string(0) "" string(1) "a" string(1) "b" string(1) "c" -HipHop Notice: %a +HipHop Notice: %s string(0) "" string(1) "b" -HipHop Notice: %a +HipHop Notice: %s string(0) "" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/trait_exists_001.php.expectf b/hphp/test/zend/bad/zend/trait_exists_001.php.expectf index 1ab42e625..c3ef11015 100644 --- a/hphp/test/zend/bad/zend/trait_exists_001.php.expectf +++ b/hphp/test/zend/bad/zend/trait_exists_001.php.expectf @@ -1,5 +1,5 @@ bool(true) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_001.php b/hphp/test/zend/bad/zend/try_catch_finally_001.php new file mode 100644 index 000000000..98c5993f5 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_001.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_001.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_001.php.expectf new file mode 100644 index 000000000..c41c2a8a2 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_001.php.expectf @@ -0,0 +1 @@ +1234int(1) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_002.php b/hphp/test/zend/bad/zend/try_catch_finally_002.php new file mode 100644 index 000000000..4eb4c4304 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_002.php @@ -0,0 +1,37 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_002.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_002.php.expectf new file mode 100644 index 000000000..707c8a773 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_002.php.expectf @@ -0,0 +1 @@ +123456int(7) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_003.php b/hphp/test/zend/bad/zend/try_catch_finally_003.php new file mode 100644 index 000000000..4ba0c85d8 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_003.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_003.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_003.php.expectf new file mode 100644 index 000000000..0a28858cd --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_003.php.expectf @@ -0,0 +1 @@ +1234int(4) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_004.php b/hphp/test/zend/bad/zend/try_catch_finally_004.php new file mode 100644 index 000000000..a040938a5 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_004.php @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_004.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_004.php.expectf new file mode 100644 index 000000000..88bab6551 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_004.php.expectf @@ -0,0 +1,3 @@ +string(3) "try" +string(7) "finally" +string(8) "finally2" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_005.php b/hphp/test/zend/bad/zend/try_catch_finally_005.php new file mode 100644 index 000000000..ffb9dec7a --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_005.php @@ -0,0 +1,36 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_005.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_005.php.expectf new file mode 100644 index 000000000..1c7af8ee1 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_005.php.expectf @@ -0,0 +1,10 @@ +string(5) "break" +string(9) "continue1" +string(9) "continue1" +string(9) "continue2" +string(7) "finally" +string(9) "continue2" +string(8) "cactched" +string(7) "finally" +string(9) "continue2" +string(7) "finally" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_006.php b/hphp/test/zend/bad/zend/try_catch_finally_006.php new file mode 100644 index 000000000..a55baf4b9 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_006.php @@ -0,0 +1,25 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_006.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_006.php.expectf new file mode 100644 index 000000000..2cf7b6f34 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_006.php.expectf @@ -0,0 +1,8 @@ +string(8) "finally1" +string(8) "finally2" +string(5) "label" +string(7) "return2" +string(8) "finally1" +string(7) "catched" +string(8) "finally2" +string(7) "return1" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_007.php b/hphp/test/zend/bad/zend/try_catch_finally_007.php new file mode 100644 index 000000000..af96cd617 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_007.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_catch_finally_007.php.expectf b/hphp/test/zend/bad/zend/try_catch_finally_007.php.expectf new file mode 100644 index 000000000..1be88b0ca --- /dev/null +++ b/hphp/test/zend/bad/zend/try_catch_finally_007.php.expectf @@ -0,0 +1,9 @@ +string(8) "finally1" +string(7) "catched" +string(8) "finally2" +string(5) "label" +NULL +string(8) "finally1" +string(7) "catched" +string(8) "finally2" +string(6) "return" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_001.php b/hphp/test/zend/bad/zend/try_finally_001.php new file mode 100644 index 000000000..beda8603b --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_001.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_001.php.expectf b/hphp/test/zend/bad/zend/try_finally_001.php.expectf new file mode 100644 index 000000000..5cefa2c89 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_001.php.expectf @@ -0,0 +1,6 @@ +string(7) "finally" +HipHop Fatal error: %s +Stack trace: +#0 %stry_finally_001.php(%d): foo('finally') +#1 {main} + thrown in %stry_finally_001.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_002.php b/hphp/test/zend/bad/zend/try_finally_002.php new file mode 100644 index 000000000..cb3bac000 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_002.php @@ -0,0 +1,17 @@ +getMessage()); + } while ($e = $e->getPrevious()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_002.php.expectf b/hphp/test/zend/bad/zend/try_finally_002.php.expectf new file mode 100644 index 000000000..a2d12de68 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_002.php.expectf @@ -0,0 +1,2 @@ +string(7) "finally" +string(3) "try" \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_003.php b/hphp/test/zend/bad/zend/try_finally_003.php new file mode 100644 index 000000000..b20f22428 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_003.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_003.php.expectf b/hphp/test/zend/bad/zend/try_finally_003.php.expectf new file mode 100644 index 000000000..f8fd14e47 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_003.php.expectf @@ -0,0 +1,6 @@ +1234 +HipHop Fatal error: %s +Stack trace: +#0 %stry_finally_003.php(%d): foo() +#1 {main} + thrown in %stry_finally_003.php on line %d \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_006.php b/hphp/test/zend/bad/zend/try_finally_006.php new file mode 100644 index 000000000..aa985c80d --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_006.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_006.php.expectf b/hphp/test/zend/bad/zend/try_finally_006.php.expectf new file mode 100644 index 000000000..91d13a1e6 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_006.php.expectf @@ -0,0 +1,2 @@ +label +okey \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/try_finally_010.php b/hphp/test/zend/bad/zend/try_finally_010.php new file mode 100644 index 000000000..158a58572 --- /dev/null +++ b/hphp/test/zend/bad/zend/try_finally_010.php @@ -0,0 +1,25 @@ +setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +examine_diff($end, $start, 'P+0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type2_prev_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +examine_diff($end, $start, 'P+0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type2_prev_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +examine_diff($end, $start, 'P+0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type2_prev_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +examine_diff($end, $start, 'P+0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type2_dt_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P-0Y0M0DT5H31M52S', 0); + +echo "test_time_fall_type2_dt_type3_dt: "; +$end = new DateTime('2010-11-07 00:15:35'); // sp dt, zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT0H5M15S', 0); + +echo "test_time_fall_type2_dt_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type2_dt_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type2_dt_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type2_dt_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +examine_diff($end, $start, 'P+0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type2_redodt_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P-0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type2_redodt_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P-0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type2_redodt_type3_redodt: "; +$end = new DateTime('2010-11-07 01:15:35 EDT'); // sp redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT0H3M2S', 0); + +echo "test_time_fall_type2_redodt_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type2_redodt_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P+0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type2_redodt_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +examine_diff($end, $start, 'P+0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type2_redost_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P-0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type2_redost_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P-0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type2_redost_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P-0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type2_redost_type3_redost: "; +$end = new DateTime('2010-11-07 01:16:54 EST'); // sp redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P+0Y0M0DT0H2M10S', 0); + +echo "test_time_fall_type2_redost_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P+0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type2_redost_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +examine_diff($end, $start, 'P+0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type2_st_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P-0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type2_st_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P-0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type2_st_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P-0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type2_st_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P-0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type2_st_type3_st: "; +$end = new DateTime('2010-11-07 05:19:56'); // sp st, zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P+0Y0M0DT2H3M1S', 0); + +echo "test_time_fall_type2_st_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +examine_diff($end, $start, 'P+0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type2_post_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +examine_diff($end, $start, 'P-0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type2_post_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +examine_diff($end, $start, 'P-0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type2_post_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +examine_diff($end, $start, 'P-0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type2_post_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +examine_diff($end, $start, 'P-0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type2_post_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +examine_diff($end, $start, 'P-0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type2_post_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-08 18:57:55 EST'); // sp post, zt2 +examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0); + +echo "test_time_fall_type2_dtsec_type3_stsec: "; +$end = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0); + +echo "test_time_fall_type2_stsec_type3_dtsec: "; +$end = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0); diff --git a/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type2.inc b/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type2.inc new file mode 100644 index 000000000..51ef5ff52 --- /dev/null +++ b/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type2.inc @@ -0,0 +1,227 @@ +setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type3_prev_type2_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type3_prev_type2_st: "; +$end = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type3_prev_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type3_dt_type2_prev: "; +$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P-0Y0M0DT5H31M52S', 0); + +echo "test_time_fall_type3_dt_type2_dt: "; +$end = new DateTime('2010-11-07 00:15:35 EDT'); // sp dt, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H5M15S', 0); + +echo "test_time_fall_type3_dt_type2_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type3_dt_type2_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type3_dt_type2_st: "; +$end = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type3_dt_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type3_redodt_type2_prev: "; +$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type3_redodt_type2_dt: "; +$end = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type3_redodt_type2_redodt: "; +$end = new DateTime('2010-11-07 01:15:35 EDT'); // sp redodt, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H3M2S', 0); + +echo "test_time_fall_type3_redodt_type2_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type3_redodt_type2_st: "; +$end = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type3_redodt_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type3_redost_type2_prev: "; +$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type3_redost_type2_dt: "; +$end = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type3_redost_type2_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type3_redost_type2_redost: "; +$end = new DateTime('2010-11-07 01:16:54 EST'); // sp redodt, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H2M10S', 0); + +echo "test_time_fall_type3_redost_type2_st: "; +$end = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type3_redost_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type3_st_type2_prev: "; +$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type3_st_type2_dt: "; +$end = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type3_st_type2_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type3_st_type2_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type3_st_type2_st: "; +$end = new DateTime('2010-11-07 05:19:56 EST'); // sp st, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H3M1S', 0); + +echo "test_time_fall_type3_st_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P+0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type3_post_type2_prev: "; +$end = new DateTime('2010-11-06 18:38:28 EDT'); // prev, zt2 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type3_post_type2_dt: "; +$end = new DateTime('2010-11-07 00:10:20 EDT'); // dt, zt2 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type3_post_type2_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type3_post_type2_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type3_post_type2_st: "; +$end = new DateTime('2010-11-07 03:16:55 EST'); // st, zt2 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type3_post_type2_post: "; +$end = new DateTime('2010-11-08 19:59:59 EST'); // post, zt2 +$start = new DateTime('2010-11-08 18:57:55'); // sp post, zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0); + +echo "test_time_fall_type3_dtsec_type2_stsec: "; +$end = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +$start = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0); + +echo "test_time_fall_type3_stsec_type2_dtsec: "; +$end = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +$start = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0); diff --git a/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type3.inc b/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type3.inc new file mode 100644 index 000000000..48c1c332a --- /dev/null +++ b/hphp/test/zend/good/ext-date/DateTime_data-fall-type3-type3.inc @@ -0,0 +1,239 @@ +setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type3_prev_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type3_prev_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type3_prev_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +examine_diff($end, $start, 'P+0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type3_dt_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P-0Y0M0DT5H31M52S', 0); + +echo "test_time_fall_type3_dt_type3_dt: "; +$end = new DateTime('2010-11-07 00:15:35'); // sp dt, zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H5M15S', 0); + +echo "test_time_fall_type3_dt_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type3_dt_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type3_dt_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type3_dt_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +examine_diff($end, $start, 'P+0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type3_redodt_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT6H34M5S', 0); + +echo "test_time_fall_type3_redodt_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT1H2M13S', 0); + +echo "test_time_fall_type3_redodt_type3_redodt: "; +$end = new DateTime('2010-11-07 01:15:35 EDT'); // sp redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H3M2S', 0); + +echo "test_time_fall_type3_redodt_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type3_redodt_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type3_redodt_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type3_redost_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT7H36M16S', 0); + +echo "test_time_fall_type3_redost_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT2H4M24S', 0); + +echo "test_time_fall_type3_redost_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT1H2M11S', 0); + +echo "test_time_fall_type3_redost_type3_redost: "; +$end = new DateTime('2010-11-07 01:16:54 EST'); // sp redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H2M10S', 0); + +echo "test_time_fall_type3_redost_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type3_redost_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type3_st_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT9H38M27S', 0); + +echo "test_time_fall_type3_st_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT4H6M35S', 0); + +echo "test_time_fall_type3_st_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT3H4M22S', 0); + +echo "test_time_fall_type3_st_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P-0Y0M0DT2H2M11S', 0); + +echo "test_time_fall_type3_st_type3_st: "; +$end = new DateTime('2010-11-07 05:19:56'); // sp st, zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P+0Y0M0DT2H3M1S', 0); + +echo "test_time_fall_type3_st_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-07 03:16:55'); // st, zt3 +examine_diff($end, $start, 'P+0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type3_post_type3_prev: "; +$end = new DateTime('2010-11-06 18:38:28'); // prev, zt3 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M2DT1H21M31S', 2); + +echo "test_time_fall_type3_post_type3_dt: "; +$end = new DateTime('2010-11-07 00:10:20'); // dt, zt3 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT20H49M39S', 1); + +echo "test_time_fall_type3_post_type3_redodt: "; +$end = new DateTime('2010-11-07 01:12:33 EDT'); // redodt, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT19H47M26S', 1); + +echo "test_time_fall_type3_post_type3_redost: "; +$end = new DateTime('2010-11-07 01:14:44 EST'); // redost, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT18H45M15S', 1); + +echo "test_time_fall_type3_post_type3_st: "; +$end = new DateTime('2010-11-07 03:16:55'); // st, zt3 +$start = new DateTime('2010-11-08 19:59:59'); // post, zt3 +examine_diff($end, $start, 'P-0Y0M1DT16H43M4S', 1); + +echo "test_time_fall_type3_post_type3_post: "; +$end = new DateTime('2010-11-08 19:59:59'); // post, zt3 +$start = new DateTime('2010-11-08 18:57:55'); // sp post, zt3 +examine_diff($end, $start, 'P+0Y0M0DT1H2M4S', 0); + +echo "test_time_fall_type3_dtsec_type3_stsec: "; +$end = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P+0Y0M0DT0H0M1S', 0); + +echo "test_time_fall_type3_stsec_type3_dtsec: "; +$end = new DateTime('2010-11-07 01:59:59 EDT'); // dtsec, zt2 +$end->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +$start = new DateTime('2010-11-07 01:00:00 EST'); // stsec, zt2 +$start->setTimezone(new DateTimeZone('America/New_York')); // zt2 -> zt3 +examine_diff($end, $start, 'P-0Y0M0DT0H0M1S', 0); diff --git a/hphp/test/zend/good/ext-date/DateTime_data-february.inc b/hphp/test/zend/good/ext-date/DateTime_data-february.inc new file mode 100644 index 000000000..cc9d85df0 --- /dev/null +++ b/hphp/test/zend/good/ext-date/DateTime_data-february.inc @@ -0,0 +1,217 @@ +setDate(333333, 1, 1); +$end->setTime(16, 18, 02); + +$start = new DateTime; +$start->setDate(-333333, 1, 1); +$start->setTime(16, 18, 02); + +examine_diff($end, $start, 'P+666666Y0M0DT0H0M0S', 243494757); + +echo "test_massive_negative: "; +$end = new DateTime; +$end->setDate(-333333, 1, 1); +$end->setTime(16, 18, 02); + +$start = new DateTime; +$start->setDate(333333, 1, 1); +$start->setTime(16, 18, 02); + +examine_diff($end, $start, 'P-666666Y0M0DT0H0M0S', 243494757); diff --git a/hphp/test/zend/good/ext-date/DateTime_data-spring-type2-type2.inc b/hphp/test/zend/good/ext-date/DateTime_data-spring-type2-type2.inc new file mode 100644 index 000000000..d9e07c313 --- /dev/null +++ b/hphp/test/zend/good/ext-date/DateTime_data-spring-type2-type2.inc @@ -0,0 +1,109 @@ + + */ + +/**#@+ + * Which test segments should be displayed? + */ +define('PHPT_DATETIME_SHOW_DIFF', 1); +define('PHPT_DATETIME_SHOW_DAYS', 2); +define('PHPT_DATETIME_SHOW_ADD', 3); +define('PHPT_DATETIME_SHOW_SUB', 4); +/**#@-*/ + +/** + * Provides a consistent interface for executing date diff/add/sub tests + * + * @param string|DateTime $end_date the end date in YYYY-MM-DD format + * (can include time HH:MM:SS) or a DateTime object + * @param string|DateTime $start_date the start date in YYYY-MM-DD format + * (can include time HH:MM:SS) or a DateTime object + * @param string $expect_spec the expected result of the tests, in the + * special interval specification used for this test suite. + * This spec includes a "+" or "-" after the "P" in order to + * indicate which direction to go. + * @param int $expect_days the number of days to compare with the + * interval's "days" property + * @param bool $absolute should the result always be a positive number? + * + * @return void + */ +function examine_diff($end_date, $start_date, $expect_spec, $expect_days, $absolute = false) { + if (is_string($start_date)) { + $start = new DateTime($start_date); + } else { + $start = $start_date; + } + $start_date = $start->format('Y-m-d H:i:s T'); + + if (is_string($end_date)) { + $end = new DateTime($end_date); + } else { + $end = $end_date; + } + $end_date = $end->format('Y-m-d H:i:s T'); + + $expect_interval = new DateInterval('P' . substr($expect_spec, 2)); + if (substr($expect_spec, 1, 1) == '-') { + $expect_interval->invert = true; + } + + if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_DIFF) { + $result_interval = $start->diff($end, $absolute); + $result_spec = $result_interval->format('P%R%yY%mM%dDT%hH%iM%sS'); + echo "DIFF: $end_date - $start_date = **$result_spec**\n"; + // echo "DIFF: $end_date - $start_date = **$expect_spec**\n"; + } + if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_DAYS) { + $result_interval = $start->diff($end, $absolute); + $result_days = $result_interval->format('%a'); + echo "DAYS: **$result_days**\n"; + // echo "DAYS: **$expect_days**\n"; + } + if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_ADD) { + $start->add($expect_interval); + $result_end_date = $start->format('Y-m-d H:i:s T'); + echo "ADD: $start_date + $expect_spec = **$result_end_date**\n"; + // echo "ADD: $start_date + $expect_spec = **$end_date**\n"; + } + if (PHPT_DATETIME_SHOW == PHPT_DATETIME_SHOW_SUB) { + $end->sub($expect_interval); + $result_start_date = $end->format('Y-m-d H:i:s T'); + echo "SUB: $end_date - $expect_spec = **$result_start_date**\n"; + // echo "SUB: $end_date - $expect_spec = **$start_date**\n"; + } +} diff --git a/hphp/test/zend/bad/ext-date/getdate_variation7.php b/hphp/test/zend/good/ext-date/getdate_variation7.php similarity index 100% rename from hphp/test/zend/bad/ext-date/getdate_variation7.php rename to hphp/test/zend/good/ext-date/getdate_variation7.php diff --git a/hphp/test/zend/bad/ext-date/getdate_variation7.php.expectregex b/hphp/test/zend/good/ext-date/getdate_variation7.php.expectregex similarity index 100% rename from hphp/test/zend/bad/ext-date/getdate_variation7.php.expectregex rename to hphp/test/zend/good/ext-date/getdate_variation7.php.expectregex diff --git a/hphp/test/zend/good/ext-date/gettimeofday_error.php.expectf b/hphp/test/zend/good/ext-date/gettimeofday_error.php.expectf index 7afb6f525..95e2815cb 100644 --- a/hphp/test/zend/good/ext-date/gettimeofday_error.php.expectf +++ b/hphp/test/zend/good/ext-date/gettimeofday_error.php.expectf @@ -1,6 +1,6 @@ *** Testing gettimeofday() : error conditions *** -- Testing gettimeofday() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-date/localtime_variation3.php b/hphp/test/zend/good/ext-date/localtime_variation3.php similarity index 100% rename from hphp/test/zend/bad/ext-date/localtime_variation3.php rename to hphp/test/zend/good/ext-date/localtime_variation3.php diff --git a/hphp/test/zend/bad/ext-date/localtime_variation3.php.expectregex b/hphp/test/zend/good/ext-date/localtime_variation3.php.expectregex similarity index 100% rename from hphp/test/zend/bad/ext-date/localtime_variation3.php.expectregex rename to hphp/test/zend/good/ext-date/localtime_variation3.php.expectregex diff --git a/hphp/test/zend/bad/ext-date/strtotime.php b/hphp/test/zend/good/ext-date/strtotime.php similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime.php rename to hphp/test/zend/good/ext-date/strtotime.php diff --git a/hphp/test/zend/bad/ext-date/strtotime.php.expectf b/hphp/test/zend/good/ext-date/strtotime.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime.php.expectf rename to hphp/test/zend/good/ext-date/strtotime.php.expectf diff --git a/hphp/test/zend/bad/ext-date/strtotime_basic.php b/hphp/test/zend/good/ext-date/strtotime_basic.php similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime_basic.php rename to hphp/test/zend/good/ext-date/strtotime_basic.php diff --git a/hphp/test/zend/bad/ext-date/strtotime_basic.php.expectf b/hphp/test/zend/good/ext-date/strtotime_basic.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime_basic.php.expectf rename to hphp/test/zend/good/ext-date/strtotime_basic.php.expectf diff --git a/hphp/test/zend/bad/ext-date/strtotime_variation_scottish.php b/hphp/test/zend/good/ext-date/strtotime_variation_scottish.php similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime_variation_scottish.php rename to hphp/test/zend/good/ext-date/strtotime_variation_scottish.php diff --git a/hphp/test/zend/bad/ext-date/strtotime_variation_scottish.php.expectf b/hphp/test/zend/good/ext-date/strtotime_variation_scottish.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-date/strtotime_variation_scottish.php.expectf rename to hphp/test/zend/good/ext-date/strtotime_variation_scottish.php.expectf diff --git a/hphp/test/zend/good/ext-date/timezone_open_basic1.php.expectf b/hphp/test/zend/good/ext-date/timezone_open_basic1.php.expectf deleted file mode 100644 index 43e6c3620..000000000 --- a/hphp/test/zend/good/ext-date/timezone_open_basic1.php.expectf +++ /dev/null @@ -1,8 +0,0 @@ -*** Testing timezone_open() : basic functionality *** -object(DateTimeZone)#%d (0) { -} -object(DateTimeZone)#%d (0) { -} -object(DateTimeZone)#%d (0) { -} -===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-date/timezones.php.expectf b/hphp/test/zend/good/ext-date/timezones.php.expectf index fb0fe31bb..292372e76 100644 --- a/hphp/test/zend/good/ext-date/timezones.php.expectf +++ b/hphp/test/zend/good/ext-date/timezones.php.expectf @@ -1,6 +1,6 @@ -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) bool(true) bool(true) diff --git a/hphp/test/zend/good/ext-exif/bug48378.php.expectf b/hphp/test/zend/good/ext-exif/bug48378.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/good/ext-exif/bug48378.php.expectf +++ b/hphp/test/zend/good/ext-exif/bug48378.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-exif/exif_tagname_error.php.expectf b/hphp/test/zend/good/ext-exif/exif_tagname_error.php.expectf index a96c6a6f9..fc32f9333 100644 --- a/hphp/test/zend/good/ext-exif/exif_tagname_error.php.expectf +++ b/hphp/test/zend/good/ext-exif/exif_tagname_error.php.expectf @@ -1,10 +1,10 @@ *** Testing exif_tagname() : error conditions *** -- Testing exif_tagname() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing exif_tagname() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-filter/007.php.expectf b/hphp/test/zend/good/ext-filter/007.php.expectf index 898503cc9..76354d5b5 100644 --- a/hphp/test/zend/good/ext-filter/007.php.expectf +++ b/hphp/test/zend/good/ext-filter/007.php.expectf @@ -3,22 +3,22 @@ bool(true) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(true) bool(true) bool(false) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) 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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-filter/008.php.expectf b/hphp/test/zend/good/ext-filter/008.php.expectf index fc66cec3c..41e833e56 100644 --- a/hphp/test/zend/good/ext-filter/008.php.expectf +++ b/hphp/test/zend/good/ext-filter/008.php.expectf @@ -40,6 +40,6 @@ array(20) { [19]=> string(8) "callback" } -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-filter/017.php.expectf b/hphp/test/zend/good/ext-filter/017.php.expectf index 6b8d4bbfd..355ac98cd 100644 --- a/hphp/test/zend/good/ext-filter/017.php.expectf +++ b/hphp/test/zend/good/ext-filter/017.php.expectf @@ -3,6 +3,6 @@ bool(false) string(4) "data" bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-filter/029.php.expectf b/hphp/test/zend/good/ext-filter/029.php.expectf index fa298a648..abf436467 100644 --- a/hphp/test/zend/good/ext-filter/029.php.expectf +++ b/hphp/test/zend/good/ext-filter/029.php.expectf @@ -1,11 +1,11 @@ string(4) "DATA" string(46) "~!@#$%^&*()_QWERTYUIOPASDFGHJKLZXCVBNM<>>?"}{:" string(0) "" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(4) "data" string(46) "~!@#$%^&*()_qwertyuiopasdfghjklzxcvbnm<>>?"}{:" diff --git a/hphp/test/zend/good/ext-filter/039.php.expectf b/hphp/test/zend/good/ext-filter/039.php.expectf index b73c986b3..b21a7a5c4 100644 --- a/hphp/test/zend/good/ext-filter/039.php.expectf +++ b/hphp/test/zend/good/ext-filter/039.php.expectf @@ -1,5 +1,5 @@ -- (1) -HipHop Warning: %a +HipHop Warning: %s NULL array(0) { } @@ -37,9 +37,9 @@ array(1) { string(0) "" } -- (5) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) array(1) { diff --git a/hphp/test/zend/good/ext-filter/055.php.expectf b/hphp/test/zend/good/ext-filter/055.php.expectf index 26ef15d31..e69b89866 100644 --- a/hphp/test/zend/good/ext-filter/055.php.expectf +++ b/hphp/test/zend/good/ext-filter/055.php.expectf @@ -10,8 +10,8 @@ string(17) "01:23:45:67:89:aB" bool(false) bool(false) string(14) "0123.4567.89ab" -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/bug37346.php.expectf b/hphp/test/zend/good/ext-gd/bug37346.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/bug37346.php.expectf +++ b/hphp/test/zend/good/ext-gd/bug37346.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/bug38112.php.expectf b/hphp/test/zend/good/ext-gd/bug38112.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/bug38112.php.expectf +++ b/hphp/test/zend/good/ext-gd/bug38112.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/bug38212.php.expectf b/hphp/test/zend/good/ext-gd/bug38212.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/bug38212.php.expectf +++ b/hphp/test/zend/good/ext-gd/bug38212.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/bug39286.php.expectf b/hphp/test/zend/good/ext-gd/bug39286.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/bug39286.php.expectf +++ b/hphp/test/zend/good/ext-gd/bug39286.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/colorclosest.php.expectf b/hphp/test/zend/good/ext-gd/colorclosest.php.expectf index 1ea75995e..9231ed20e 100644 --- a/hphp/test/zend/good/ext-gd/colorclosest.php.expectf +++ b/hphp/test/zend/good/ext-gd/colorclosest.php.expectf @@ -1,5 +1,5 @@ FF00FF -HipHop Warning: %a +HipHop Warning: %s Array ( [red] => 255 @@ -22,7 +22,7 @@ Array [alpha] => 0 ) 64FF00FF -HipHop Warning: %a +HipHop Warning: %s Array ( [red] => 255 diff --git a/hphp/test/zend/good/ext-gd/createfromstring.php.expectf b/hphp/test/zend/good/ext-gd/createfromstring.php.expectf index 5bb7d97e0..be37f6878 100644 --- a/hphp/test/zend/good/ext-gd/createfromstring.php.expectf +++ b/hphp/test/zend/good/ext-gd/createfromstring.php.expectf @@ -1,4 +1,4 @@ createfromstring truecolor png: ok createfromstring palette png: ok -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/createfromwbmp2_extern.php.expectf b/hphp/test/zend/good/ext-gd/createfromwbmp2_extern.php.expectf index 49900833b..6a195bff7 100644 --- a/hphp/test/zend/good/ext-gd/createfromwbmp2_extern.php.expectf +++ b/hphp/test/zend/good/ext-gd/createfromwbmp2_extern.php.expectf @@ -1,2 +1,2 @@ gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-gd/gd_info_basic.php b/hphp/test/zend/good/ext-gd/gd_info_basic.php similarity index 100% rename from hphp/test/zend/bad/ext-gd/gd_info_basic.php rename to hphp/test/zend/good/ext-gd/gd_info_basic.php diff --git a/hphp/test/zend/bad/ext-gd/gd_info_basic.php.expectf b/hphp/test/zend/good/ext-gd/gd_info_basic.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-gd/gd_info_basic.php.expectf rename to hphp/test/zend/good/ext-gd/gd_info_basic.php.expectf diff --git a/hphp/test/zend/good/ext-gd/imagearc_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagearc_error1.php.expectf index c28dfbdc5..39f775bcb 100644 --- a/hphp/test/zend/good/ext-gd/imagearc_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagearc_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s abebb25b5a2813cfbf92f1f24365786a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagechar_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagechar_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagechar_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagechar_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecharup_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagecharup_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagecharup_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecharup_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecolorallocate_error.php.expectf b/hphp/test/zend/good/ext-gd/imagecolorallocate_error.php.expectf index a64d1feb0..5a4c9c022 100644 --- a/hphp/test/zend/good/ext-gd/imagecolorallocate_error.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecolorallocate_error.php.expectf @@ -1,12 +1,12 @@ *** Testing imagecolorallocate() : error conditions *** -- Testing imagecolorallocate() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing imagecolorallocate() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecolordeallocate_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagecolordeallocate_error3.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-gd/imagecolordeallocate_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecolordeallocate_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecolordeallocate_error4.php.expectf b/hphp/test/zend/good/ext-gd/imagecolordeallocate_error4.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-gd/imagecolordeallocate_error4.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecolordeallocate_error4.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecolormatch_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagecolormatch_error1.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-gd/imagecolormatch_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecolormatch_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imageconvolution_error2.php.expectf b/hphp/test/zend/good/ext-gd/imageconvolution_error2.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-gd/imageconvolution_error2.php.expectf +++ b/hphp/test/zend/good/ext-gd/imageconvolution_error2.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imageconvolution_error3.php.expectf b/hphp/test/zend/good/ext-gd/imageconvolution_error3.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-gd/imageconvolution_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imageconvolution_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecopymerge_error.php.expectf b/hphp/test/zend/good/ext-gd/imagecopymerge_error.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagecopymerge_error.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecopymerge_error.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php b/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php index 2c7c9c2fc..af3771c1d 100644 --- a/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php +++ b/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php @@ -27,9 +27,9 @@ imagefilledellipse($image_lge, 200, 150, 300, 200, $col_ellipse); imagepng($image_lge, $dest_lge); // Get new dimensions -$percent = 0.5; // new image 50% of orginal +$percent = 0.5; // new image 50% of original list($width, $height) = getimagesize($dest_lge); -echo "Size of orginal: width=". $width . " height=" . $height . "\n"; +echo "Size of original: width=". $width . " height=" . $height . "\n"; $new_width = $width * $percent; $new_height = $height * $percent; diff --git a/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php.expectf b/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php.expectf index de855d0ed..8761e0a4a 100644 --- a/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecopyresampled_basic.php.expectf @@ -1,4 +1,4 @@ Simple test of imagecopyresampled() function -Size of orginal: width=400 height=300 +Size of original: width=400 height=300 Size of copy: width=200 height=150 Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error1.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error2.php.expectf b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error2.php.expectf index 2759cbbf6..cf639493a 100644 --- a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error2.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error2.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error3.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagecreatetruecolor_error3.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imageellipse_error8.php.expectf b/hphp/test/zend/good/ext-gd/imageellipse_error8.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imageellipse_error8.php.expectf +++ b/hphp/test/zend/good/ext-gd/imageellipse_error8.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagefilledarc_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagefilledarc_error1.php.expectf index c28dfbdc5..39f775bcb 100644 --- a/hphp/test/zend/good/ext-gd/imagefilledarc_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagefilledarc_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s abebb25b5a2813cfbf92f1f24365786a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagefilledpolygon_negative.php.expectf b/hphp/test/zend/good/ext-gd/imagefilledpolygon_negative.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagefilledpolygon_negative.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagefilledpolygon_negative.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagefilter_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagefilter_error1.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-gd/imagefilter_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagefilter_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagefontheight_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagefontheight_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagefontheight_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagefontheight_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagefontwidth_error1.php.expectf b/hphp/test/zend/good/ext-gd/imagefontwidth_error1.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagefontwidth_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagefontwidth_error1.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imageinterlace_error1.php.expectf b/hphp/test/zend/good/ext-gd/imageinterlace_error1.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-gd/imageinterlace_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/imageinterlace_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagepolygon_negative.php.expectf b/hphp/test/zend/good/ext-gd/imagepolygon_negative.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagepolygon_negative.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagepolygon_negative.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagestring_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagestring_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagestring_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagestring_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagestringup_error3.php.expectf b/hphp/test/zend/good/ext-gd/imagestringup_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-gd/imagestringup_error3.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagestringup_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/imagetruecolortopalette_error4.php.expectf b/hphp/test/zend/good/ext-gd/imagetruecolortopalette_error4.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-gd/imagetruecolortopalette_error4.php.expectf +++ b/hphp/test/zend/good/ext-gd/imagetruecolortopalette_error4.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/jpeg2wbmp_error1.php.expectf b/hphp/test/zend/good/ext-gd/jpeg2wbmp_error1.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-gd/jpeg2wbmp_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/jpeg2wbmp_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/lines.php.expectf b/hphp/test/zend/good/ext-gd/lines.php.expectf index d3e821005..856703dec 100644 --- a/hphp/test/zend/good/ext-gd/lines.php.expectf +++ b/hphp/test/zend/good/ext-gd/lines.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s Horizontal: ok Vertical: ok Diagonal: ok diff --git a/hphp/test/zend/good/ext-gd/png2wbmp_error1.php.expectf b/hphp/test/zend/good/ext-gd/png2wbmp_error1.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-gd/png2wbmp_error1.php.expectf +++ b/hphp/test/zend/good/ext-gd/png2wbmp_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-gd/png2wbmp_error2.php.expectf b/hphp/test/zend/good/ext-gd/png2wbmp_error2.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/good/ext-gd/png2wbmp_error2.php.expectf +++ b/hphp/test/zend/good/ext-gd/png2wbmp_error2.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-hash/hash_error.php.expectf b/hphp/test/zend/good/ext-hash/hash_error.php.expectf index 64039e638..bab60e277 100644 --- a/hphp/test/zend/good/ext-hash/hash_error.php.expectf +++ b/hphp/test/zend/good/ext-hash/hash_error.php.expectf @@ -1,16 +1,16 @@ *** Testing hash() : error conditions *** -- Testing hash() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hash() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hash() function with invalid hash algorithm -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-hash/hash_hmac_error.php.expectf b/hphp/test/zend/good/ext-hash/hash_hmac_error.php.expectf index 6c1d5323e..4946ea045 100644 --- a/hphp/test/zend/good/ext-hash/hash_hmac_error.php.expectf +++ b/hphp/test/zend/good/ext-hash/hash_hmac_error.php.expectf @@ -1,18 +1,18 @@ *** Testing hash_hmac() : error conditions *** -- Testing hash_hmac() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hash_hmac() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hash_hmac() function with invalid hash algorithm -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php.expectf b/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php.expectf index 791f75634..905d6b349 100644 --- a/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php.expectf +++ b/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php.expectf @@ -1,16 +1,16 @@ *** Testing hash() : error conditions *** -- Testing hash_hmac_file() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hash_hmac_file() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing hash_hmac_file() function with invalid hash algorithm -- -HipHop Warning: %a +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv-charset-length-cve-2007-4840.php.expectf index d4531bf89..79fe1faf3 100644 --- a/hphp/test/zend/good/ext-iconv/iconv-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv-charset-length-cve-2007-4840.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_mime_decode-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_mime_decode-charset-length-cve-2007-4840.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_mime_decode-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_mime_decode-charset-length-cve-2007-4840.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_mime_decode_headers-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_mime_decode_headers-charset-length-cve-2007-4840.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_mime_decode_headers-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_mime_decode_headers-charset-length-cve-2007-4840.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_set_encoding-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_set_encoding-charset-length-cve-2007-4840.php.expectf index b9f09a619..f6e30c63f 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_set_encoding-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_set_encoding-charset-length-cve-2007-4840.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) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_strlen-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_strlen-charset-length-cve-2007-4840.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_strlen-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_strlen-charset-length-cve-2007-4840.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_strpos-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_strpos-charset-length-cve-2007-4840.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_strpos-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_strpos-charset-length-cve-2007-4840.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_strpos_variation5.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_strpos_variation5.php.expectf index 9e1fad78f..7cd07a7ea 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_strpos_variation5.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_strpos_variation5.php.expectf @@ -2,10 +2,10 @@ **-- Offset is: -10 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 0 --** diff --git a/hphp/test/zend/good/ext-iconv/iconv_strrpos-charset-length-cve-2007-4840.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_strrpos-charset-length-cve-2007-4840.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_strrpos-charset-length-cve-2007-4840.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_strrpos-charset-length-cve-2007-4840.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-iconv/iconv_substr-charset-length-cve-2007-4783.php.expectf b/hphp/test/zend/good/ext-iconv/iconv_substr-charset-length-cve-2007-4783.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-iconv/iconv_substr-charset-length-cve-2007-4783.php.expectf +++ b/hphp/test/zend/good/ext-iconv/iconv_substr-charset-length-cve-2007-4783.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-imap/imap_alerts_error.php.expectf b/hphp/test/zend/good/ext-imap/imap_alerts_error.php.expectf index 34223d729..0b483550b 100644 --- a/hphp/test/zend/good/ext-imap/imap_alerts_error.php.expectf +++ b/hphp/test/zend/good/ext-imap/imap_alerts_error.php.expectf @@ -1,6 +1,6 @@ *** Testing imap_alerts() : error conditions *** -- Testing imap_alerts() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/breakiter___construct.php b/hphp/test/zend/good/ext-intl/breakiter___construct.php new file mode 100644 index 000000000..c22ab06a4 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/breakiter___construct.php @@ -0,0 +1,4 @@ + 100); +var_dump(in_array('UTF-7', $avail)); +var_dump(in_array('CESU-8', $avail)); +var_dump(in_array('ISO-8859-1', $avail)); + +$latin1 = UConverter::getAliases('latin1'); +var_dump(in_array('ISO-8859-1', $latin1)); diff --git a/hphp/test/zend/good/ext-intl/uconverter_enum.php.expectf b/hphp/test/zend/good/ext-intl/uconverter_enum.php.expectf new file mode 100644 index 000000000..762719103 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_enum.php.expectf @@ -0,0 +1,5 @@ +bool(true) +bool(true) +bool(true) +bool(true) +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_func_basic.php b/hphp/test/zend/good/ext-intl/uconverter_func_basic.php new file mode 100644 index 000000000..621c5a823 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_func_basic.php @@ -0,0 +1,7 @@ +getSourceType()); +var_dump(UConverter::UTF8 === $c->getDestinationType()); + +$c = new UConverter('koi8-r', 'utf-32be'); +var_dump(UConverter::UTF32_BigEndian === $c->getSourceType()); +var_dump(UConverter::SBCS === $c->getDestinationType()); \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_algo.php.expectf b/hphp/test/zend/good/ext-intl/uconverter_oop_algo.php.expectf new file mode 100644 index 000000000..e0d298300 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_algo.php.expectf @@ -0,0 +1,4 @@ +bool(true) +bool(true) +bool(true) +bool(true) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php b/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php new file mode 100644 index 000000000..928ec30b4 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php @@ -0,0 +1,10 @@ +convert("This is an ascii string")); +// urlencode so that non-ascii shows up parsable in phpt file +var_dump(urlencode($c->convert("Espa\xF1ol"))); // U+00F1 LATIN SMALL LETTER N WITH TILDE +var_dump(urlencode($c->convert("Stra\xDFa"))); // U+00DF LATIN SMALL LETTER SHARP S +var_dump(urlencode($c->convert("Stra\xC3\x9Fa", true))); // Reverse prior op + +$k = new UConverter('utf-8', 'koi8-r'); +var_dump(bin2hex($k->convert("\xE4"))); // U+0414 CYRILLIC CAPITAL LETTER DE \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php.expectf b/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php.expectf new file mode 100644 index 000000000..8e13cbac9 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_basic.php.expectf @@ -0,0 +1,5 @@ +string(23) "This is an ascii string" +string(12) "Espa%C3%B1ol" +string(11) "Stra%C3%9Fa" +string(8) "Stra%DFa" +string(4) "d094" \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php b/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php new file mode 100644 index 000000000..fc03dafb2 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php @@ -0,0 +1,24 @@ +convert($word); +} \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php.expectf b/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php.expectf new file mode 100644 index 000000000..cd74017b8 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_callback.php.expectf @@ -0,0 +1,22 @@ +toUCallback(REASON_RESET, ...) +toUCallback(REASON_RESET, ...) +fromUCallback(REASON_RESET, ...) +fromUCallback(REASON_RESET, ...) +toUCallback(REASON_RESET, ...) +toUCallback(REASON_ILLEGAL, ...) +toUCallback(REASON_RESET, ...) +toUCallback(REASON_ILLEGAL, ...) +fromUCallback(REASON_RESET, ...) +fromUCallback(REASON_UNASSIGNED, ...) +fromUCallback(REASON_RESET, ...) +fromUCallback(REASON_UNASSIGNED, ...) +toUCallback(REASON_RESET, ...) +toUCallback(REASON_RESET, ...) +fromUCallback(REASON_RESET, ...) +fromUCallback(REASON_UNASSIGNED, ...) +fromUCallback(REASON_RESET, ...) +fromUCallback(REASON_UNASSIGNED, ...) +toUCallback(REASON_CLOSE, ...) +fromUCallback(REASON_CLOSE, ...) +toUCallback(REASON_CLOSE, ...) +fromUCallback(REASON_CLOSE, ...) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php b/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php new file mode 100644 index 000000000..8d4892adf --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php @@ -0,0 +1,32 @@ +convert("\x80\x81\x82\x83")); +// This line will trigger fromUCallback +var_dump($c->convert("\xC3\xB1\xC3\xB2\xC3\xB3\xC3\xB4")); \ No newline at end of file diff --git a/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php.expectf b/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php.expectf new file mode 100644 index 000000000..c78515eb9 --- /dev/null +++ b/hphp/test/zend/good/ext-intl/uconverter_oop_callback_return.php.expectf @@ -0,0 +1,2 @@ +string(3) "abc" +string(3) "ABC" \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/003.php b/hphp/test/zend/good/ext-json/003.php deleted file mode 100644 index 208334bca..000000000 --- a/hphp/test/zend/good/ext-json/003.php +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/003.php.expectf b/hphp/test/zend/good/ext-json/003.php.expectf deleted file mode 100644 index 9cc8ea1e6..000000000 --- a/hphp/test/zend/good/ext-json/003.php.expectf +++ /dev/null @@ -1,10 +0,0 @@ -array(1) { - [0]=> - &array(1) { - [0]=> - *RECURSION* - } -} -HipHop Warning: %a -string(8) "[[null]]" -Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/004.php b/hphp/test/zend/good/ext-json/004.php deleted file mode 100644 index 8b575dcfc..000000000 --- a/hphp/test/zend/good/ext-json/004.php +++ /dev/null @@ -1,10 +0,0 @@ -prop = $a; - -var_dump($a); -var_dump(json_encode($a)); - -echo "Done\n"; -?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/bug43941.php b/hphp/test/zend/good/ext-json/bug43941.php deleted file mode 100644 index 32c38109a..000000000 --- a/hphp/test/zend/good/ext-json/bug43941.php +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/ext-json/json_decode_error.php.expectf b/hphp/test/zend/good/ext-json/json_decode_error.php.expectf index 282fd80c3..e5018b0fb 100644 --- a/hphp/test/zend/good/ext-json/json_decode_error.php.expectf +++ b/hphp/test/zend/good/ext-json/json_decode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing json_decode() : error conditions *** -- Testing json_decode() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing json_decode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_dn2ufn.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_dn2ufn.php.expectf index 17222521d..e2a872818 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_dn2ufn.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_dn2ufn.php.expectf @@ -1,6 +1,6 @@ string(16) "bob, example.com" string(23) "bob, users, example.com" bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_errno_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_errno_error.php.expectf index 54f5bdaf2..2820ac644 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_errno_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_errno_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_error_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_error_error.php.expectf index 54f5bdaf2..2820ac644 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_error_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_error_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_explode_dn.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_explode_dn.php.expectf index 98a282a80..9ff3ad214 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_explode_dn.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_explode_dn.php.expectf @@ -44,8 +44,8 @@ array(5) { } bool(false) bool(false) -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_get_option_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_get_option_error.php.expectf index 83332f3b4..9fcab554f 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_get_option_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_get_option_error.php.expectf @@ -1,10 +1,10 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_list_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_list_error.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_list_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_list_error.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_parse_result_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_parse_result_error.php.expectf index f9787e34f..c1952a25a 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_parse_result_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_parse_result_error.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_read_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_read_error.php.expectf index 521d811ab..e47e9884f 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_read_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_read_error.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_rename_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_rename_error.php.expectf index 9db144b56..6757c1826 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_rename_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_rename_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_set_option_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_set_option_error.php.expectf index a7e20c234..fee2308d1 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_set_option_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_set_option_error.php.expectf @@ -1,17 +1,17 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL 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) bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-ldap/ldap_start_tls_error.php.expectf b/hphp/test/zend/good/ext-ldap/ldap_start_tls_error.php.expectf index 54f5bdaf2..2820ac644 100644 --- a/hphp/test/zend/good/ext-ldap/ldap_start_tls_error.php.expectf +++ b/hphp/test/zend/good/ext-ldap/ldap_start_tls_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf b/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/empty_pattern.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf index 6fa8ea0a7..2f1c018db 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_convert_encoding_variation1.php.expectf @@ -1,39 +1,39 @@ *** Testing mb_convert_encoding() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 10 -- @@ -43,14 +43,14 @@ string(24) "68656c6c6f2c20776f726c64" string(24) "68656c6c6f2c20776f726c64" -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 13 -- string(24) "68656c6c6f2c20776f726c64" -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 15 -- @@ -72,7 +72,7 @@ string(24) "68656c6c6f2c20776f726c64" string(24) "68656c6c6f2c20776f726c64" -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" -- Iteration 22 -- @@ -82,6 +82,6 @@ string(24) "68656c6c6f2c20776f726c64" string(24) "68656c6c6f2c20776f726c64" -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s string(0) "" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf index 8008e5a93..d76262623 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_decode_mimeheader_error.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_decode_mimeheader() : error conditions *** -- Testing mb_decode_mimeheader() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mb_decode_mimeheader() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf index 99efa1440..d2e772ab8 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_internal_encoding_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing mb_internal_encoding() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf index 519410089..0265a9a2a 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error1.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_regex_encoding() : error conditions *** -- Testing mb_regex_encoding() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf index 9e2c242fc..06d1ef432 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing mb_regex_encoding() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf index 804850c7c..9ff2fd40c 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_regex_encoding_variation2.php.expectf @@ -7,7 +7,7 @@ string(5) "UCS-4" -- Iteration 2 -- string(5) "UCS-4" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(5) "UCS-4" @@ -18,19 +18,19 @@ string(7) "UCS-4LE" -- Iteration 4 -- string(7) "UCS-4LE" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(7) "UCS-4LE" -- Iteration 5 -- string(7) "UCS-4LE" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(7) "UCS-4LE" -- Iteration 6 -- string(7) "UCS-4LE" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(7) "UCS-4LE" @@ -66,13 +66,13 @@ string(8) "UTF-16LE" -- Iteration 13 -- string(8) "UTF-16LE" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(8) "UTF-16LE" -- Iteration 14 -- string(8) "UTF-16LE" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(8) "UTF-16LE" @@ -108,13 +108,13 @@ string(4) "SJIS" -- Iteration 21 -- string(4) "SJIS" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(4) "SJIS" -- Iteration 22 -- string(4) "SJIS" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(4) "SJIS" @@ -185,49 +185,49 @@ string(11) "ISO-8859-15" -- Iteration 36 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 37 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 38 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 39 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 40 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 41 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 42 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" -- Iteration 43 -- string(11) "ISO-8859-15" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(11) "ISO-8859-15" @@ -238,13 +238,13 @@ string(6) "EUC-CN" -- Iteration 45 -- string(6) "EUC-CN" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-CN" -- Iteration 46 -- string(6) "EUC-CN" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-CN" @@ -255,7 +255,7 @@ string(6) "EUC-TW" -- Iteration 48 -- string(6) "EUC-TW" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-TW" @@ -271,31 +271,31 @@ string(6) "EUC-KR" -- Iteration 51 -- string(6) "EUC-KR" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-KR" -- Iteration 52 -- string(6) "EUC-KR" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-KR" -- Iteration 53 -- string(6) "EUC-KR" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-KR" -- Iteration 54 -- string(6) "EUC-KR" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-KR" -- Iteration 55 -- string(6) "EUC-KR" -HipHop Warning: %a +HipHop Warning: %s bool(false) string(6) "EUC-KR" diff --git a/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf index a0aae6796..03f014bbe 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_stripos_variation5_Bug45923.php.expectf @@ -2,10 +2,10 @@ **-- Offset is: -10 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 0 --** @@ -28,33 +28,33 @@ int(20) **-- Offset is: 30 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 40 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 50 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 60 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf index 964653560..e901f0300 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_stristr_error2.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_stristr() : error conditions *** -- Testing mb_stristr() with unknown encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf index 6af0665af..680b9b3a6 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strlen_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing mb_strlen() : error *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf index 180587eb9..ada6f5c1e 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing mb_strpos() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf index d495fd04f..ddd358936 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strpos_variation5.php.expectf @@ -2,10 +2,10 @@ **-- Offset is: -10 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 0 --** @@ -28,33 +28,33 @@ int(20) **-- Offset is: 30 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 40 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 50 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 60 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf index 76001210c..ae969928f 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strrchr_error2.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_strrchr() : error conditions *** -- Testing mb_strrchr() with unknown encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf index 59be17279..fdf00730e 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strrichr_error2.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_strrichr() : error conditions *** -- Testing mb_strrichr() with unknown encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf index 7dfaa2c71..512115734 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strripos_variation5_Bug45923.php.expectf @@ -26,33 +26,33 @@ int(20) **-- Offset is: 30 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 40 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 50 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) **-- Offset is: 60 --** -- ASCII String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) --Multibyte String -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf index 26014aec8..4361d3ac9 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strstr_error2.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_strstr() : error conditions *** -- Testing mb_strstr() with unknown encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf index ae2284797..2ebba81a6 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strtolower_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_strtolower() : error conditions*** -- Testing mb_strtolower() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mb_strtolower() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf index 3775534e8..1adca1d32 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_strtoupper_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_strtoupper() : error conditions *** -- Testing mb_strtoupper() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mb_strtoupper() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf index 81a6af3a6..d83c4b1d2 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_basic.php.expectf @@ -6,6 +6,6 @@ bool(true) int(1234) bool(true) string(4) "none" -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf index 3f99fcf30..58b0b3984 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substitute_character_error.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_substitute_character() : error conditions *** -- Testing mb_substitute_character() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf index b599f5e79..838b71385 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_substr_count() : error conditions *** -- Testing mb_substr_count() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mb_substr_count() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf index a40a1799f..7fd2be71e 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substr_count_error2.php.expectf @@ -1,6 +1,6 @@ *** Testing mb_substr_count() : error conditions *** -- Testing mb_substr_count() function with an unknown encoding -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf index 91000db0d..975a49a04 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing mb_substr() : error conditions *** -- Testing mb_substr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mb_substr() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf index ad38e0593..9442cb144 100644 --- a/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf +++ b/hphp/test/zend/good/ext-mbstring/mb_substr_error2.php.expectf @@ -1,4 +1,4 @@ *** Testing mb_substr() : error conditions *** -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/bug35496.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf index 84ae42f92..b86e1042d 100644 Binary files a/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf and b/hphp/test/zend/good/ext-mcrypt/bug37595.php.expectf differ diff --git a/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf index 8cfa88e2f..b9fb10d67 100644 --- a/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/bug41252.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s I'm alive! \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf index 56b0103e1..0caa7b518 100644 --- a/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/bug43143.php.expectf @@ -1,4 +1,4 @@ ECB CFB -HipHop Warning: %a +HipHop Warning: %s END \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf b/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/bug49738.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf deleted file mode 100644 index e96019298..000000000 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc.php.expectf +++ /dev/null @@ -1,2 +0,0 @@ -PHP Testfest 2008 -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf deleted file mode 100644 index 4548da739..000000000 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_3des_decrypt.php.expectf +++ /dev/null @@ -1,30 +0,0 @@ -*** Testing mcrypt_cbc() : basic functionality *** - ---- testing different key lengths - -key length=8 -string(32) "736563726574206d6573736167650000" - -key length=20 -string(32) "736563726574206d6573736167650000" - -key length=24 -string(32) "736563726574206d6573736167650000" - -key length=26 -HipHop Warning: %a -string(32) "736563726574206d6573736167650000" - ---- testing different iv lengths - -iv length=4 -HipHop Warning: %a -string(32) "736563726574206d6573736167650000" - -iv length=8 -string(32) "736563726574206d6573736167650000" - -iv length=9 -HipHop Warning: %a -string(32) "736563726574206d6573736167650000" -===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf deleted file mode 100644 index 40ef3a7ee..000000000 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_cbc_error.php.expectf +++ /dev/null @@ -1,10 +0,0 @@ -*** Testing mcrypt_cbc() : error conditions *** - --- Testing mcrypt_cbc() function with more than expected no. of arguments -- -HipHop Warning: %a -NULL - --- Testing mcrypt_cbc() function with less than expected no. of arguments -- -HipHop Warning: %a -NULL -===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf deleted file mode 100644 index e96019298..000000000 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_cfb.php.expectf +++ /dev/null @@ -1,2 +0,0 @@ -PHP Testfest 2008 -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf index 0935d1a21..137c60348 100644 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt.php.expectf @@ -1,4 +1,4 @@ PHP Testfest 2008 -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf index 43c4c6944..ce484d08f 100644 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_cbc.php.expectf @@ -12,19 +12,19 @@ key length=24 string(32) "736563726574206d6573736167650000" key length=26 -HipHop Warning: %a +HipHop Warning: %s string(32) "736563726574206d6573736167650000" --- testing different iv lengths iv length=4 -HipHop Warning: %a +HipHop Warning: %s string(32) "736563726574206d6573736167650000" iv length=8 string(32) "736563726574206d6573736167650000" iv length=9 -HipHop Warning: %a +HipHop Warning: %s string(32) "736563726574206d6573736167650000" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf index d52d8584d..e0d49bf2d 100644 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_3des_ecb.php.expectf @@ -12,7 +12,7 @@ key length=24 string(32) "736563726574206d6573736167650000" key length=26 -HipHop Warning: %a +HipHop Warning: %s string(32) "736563726574206d6573736167650000" --- testing different iv lengths diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf index 1c20688fe..e3a095216 100644 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf +++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_decrypt_error.php.expectf @@ -1,10 +1,10 @@ *** Testing mcrypt_decrypt() : error conditions *** -- Testing mcrypt_decrypt() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mcrypt_decrypt() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf deleted file mode 100644 index 45b75f5b1..000000000 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb.php.expectf +++ /dev/null @@ -1 +0,0 @@ -PHP Testfest 2008 \ No newline at end of file diff --git a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php index 28a7f76c8..7f842d3ca 100644 --- a/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php +++ b/hphp/test/zend/good/ext-mcrypt/mcrypt_ecb_3des_decrypt.php @@ -1,4 +1,6 @@ ', 'This shouldn\'t work', $string)); //tries to find '- This is a string' at the end of a string but can't so replaces nothing and prints the unchanged $string. var_dump(preg_replace('<[0-35-9]>', '4', $string)); //finds any number that's not 4 and replaces it with a 4 ('444444444') var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it) -var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space +var_dump(preg_replace('<(\w)\s*-\s*(\w)>', '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') ?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-pcre/preg_replace_callback_error.php.expectf b/hphp/test/zend/good/ext-pcre/preg_replace_callback_error.php.expectf index 5017b84ac..2b3c91a78 100644 --- a/hphp/test/zend/good/ext-pcre/preg_replace_callback_error.php.expectf +++ b/hphp/test/zend/good/ext-pcre/preg_replace_callback_error.php.expectf @@ -1,14 +1,14 @@ ***Testing preg_replace_callback() : error conditions*** -- Testing preg_replace_callback() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing preg_replace_callback() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing preg_replace_callback() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-pcre/preg_replace_edit_basic.php b/hphp/test/zend/good/ext-pcre/preg_replace_edit_basic.php index 16fca1843..74e8b9057 100644 --- a/hphp/test/zend/good/ext-pcre/preg_replace_edit_basic.php +++ b/hphp/test/zend/good/ext-pcre/preg_replace_edit_basic.php @@ -21,7 +21,7 @@ var_dump(preg_replace('<\b[hH]\w{2,4}>', 'Bonjour', $string)); //finds h or H at the beginning of a word followed by 2-4 characters and replaces it with Bonjour (i.e. Hello -> Bonjour) (was finding the 'his' in This and replacing it) var_dump(preg_replace('<(\w)\s*-\s*(\w)>', - '\\1. \\2', $string)); //finds dashes with an indefinate amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space + '\\1. \\2', $string)); //finds dashes with an indefinite amount of whitespace around them and replaces them with a full stop precedeby no spaces and followed by one space var_dump(preg_replace('<(^[a-z]\w+)@(\w+)\.(\w+)\.([a-z]{2,}$)>', '\\1 at \\2 dot \\3 dot \\4', 'josmessa@uk.ibm.com')); //finds the e-mail address and replaces the @ and . with "at" and "dot" (uses backreferences) ('josmessa at uk dot ibm dot com') diff --git a/hphp/test/zend/good/ext-pcre/preg_replace_error.php.expectf b/hphp/test/zend/good/ext-pcre/preg_replace_error.php.expectf index 1d481c684..556dc22f2 100644 --- a/hphp/test/zend/good/ext-pcre/preg_replace_error.php.expectf +++ b/hphp/test/zend/good/ext-pcre/preg_replace_error.php.expectf @@ -1,14 +1,14 @@ *** Testing preg_replace() : error conditions *** -- Testing preg_replace() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing preg_replace() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing preg_replace() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_error2.php b/hphp/test/zend/good/ext-pcre/preg_replace_error2.php similarity index 100% rename from hphp/test/zend/bad/ext-pcre/preg_replace_error2.php rename to hphp/test/zend/good/ext-pcre/preg_replace_error2.php diff --git a/hphp/test/zend/bad/ext-pcre/preg_replace_error2.php.expectf b/hphp/test/zend/good/ext-pcre/preg_replace_error2.php.expectf similarity index 82% rename from hphp/test/zend/bad/ext-pcre/preg_replace_error2.php.expectf rename to hphp/test/zend/good/ext-pcre/preg_replace_error2.php.expectf index f0be0b58e..5d37c9a35 100644 --- a/hphp/test/zend/bad/ext-pcre/preg_replace_error2.php.expectf +++ b/hphp/test/zend/good/ext-pcre/preg_replace_error2.php.expectf @@ -4,7 +4,6 @@ Arg value is: this is a string string(64) "this is a stringthis is a stringthis is a stringthis is a string" Arg value is: Array -HipHop Warning: %a +HipHop Warning: %s bool(false) - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-pcre/preg_split_basic.php b/hphp/test/zend/good/ext-pcre/preg_split_basic.php index 0733c4e21..e711e0ceb 100644 --- a/hphp/test/zend/good/ext-pcre/preg_split_basic.php +++ b/hphp/test/zend/good/ext-pcre/preg_split_basic.php @@ -4,7 +4,7 @@ * Function is implemented in ext/pcre/php_pcre.c */ $string = 'this is a_list: value1, Test__, string; Hello, world!_(parentheses)'; -var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string seperated by : , ; ( or ) are put into an array. +var_dump(preg_split('/[:,;\(\)]/', $string, -1, PREG_SPLIT_NO_EMPTY)); //parts of $string separated by : , ; ( or ) are put into an array. var_dump(preg_split('/:\s*(\w*,*\s*)+;/', $string)); //all text between : and ; is removed var_dump(preg_split('/(\(|\))/', $string, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY)); //all text before (parentheses) is put into first element, ( into second, "parentheses" into third and ) into fourth. var_dump(preg_split('/NAME/i', $string)); //tries to find NAME regardless of case in $string (can't split it so just returns how string as first element) diff --git a/hphp/test/zend/good/ext-pdo/bug47769.php.expectf b/hphp/test/zend/good/ext-pdo/bug47769.php.expectf index 5f5cdb5ce..13eeb3dfe 100644 --- a/hphp/test/zend/good/ext-pdo/bug47769.php.expectf +++ b/hphp/test/zend/good/ext-pdo/bug47769.php.expectf @@ -1,4 +1,4 @@ this is a protected method. this is a private method. foo -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-pdo/bug_44159.php.expectf b/hphp/test/zend/good/ext-pdo/bug_44159.php.expectf index 3d04736f4..8fecab247 100644 --- a/hphp/test/zend/good/ext-pdo/bug_44159.php.expectf +++ b/hphp/test/zend/good/ext-pdo/bug_44159.php.expectf @@ -1,10 +1,10 @@ -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) bool(true) bool(true) diff --git a/hphp/test/zend/good/ext-pdo/pdo_037.php.expectf b/hphp/test/zend/good/ext-pdo/pdo_037.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-pdo/pdo_037.php.expectf +++ b/hphp/test/zend/good/ext-pdo/pdo_037.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-pdo/pdorow.php.expectf b/hphp/test/zend/good/ext-pdo/pdorow.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-pdo/pdorow.php.expectf +++ b/hphp/test/zend/good/ext-pdo/pdorow.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_ctermid_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_ctermid_error.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-posix/posix_ctermid_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_ctermid_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_get_last_error_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_get_last_error_error.php.expectf index 457e54d03..392401fe3 100644 --- a/hphp/test/zend/good/ext-posix/posix_get_last_error_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_get_last_error_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_get_last_error() : error conditions *** -- Testing posix_get_last_error() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getcwd.php.expectf b/hphp/test/zend/good/ext-posix/posix_getcwd.php.expectf index a72df3b33..37c69ffaf 100644 --- a/hphp/test/zend/good/ext-posix/posix_getcwd.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getcwd.php.expectf @@ -1,3 +1,3 @@ string(%d) "%s" -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getcwd_basic.php.expectf b/hphp/test/zend/good/ext-posix/posix_getcwd_basic.php.expectf index 3db2b9cbd..b5a129480 100644 --- a/hphp/test/zend/good/ext-posix/posix_getcwd_basic.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getcwd_basic.php.expectf @@ -1,5 +1,5 @@ Basic test of POSIX posix_getcwd function string(%d) "%s" -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_geteuid_error1.php.expectf b/hphp/test/zend/good/ext-posix/posix_geteuid_error1.php.expectf index 9afcf6a5f..427ede292 100644 --- a/hphp/test/zend/good/ext-posix/posix_geteuid_error1.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_geteuid_error1.php.expectf @@ -1,9 +1,9 @@ *** Test by calling method or function with incorrect numbers of arguments *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getgid_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_getgid_error.php.expectf index 2291c5131..657926214 100644 --- a/hphp/test/zend/good/ext-posix/posix_getgid_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getgid_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_getgid() : error conditions *** -- Testing posix_getgid() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getpgrp_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_getpgrp_error.php.expectf index 22c28d380..32c43b3d6 100644 --- a/hphp/test/zend/good/ext-posix/posix_getpgrp_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getpgrp_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_getpgrp() : error conditions *** -- Testing posix_getpgrp() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getpid_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_getpid_error.php.expectf index abdbda963..845854801 100644 --- a/hphp/test/zend/good/ext-posix/posix_getpid_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getpid_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_getpid() : error conditions *** -- Testing posix_getpid() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_getppid_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_getppid_error.php.expectf index 5358d5077..44f4cd48e 100644 --- a/hphp/test/zend/good/ext-posix/posix_getppid_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getppid_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_getppid() : error conditions *** -- Testing posix_getppid() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-posix/posix_getrlimit.php b/hphp/test/zend/good/ext-posix/posix_getrlimit.php similarity index 100% rename from hphp/test/zend/bad/ext-posix/posix_getrlimit.php rename to hphp/test/zend/good/ext-posix/posix_getrlimit.php diff --git a/hphp/test/zend/bad/ext-posix/posix_getrlimit.php.expectf b/hphp/test/zend/good/ext-posix/posix_getrlimit.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-posix/posix_getrlimit.php.expectf rename to hphp/test/zend/good/ext-posix/posix_getrlimit.php.expectf diff --git a/hphp/test/zend/bad/ext-posix/posix_getrlimit_basic.php b/hphp/test/zend/good/ext-posix/posix_getrlimit_basic.php similarity index 100% rename from hphp/test/zend/bad/ext-posix/posix_getrlimit_basic.php rename to hphp/test/zend/good/ext-posix/posix_getrlimit_basic.php diff --git a/hphp/test/zend/bad/ext-posix/posix_getrlimit_basic.php.expectf b/hphp/test/zend/good/ext-posix/posix_getrlimit_basic.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-posix/posix_getrlimit_basic.php.expectf rename to hphp/test/zend/good/ext-posix/posix_getrlimit_basic.php.expectf diff --git a/hphp/test/zend/good/ext-posix/posix_getuid_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_getuid_error.php.expectf index eb5049074..ffa178b79 100644 --- a/hphp/test/zend/good/ext-posix/posix_getuid_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_getuid_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_getuid() : error conditions *** -- Testing posix_getuid() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_mkfifo_wrongparams.php.expectf b/hphp/test/zend/good/ext-posix/posix_mkfifo_wrongparams.php.expectf index 063a0e862..5bfacccce 100644 --- a/hphp/test/zend/good/ext-posix/posix_mkfifo_wrongparams.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_mkfifo_wrongparams.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_times_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_times_error.php.expectf index a2195f857..8d6dddec7 100644 --- a/hphp/test/zend/good/ext-posix/posix_times_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_times_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_times() : error conditions *** -- Testing posix_times() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-posix/posix_uname_error.php.expectf b/hphp/test/zend/good/ext-posix/posix_uname_error.php.expectf index 1b83fb88d..fe22f01d3 100644 --- a/hphp/test/zend/good/ext-posix/posix_uname_error.php.expectf +++ b/hphp/test/zend/good/ext-posix/posix_uname_error.php.expectf @@ -1,6 +1,6 @@ *** Testing posix_uname() : error conditions *** -- Testing posix_uname() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-session/bug31454.php.expectf b/hphp/test/zend/good/ext-session/bug31454.php.expectf index 105759ffa..34876a7ca 100644 --- a/hphp/test/zend/good/ext-session/bug31454.php.expectf +++ b/hphp/test/zend/good/ext-session/bug31454.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-simplexml/031.php.expectf b/hphp/test/zend/good/ext-simplexml/031.php.expectf index 8490ffc89..04e79a697 100644 --- a/hphp/test/zend/good/ext-simplexml/031.php.expectf +++ b/hphp/test/zend/good/ext-simplexml/031.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s test diff --git a/hphp/test/zend/good/ext-simplexml/SimpleXMLElement_addAttribute_required_attribute_name.php.expectf b/hphp/test/zend/good/ext-simplexml/SimpleXMLElement_addAttribute_required_attribute_name.php.expectf index d7c04d873..d99c8c59c 100644 --- a/hphp/test/zend/good/ext-simplexml/SimpleXMLElement_addAttribute_required_attribute_name.php.expectf +++ b/hphp/test/zend/good/ext-simplexml/SimpleXMLElement_addAttribute_required_attribute_name.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s testfest \ No newline at end of file diff --git a/hphp/test/zend/good/ext-simplexml/bug40451.php.expectf b/hphp/test/zend/good/ext-simplexml/bug40451.php.expectf index 48734b894..82465ddae 100644 --- a/hphp/test/zend/good/ext-simplexml/bug40451.php.expectf +++ b/hphp/test/zend/good/ext-simplexml/bug40451.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-soap-schema/schema068.php.expectf b/hphp/test/zend/good/ext-soap-schema/schema068.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-soap-schema/schema068.php.expectf +++ b/hphp/test/zend/good/ext-soap-schema/schema068.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sockets/socket_bind_params.php.expectf b/hphp/test/zend/good/ext-sockets/socket_bind_params.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/good/ext-sockets/socket_bind_params.php.expectf +++ b/hphp/test/zend/good/ext-sockets/socket_bind_params.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sockets/socket_close_params.php.expectf b/hphp/test/zend/good/ext-sockets/socket_close_params.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-sockets/socket_close_params.php.expectf +++ b/hphp/test/zend/good/ext-sockets/socket_close_params.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php b/hphp/test/zend/good/ext-sockets/socket_create_listen-nobind.php similarity index 57% rename from hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php rename to hphp/test/zend/good/ext-sockets/socket_create_listen-nobind.php index 3fe7506e7..e419367f2 100644 --- a/hphp/test/zend/bad/ext-sockets/socket_create_listen-nobind.php +++ b/hphp/test/zend/good/ext-sockets/socket_create_listen-nobind.php @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/bug61697.php.expectf b/hphp/test/zend/good/ext-spl/bug61697.php.expectf new file mode 100644 index 000000000..15a2da0f0 --- /dev/null +++ b/hphp/test/zend/good/ext-spl/bug61697.php.expectf @@ -0,0 +1,3 @@ +Array +( +) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/countable_count_variation1.php.expectf b/hphp/test/zend/good/ext-spl/countable_count_variation1.php.expectf index 1f78505bd..6afca71c3 100644 --- a/hphp/test/zend/good/ext-spl/countable_count_variation1.php.expectf +++ b/hphp/test/zend/good/ext-spl/countable_count_variation1.php.expectf @@ -3,7 +3,7 @@ int(0) Count returns a string: int(0) Count returns an object: -HipHop Notice: %a +HipHop Notice: %s int(1) Count returns an array: int(1) diff --git a/hphp/test/zend/good/ext-spl/fileobject_setmaxlinelen_error002.php.expectf b/hphp/test/zend/good/ext-spl/fileobject_setmaxlinelen_error002.php.expectf deleted file mode 100644 index cfb6a8593..000000000 --- a/hphp/test/zend/good/ext-spl/fileobject_setmaxlinelen_error002.php.expectf +++ /dev/null @@ -1 +0,0 @@ -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/iterator_036.php.expectf b/hphp/test/zend/good/ext-spl/iterator_036.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-spl/iterator_036.php.expectf +++ b/hphp/test/zend/good/ext-spl/iterator_036.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/iterator_069.php.expectf b/hphp/test/zend/good/ext-spl/iterator_069.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-spl/iterator_069.php.expectf +++ b/hphp/test/zend/good/ext-spl/iterator_069.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/iterator_count.php.expectf b/hphp/test/zend/good/ext-spl/iterator_count.php.expectf index 97a857da0..d31a9d98c 100644 --- a/hphp/test/zend/good/ext-spl/iterator_count.php.expectf +++ b/hphp/test/zend/good/ext-spl/iterator_count.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/iterator_to_array.php.expectf b/hphp/test/zend/good/ext-spl/iterator_to_array.php.expectf index 97a857da0..d31a9d98c 100644 --- a/hphp/test/zend/good/ext-spl/iterator_to_array.php.expectf +++ b/hphp/test/zend/good/ext-spl/iterator_to_array.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_iterator_recursive_getiterator_error.php.expectf b/hphp/test/zend/good/ext-spl/spl_iterator_recursive_getiterator_error.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-spl/spl_iterator_recursive_getiterator_error.php.expectf +++ b/hphp/test/zend/good/ext-spl/spl_iterator_recursive_getiterator_error.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_iterator_to_array_basic.php.expectf b/hphp/test/zend/good/ext-spl/spl_iterator_to_array_basic.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-spl/spl_iterator_to_array_basic.php.expectf +++ b/hphp/test/zend/good/ext-spl/spl_iterator_to_array_basic.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_maxheap_compare_basic.php.expectf b/hphp/test/zend/good/ext-spl/spl_maxheap_compare_basic.php.expectf deleted file mode 100644 index cfb6a8593..000000000 --- a/hphp/test/zend/good/ext-spl/spl_maxheap_compare_basic.php.expectf +++ /dev/null @@ -1 +0,0 @@ -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-spl/spl_minheap_compare_error.php.expectf b/hphp/test/zend/good/ext-spl/spl_minheap_compare_error.php.expectf deleted file mode 100644 index 771ac268e..000000000 --- a/hphp/test/zend/good/ext-spl/spl_minheap_compare_error.php.expectf +++ /dev/null @@ -1,3 +0,0 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_02_create.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_02_create.php.expectf index 2a052550e..43457a604 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_02_create.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_02_create.php.expectf @@ -1,7 +1,7 @@ Creating Table bool(true) Creating Same Table Again -HipHop Warning: %a +HipHop Warning: %s bool(false) Dropping database bool(true) diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_20_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_20_error.php.expectf index 8419707e7..69ce68429 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_20_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_20_error.php.expectf @@ -1,5 +1,5 @@ SELECTING from invalid table -HipHop Warning: %a +HipHop Warning: %s Error Code: 1 Error Msg: no such table: non_existent_table Closing database diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_changes.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_changes.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_changes.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_changes.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_createAggregate_paramCount.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_createAggregate_paramCount.php.expectf index 105759ffa..34876a7ca 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_createAggregate_paramCount.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_createAggregate_paramCount.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_last_insert_rowid_param.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_last_insert_rowid_param.php.expectf index 4960693e8..e2f92b8ae 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_32_last_insert_rowid_param.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_32_last_insert_rowid_param.php.expectf @@ -3,7 +3,7 @@ bool(true) Inserting data bool(true) Request last inserted id -HipHop Warning: %a +HipHop Warning: %s Closing database bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_33_createAggregate_notcallable.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_33_createAggregate_notcallable.php.expectf index ba2dfc45b..fc1efb335 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_33_createAggregate_notcallable.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_33_createAggregate_notcallable.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_33_reset.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_33_reset.php.expectf index 105759ffa..34876a7ca 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_33_reset.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_33_reset.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_34_load_extension_ext_dir.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_34_load_extension_ext_dir.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_34_load_extension_ext_dir.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_34_load_extension_ext_dir.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_close_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_close_error.php.expectf index f9ef2a756..5e92f43c7 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_close_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_close_error.php.expectf @@ -1,3 +1,3 @@ Testing SQLite3 close with one parameter -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_close_with_params.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_close_with_params.php.expectf index 68357b99d..55369d6b8 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_close_with_params.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_close_with_params.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_exec_wrongparams.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_exec_wrongparams.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_exec_wrongparams.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_exec_wrongparams.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrorcode_with_params.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrorcode_with_params.php.expectf index 68357b99d..55369d6b8 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrorcode_with_params.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrorcode_with_params.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrormsg_with_params.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrormsg_with_params.php.expectf index 68357b99d..55369d6b8 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrormsg_with_params.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_lasterrormsg_with_params.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_openblob_wrongparams.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_openblob_wrongparams.php.expectf index 6a2b06459..ef1a89056 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_openblob_wrongparams.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_openblob_wrongparams.php.expectf @@ -5,6 +5,6 @@ bool(true) bool(true) Closing statement: true Open BLOB with wrong parameter count -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_faultystmt.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_faultystmt.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_faultystmt.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_faultystmt.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_wrongparams.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_wrongparams.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_wrongparams.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_prepare_wrongparams.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_query_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_query_error.php.expectf index c20c3f6fa..2c9a378c4 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_query_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_query_error.php.expectf @@ -1,7 +1,7 @@ Testing SQLite3 query without parameters -HipHop Warning: %a +HipHop Warning: %s Testing SQLite3 query with one array parameter -HipHop Warning: %a +HipHop Warning: %s Testing SQLite3 qeury with empty string parameter bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3_querysingle_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3_querysingle_error.php.expectf index 247443c94..1051bb732 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3_querysingle_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3_querysingle_error.php.expectf @@ -1,7 +1,7 @@ Testing SQLite3 querySingle without parameters -HipHop Warning: %a +HipHop Warning: %s Testing SQLite3 querySingle with one array parameter -HipHop Warning: %a +HipHop Warning: %s Testing SQLite3 qeurySingle with empty string parameter bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3result_fetcharray_with_two_params_fails.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3result_fetcharray_with_two_params_fails.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3result_fetcharray_with_two_params_fails.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3result_fetcharray_with_two_params_fails.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3result_numcolumns_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3result_numcolumns_error.php.expectf index b5c12f6d4..b5d90ad8f 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3result_numcolumns_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3result_numcolumns_error.php.expectf @@ -3,6 +3,6 @@ bool(true) Inserting data bool(true) Fetching number of columns -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3result_reset_with_params_fails.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3result_reset_with_params_fails.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3result_reset_with_params_fails.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3result_reset_with_params_fails.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_paramCount_error.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_paramCount_error.php.expectf index abc1b3243..a472d6f77 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_paramCount_error.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_paramCount_error.php.expectf @@ -5,7 +5,7 @@ bool(true) bool(true) SELECTING results paramCount with wrong number of arguments -HipHop Warning: %a +HipHop Warning: %s NULL Closing database bool(true) diff --git a/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_reset_params.php.expectf b/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_reset_params.php.expectf index 63b4c0ff4..043bc4221 100644 --- a/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_reset_params.php.expectf +++ b/hphp/test/zend/good/ext-sqlite3/sqlite3stmt_reset_params.php.expectf @@ -4,7 +4,7 @@ INSERT into table bool(true) Prepare query Reset query -HipHop Warning: %a +HipHop Warning: %s Closing database bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_chunk2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_chunk2.php.expectf index 8e2ca3828..734eec4d1 100644 --- a/hphp/test/zend/good/ext-standard-array/array_chunk2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_chunk2.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(5) { [0]=> diff --git a/hphp/test/zend/good/ext-standard-array/array_chunk_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_chunk_error.php.expectf index 5fe2098f6..87d4ac5d9 100644 --- a/hphp/test/zend/good/ext-standard-array/array_chunk_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_chunk_error.php.expectf @@ -1,14 +1,14 @@ *** Testing array_chunk() : error conditions *** -- Testing array_chunk() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_chunk() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_chunk() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_chunk_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_chunk_variation1.php.expectf index d0e9a629a..33349628d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_chunk_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_chunk_variation1.php.expectf @@ -1,178 +1,178 @@ *** Testing array_chunk() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_chunk_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_chunk_variation5.php.expectf index 24dfcf54b..d3b6ed601 100644 --- a/hphp/test/zend/good/ext-standard-array/array_chunk_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_chunk_variation5.php.expectf @@ -1,11 +1,11 @@ *** Testing array_chunk() : usage variations *** -- Testing array_chunk() when size = -1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_chunk() when size = 4 -- @@ -44,11 +44,11 @@ array(1) { } -- Testing array_chunk() when size = 0 -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_chunk() when size = 1.5 -- diff --git a/hphp/test/zend/good/ext-standard-array/array_column_basic.php b/hphp/test/zend/good/ext-standard-array/array_column_basic.php index 6bc2c1cbd..485788a6d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_column_basic.php +++ b/hphp/test/zend/good/ext-standard-array/array_column_basic.php @@ -132,4 +132,4 @@ var_dump(array_column($records, $f)); var_dump(array_column($records, $f, $b)); echo "Done\n"; -?> +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_column_error.php b/hphp/test/zend/good/ext-standard-array/array_column_error.php index cd919aebc..b2744d4fe 100644 --- a/hphp/test/zend/good/ext-standard-array/array_column_error.php +++ b/hphp/test/zend/good/ext-standard-array/array_column_error.php @@ -33,4 +33,4 @@ echo "\n-- Testing array_column() index key parameter should be a string or inte var_dump(array_column(array(), 'foo', array())); echo "Done\n"; -?> +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_column_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_column_error.php.expectf index ad4c744f6..679c6a0fb 100644 --- a/hphp/test/zend/good/ext-standard-array/array_column_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_column_error.php.expectf @@ -1,34 +1,34 @@ *** Testing array_column() : error conditions *** -- Testing array_column() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_column() function with One argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_column() function with string as first parameter -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_column() function with int as first parameter -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_column() column key parameter should be a string or an integer (testing bool) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing array_column() column key parameter should be a string or integer (testing array) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing array_column() index key parameter should be a string or an integer (testing bool) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Testing array_column() index key parameter should be a string or integer (testing array) -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_column_object_cast.php b/hphp/test/zend/good/ext-standard-array/array_column_object_cast.php index cd4393124..c359fb150 100644 --- a/hphp/test/zend/good/ext-standard-array/array_column_object_cast.php +++ b/hphp/test/zend/good/ext-standard-array/array_column_object_cast.php @@ -34,4 +34,4 @@ $firstNames = array_column($records, $column_key, $index_key); print_r($firstNames); var_dump($column_key); var_dump($index_key); -var_dump($value); +var_dump($value); \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_column_variant.php b/hphp/test/zend/good/ext-standard-array/array_column_variant.php index d57ee1437..9a3830b5e 100644 --- a/hphp/test/zend/good/ext-standard-array/array_column_variant.php +++ b/hphp/test/zend/good/ext-standard-array/array_column_variant.php @@ -14,4 +14,4 @@ var_dump(array_column($rows, null, 'foo')); echo "-- pass null as second parameter and no third param to get back array_values(input) --\n"; var_dump(array_column($rows, null)); -echo "Done\n"; +echo "Done\n"; \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_combine_error1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_combine_error1.php.expectf index 1e23c2cfb..ee2d14af9 100644 --- a/hphp/test/zend/good/ext-standard-array/array_combine_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_combine_error1.php.expectf @@ -1,14 +1,14 @@ *** Testing array_combine() : error conditions *** -- Testing array_combine() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_combine() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_combine() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_combine_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_combine_variation1.php.expectf index 2ed8ce773..74b6c5e3f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_combine_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_combine_variation1.php.expectf @@ -1,74 +1,74 @@ *** Testing array_combine() : Passing non-array values to $keys argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_combine_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_combine_variation2.php.expectf index f206e28f3..e7b733a80 100644 --- a/hphp/test/zend/good/ext-standard-array/array_combine_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_combine_variation2.php.expectf @@ -1,74 +1,74 @@ *** Testing array_combine() : Passing non-array values to $values argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_count_values2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_count_values2.php.expectf index 596c447bb..4fcf018cc 100644 --- a/hphp/test/zend/good/ext-standard-array/array_count_values2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_count_values2.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(8) { [1]=> int(2) diff --git a/hphp/test/zend/good/ext-standard-array/array_count_values_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_count_values_error.php.expectf index db7d0e8cb..1dd3095cb 100644 --- a/hphp/test/zend/good/ext-standard-array/array_count_values_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_count_values_error.php.expectf @@ -1,14 +1,14 @@ *** Testing array_count_values() : error conditions *** -- Testing array_count_values() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_count_values() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_count_values() function integer arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_assoc_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_assoc_error.php.expectf index 3fb45f3d9..645d1589f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_assoc_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_assoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_diff_assoc() : error conditions *** -- Testing array_diff_assoc() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_diff_assoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_assoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_assoc_variation1.php.expectf index 3c8227cb0..c99716a7a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_assoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_assoc_variation1.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_assoc() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 26 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_error.php.expectf index 8fed7effc..a1fcf1daf 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_diff() : error conditions *** -- Testing array_diff() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_diff() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_key_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_key_error.php.expectf index b6d180a4f..34c5e74f1 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_key_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_key_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_diff_key() : error conditions *** -- Testing array_diff_key() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_diff_key() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation1.php.expectf index e59da6de5..59b939648 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation1.php.expectf @@ -1,158 +1,158 @@ *** Testing array_diff_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation2.php.expectf index e59da6de5..59b939648 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation2.php.expectf @@ -1,158 +1,158 @@ *** Testing array_diff_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation3.php.expectf index 23207c7fe..95d3ba6cb 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_key_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_key_variation3.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation1.php.expectf index 78d65bec8..e5ca15c7d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation1.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation2.php.expectf index 78d65bec8..e5ca15c7d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation2.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation4.php.expectf index 78d65bec8..e5ca15c7d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_uassoc_variation4.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation1.php.expectf index 67822e8ec..a92147917 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation1.php.expectf @@ -1,158 +1,158 @@ *** Testing array_diff_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation2.php.expectf index 67822e8ec..a92147917 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation2.php.expectf @@ -1,158 +1,158 @@ *** Testing array_diff_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation3.php.expectf index 8431fb367..0b1c72acf 100644 --- a/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_diff_ukey_variation3.php.expectf @@ -1,106 +1,106 @@ *** Testing array_diff_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_fill.php.expectf b/hphp/test/zend/good/ext-standard-array/array_fill.php.expectf index 726ff9727..ea4079b51 100644 --- a/hphp/test/zend/good/ext-standard-array/array_fill.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_fill.php.expectf @@ -1,26 +1,26 @@ =========================== start: 0 num: 0 value: 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 0 value: d -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 0 value: e -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 0 value: f -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 0 num: 1 value: 1 @@ -108,27 +108,27 @@ array(2) { } =========================== start: 1 num: 0 value: 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 0 value: d -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 0 value: e -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 0 value: f -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 1 num: 1 value: 1 @@ -216,27 +216,27 @@ array(2) { } =========================== start: 2.5 num: 0 value: 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 0 value: -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 0 value: d -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 0 value: e -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 0 value: f -HipHop Warning: %a +HipHop Warning: %s bool(false) =========================== start: 2.5 num: 1 value: 1 diff --git a/hphp/test/zend/good/ext-standard-array/array_fill_basic.php b/hphp/test/zend/good/ext-standard-array/array_fill_basic.php index 2ad704442..332c0509c 100644 --- a/hphp/test/zend/good/ext-standard-array/array_fill_basic.php +++ b/hphp/test/zend/good/ext-standard-array/array_fill_basic.php @@ -13,7 +13,7 @@ $heredoc = << NULL diff --git a/hphp/test/zend/good/ext-standard-array/array_fill_variation4.php b/hphp/test/zend/good/ext-standard-array/array_fill_variation4.php index 47a3f30d8..8fd76c9b9 100644 --- a/hphp/test/zend/good/ext-standard-array/array_fill_variation4.php +++ b/hphp/test/zend/good/ext-standard-array/array_fill_variation4.php @@ -14,7 +14,7 @@ $heredoc = << string(1) "b" diff --git a/hphp/test/zend/good/ext-standard-array/array_flip_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_flip_error.php.expectf index c8537495b..dae9ae54f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_flip_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_flip_error.php.expectf @@ -1,8 +1,8 @@ *** Testing array_flip() : error conditions *** -- Testing array_flip() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_flip() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_flip_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_flip_variation4.php.expectf index 8742d9afb..83c65bda4 100644 --- a/hphp/test/zend/good/ext-standard-array/array_flip_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_flip_variation4.php.expectf @@ -1,16 +1,16 @@ *** Testing array_flip() : different invalid values in 'input' array argument *** -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: %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 +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(0) { } Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_error.php.expectf index af3cdef40..4f77b5b48 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_assoc_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_intersect_assoc() : error conditions *** -- Testing array_intersect_assoc() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_assoc() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_error.php.expectf index 7915be157..ce1205ef7 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_intersect() : error conditions *** -- Testing array_intersect() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_key_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_key_error.php.expectf index a900a44ca..cd6dbbfba 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_key_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_key_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_intersect_key() : error conditions *** -- Testing array_intersect_key() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_intersect_key() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation1.php.expectf index 6d798d424..d3c31671a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation1.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation2.php.expectf index 6d798d424..d3c31671a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation2.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation3.php.expectf index a46793ac2..581e47172 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_key_variation3.php.expectf @@ -1,106 +1,106 @@ *** Testing array_intersect_key() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation1.php.expectf index e1e7b2de8..f1bef6c6f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation1.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation2.php.expectf index e1e7b2de8..f1bef6c6f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation2.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation3.php.expectf index 93a715f9b..cebfdb3e9 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_uassoc_variation3.php.expectf @@ -1,106 +1,106 @@ *** Testing array_intersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL --resource-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation1.php.expectf index a5b1290b0..dec606e7a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation1.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation2.php.expectf index a5b1290b0..dec606e7a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation2.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation4.php.expectf index a5b1290b0..dec606e7a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_intersect_ukey_variation4.php.expectf @@ -1,158 +1,158 @@ *** Testing array_intersect_ukey() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL --resource var-- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_key_exists_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_key_exists_error.php.expectf index f59293265..264d63522 100644 --- a/hphp/test/zend/good/ext-standard-array/array_key_exists_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_key_exists_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_key_exists() : error conditions *** -- Testing array_key_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_key_exists() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_key_exists_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_key_exists_variation1.php.expectf index d78bc5f81..8a2a7c56a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_key_exists_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_key_exists_variation1.php.expectf @@ -13,23 +13,23 @@ bool(false) bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- @@ -39,19 +39,19 @@ bool(false) 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 Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- @@ -61,7 +61,7 @@ bool(false) bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- @@ -74,7 +74,7 @@ bool(true) bool(true) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- @@ -84,6 +84,6 @@ bool(false) bool(false) -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_key_exists_variation3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_key_exists_variation3.php.expectf index e410499a1..d96ae6cc1 100644 --- a/hphp/test/zend/good/ext-standard-array/array_key_exists_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_key_exists_variation3.php.expectf @@ -2,21 +2,21 @@ -- Iteration 1 -- Pass float as $key: -HipHop Warning: %a +HipHop Warning: %s bool(false) Cast float to int: bool(true) -- Iteration 1 -- Pass float as $key: -HipHop Warning: %a +HipHop Warning: %s bool(false) Cast float to int: bool(true) -- Iteration 1 -- Pass float as $key: -HipHop Warning: %a +HipHop Warning: %s bool(false) Cast float to int: bool(true) diff --git a/hphp/test/zend/good/ext-standard-array/array_map_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_error.php.expectf index 99eaae404..0b1b9ae44 100644 --- a/hphp/test/zend/good/ext-standard-array/array_map_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_error.php.expectf @@ -1,18 +1,18 @@ *** Testing array_map() : error conditions *** -- Testing array_map() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_map() function with one less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_map() function with less no. of arrays than callback function arguments -- -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s array(2) { [0]=> int(0) diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_object2.php b/hphp/test/zend/good/ext-standard-array/array_map_object2.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-array/array_map_object2.php rename to hphp/test/zend/good/ext-standard-array/array_map_object2.php diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_object2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_object2.php.expectf similarity index 80% rename from hphp/test/zend/bad/ext-standard-array/array_map_object2.php.expectf rename to hphp/test/zend/good/ext-standard-array/array_map_object2.php.expectf index 4838cacec..7e7cc4aae 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_object2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_object2.php.expectf @@ -1,8 +1,8 @@ *** Testing array_map() : with non-existent class and method *** -- with non-existent class -- -HipHop Warning: %a +HipHop Warning: %s NULL -- with existent class and non-existent method -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_object3.php b/hphp/test/zend/good/ext-standard-array/array_map_object3.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-array/array_map_object3.php rename to hphp/test/zend/good/ext-standard-array/array_map_object3.php diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_object3.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_object3.php.expectf similarity index 91% rename from hphp/test/zend/bad/ext-standard-array/array_map_object3.php.expectf rename to hphp/test/zend/good/ext-standard-array/array_map_object3.php.expectf index 3d681d0b4..1c0e8f764 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_object3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_object3.php.expectf @@ -9,7 +9,7 @@ array(3) { int(7) } -- accessing child method from parent class -- -HipHop Warning: %a +HipHop Warning: %s NULL -- accessing parent method using child class object -- array(3) { @@ -21,6 +21,6 @@ array(3) { int(7) } -- accessing child method using parent class object -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_map_variation10.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_variation10.php.expectf index 61b7c6067..14ccde80a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_map_variation10.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_variation10.php.expectf @@ -24,12 +24,12 @@ array(3) { } } -- anonymous function with two parameters and passing one array -- -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s array(3) { [0]=> array(2) { @@ -72,6 +72,6 @@ array(3) { NULL } -- passing NULL as 'arr1' -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation12.php b/hphp/test/zend/good/ext-standard-array/array_map_variation12.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-array/array_map_variation12.php rename to hphp/test/zend/good/ext-standard-array/array_map_variation12.php diff --git a/hphp/test/zend/bad/ext-standard-array/array_map_variation12.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_variation12.php.expectf similarity index 80% rename from hphp/test/zend/bad/ext-standard-array/array_map_variation12.php.expectf rename to hphp/test/zend/good/ext-standard-array/array_map_variation12.php.expectf index 01bd5b053..15dc8cca9 100644 --- a/hphp/test/zend/bad/ext-standard-array/array_map_variation12.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_variation12.php.expectf @@ -9,9 +9,9 @@ array(3) { int(243) } -- with built-in function 'pow' and one parameter -- -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s array(3) { [0]=> NULL @@ -21,6 +21,6 @@ array(3) { NULL } -- with language construct -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_map_variation18.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_variation18.php.expectf index c81bf5587..e4734b474 100644 --- a/hphp/test/zend/good/ext-standard-array/array_map_variation18.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_variation18.php.expectf @@ -1,77 +1,77 @@ *** Testing array_map() : unexpected values for 'arr1' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_map_variation9.php.expectf b/hphp/test/zend/good/ext-standard-array/array_map_variation9.php.expectf index 6c7d533f2..a725eeb67 100644 --- a/hphp/test/zend/good/ext-standard-array/array_map_variation9.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_map_variation9.php.expectf @@ -11,14 +11,14 @@ array(4) { string(5) "22.22" } -- checking binary safe array with two parameter callback function -- -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s +HipHop Warning: %s +HipHop Notice: %s array(4) { [0]=> array(1) { diff --git a/hphp/test/zend/good/ext-standard-array/array_merge_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_merge_error.php.expectf index 2da49d245..c16653901 100644 --- a/hphp/test/zend/good/ext-standard-array/array_merge_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_merge_error.php.expectf @@ -1,6 +1,6 @@ *** Testing array_merge() : error conditions *** -- Testing array_merge() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_merge_recursive_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_merge_recursive_error.php.expectf index d87874199..8ef14826d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_merge_recursive_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_merge_recursive_error.php.expectf @@ -1,6 +1,6 @@ *** Testing array_merge_recursive() : error conditions *** -- Testing array_merge_recursive() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_merge_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_merge_variation1.php.expectf index c6ae2d90f..7f14a7f2c 100644 --- a/hphp/test/zend/good/ext-standard-array/array_merge_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_merge_variation1.php.expectf @@ -1,71 +1,71 @@ *** Testing array_merge() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- @@ -77,30 +77,30 @@ array(2) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_merge_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_merge_variation2.php.expectf index c6ae2d90f..7f14a7f2c 100644 --- a/hphp/test/zend/good/ext-standard-array/array_merge_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_merge_variation2.php.expectf @@ -1,71 +1,71 @@ *** Testing array_merge() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- @@ -77,30 +77,30 @@ array(2) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_multisort_variation9.php.expectf b/hphp/test/zend/good/ext-standard-array/array_multisort_variation9.php.expectf index d6b0b3e02..ed0db7c22 100644 --- a/hphp/test/zend/good/ext-standard-array/array_multisort_variation9.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_multisort_variation9.php.expectf @@ -1,9 +1,9 @@ *** Testing array_multisort() : usage variation - test sort order of all types*** -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s bool(true) array(10) { ["float -10.5"]=> diff --git a/hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_next_error2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_pad_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_pad_error.php.expectf index fdefb2a4b..c4eea0543 100644 --- a/hphp/test/zend/good/ext-standard-array/array_pad_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_pad_error.php.expectf @@ -1,16 +1,16 @@ *** Testing array_pad() : error conditions *** -- Testing array_pad() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_pad() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_pad() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_product_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_product_error.php.expectf index 451d756b3..0bb55722a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_product_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_product_error.php.expectf @@ -1,14 +1,14 @@ *** Testing array_product() : error conditions *** -- Testing array_product() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_product() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_product() function incorrect argument type -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_product_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_product_variation5.php.expectf index a682c84a3..8181ac64e 100644 --- a/hphp/test/zend/good/ext-standard-array/array_product_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_product_variation5.php.expectf @@ -1,102 +1,102 @@ *** Testing array_product() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_push_error1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_push_error1.php.expectf index f2e69d10c..9757e0ce3 100644 --- a/hphp/test/zend/good/ext-standard-array/array_push_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_push_error1.php.expectf @@ -1,6 +1,6 @@ *** Testing array_push() : error conditions *** -- Testing array_push() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_push_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_push_variation1.php.expectf index f1b5ac4ad..7f9913f8a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_push_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_push_variation1.php.expectf @@ -1,101 +1,101 @@ *** Testing array_push() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- int(1) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_rand_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_rand_error.php.expectf index 223d4cfe8..0dd55128d 100644 --- a/hphp/test/zend/good/ext-standard-array/array_rand_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_rand_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_rand() : error conditions *** -- Testing array_rand() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_rand() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_rand_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_rand_variation1.php.expectf index e9182a289..92d2b3d5e 100644 --- a/hphp/test/zend/good/ext-standard-array/array_rand_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_rand_variation1.php.expectf @@ -1,94 +1,94 @@ *** Testing array_rand() : unexpected values for 'input' parameter *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_rand_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_rand_variation5.php.expectf index a27df3b58..3e18abb55 100644 --- a/hphp/test/zend/good/ext-standard-array/array_rand_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_rand_variation5.php.expectf @@ -7,18 +7,18 @@ int(%d) int(%d) -- With num_req = 0 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With num_req = -1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With num_req = -2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- With num_req more than number of members in 'input' array -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_reduce_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_reduce_error.php.expectf index 04173b384..9d197fb80 100644 --- a/hphp/test/zend/good/ext-standard-array/array_reduce_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_reduce_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_reduce() : error conditions *** -- Testing array_reduce() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_reduce() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_reduce_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_reduce_variation1.php.expectf index 97c5274b1..6b90dc50a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_reduce_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_reduce_variation1.php.expectf @@ -4,7 +4,7 @@ int(2) --- Testing with a callback with too many parameters --- -HipHop Warning: %a -HipHop Notice: %a +HipHop Warning: %s +HipHop Notice: %s int(3) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_reduce_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_reduce_variation2.php.expectf index 43a7854d3..9961cdc9b 100644 --- a/hphp/test/zend/good/ext-standard-array/array_reduce_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_reduce_variation2.php.expectf @@ -1,8 +1,8 @@ *** Testing array_reduce() : variation - invalid parameters *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_reverse_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_reverse_error.php.expectf index e14bacc8e..da2d3ab32 100644 --- a/hphp/test/zend/good/ext-standard-array/array_reverse_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_reverse_error.php.expectf @@ -1,12 +1,12 @@ *** Testing array_reverse() : error conditions *** -- Testing array_reverse() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_diff() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_shift_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_shift_error.php.expectf index 1279ae0d8..7ee81437e 100644 --- a/hphp/test/zend/good/ext-standard-array/array_shift_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_shift_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_shift() : error conditions *** -- Testing array_shift() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_shift() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_shift_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_shift_variation1.php.expectf index baff86b12..e92ba91ef 100644 --- a/hphp/test/zend/good/ext-standard-array/array_shift_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_shift_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing array_shift() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_slice_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_slice_error.php.expectf index ad41b062b..292c6a2d7 100644 --- a/hphp/test/zend/good/ext-standard-array/array_slice_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_slice_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_slice() : error conditions *** -- Testing array_slice() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_slice() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_slice_variation11.php.expectf b/hphp/test/zend/good/ext-standard-array/array_slice_variation11.php.expectf index b8cbe23d1..2fcaecf50 100644 --- a/hphp/test/zend/good/ext-standard-array/array_slice_variation11.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_slice_variation11.php.expectf @@ -1,71 +1,71 @@ *** Testing array_slice() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- @@ -73,30 +73,30 @@ array(0) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_slice_variation3.php b/hphp/test/zend/good/ext-standard-array/array_slice_variation3.php index 64f5e6bb0..e4df3377c 100644 --- a/hphp/test/zend/good/ext-standard-array/array_slice_variation3.php +++ b/hphp/test/zend/good/ext-standard-array/array_slice_variation3.php @@ -1,6 +1,6 @@ diff --git a/hphp/test/zend/good/ext-standard-array/array_sum_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_sum_error.php.expectf index 5d0667104..5e153d90f 100644 --- a/hphp/test/zend/good/ext-standard-array/array_sum_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_sum_error.php.expectf @@ -1,8 +1,8 @@ *** Testing array_sum() : error conditions *** -- Testing array_sum() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_sum() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_sum_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_sum_variation1.php.expectf index 7e54829cd..a5bd06e79 100644 --- a/hphp/test/zend/good/ext-standard-array/array_sum_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_sum_variation1.php.expectf @@ -1,71 +1,71 @@ *** Testing array_sum() : unexpected values for 'input' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation1.php.expectf index 15533abbb..42d0512b4 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation2.php.expectf index 15533abbb..42d0512b4 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation5.php.expectf index b4b130208..d51d071a9 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_assoc_variation5.php.expectf @@ -7,7 +7,7 @@ array(1) { } -- comparison function taking too many parameters -- -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> int(1) diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation1.php.expectf index 6d3d2bc23..c44886f86 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation2.php.expectf index 6d3d2bc23..c44886f86 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation6.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation6.php.expectf index 1305423f4..c466ccaca 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation6.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_uassoc_variation6.php.expectf @@ -7,7 +7,7 @@ array(1) { } -- comparison function taking too many parameters -- -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> int(1) diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_variation1.php.expectf index ada893c1a..20026ded3 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_variation2.php.expectf index ada893c1a..20026ded3 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_udiff() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_udiff_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_udiff_variation5.php.expectf index 1807ec9be..641e6955c 100644 --- a/hphp/test/zend/good/ext-standard-array/array_udiff_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_udiff_variation5.php.expectf @@ -7,7 +7,7 @@ array(1) { } -- comparison function taking too many parameters -- -HipHop Warning: %a +HipHop Warning: %s array(0) { } diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation1.php.expectf index 81eec6779..7ce80f461 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation2.php.expectf index 81eec6779..7ce80f461 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation4.php.expectf index 81eec6779..7ce80f461 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation4.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_assoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation5.php.expectf index 08c1ee9f8..c9245077b 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_assoc_variation5.php.expectf @@ -5,7 +5,7 @@ array(0) { } -- comparison function taking too many parameters -- -HipHop Warning: %a +HipHop Warning: %s array(0) { } diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation1.php.expectf index eba4e680b..c69002837 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation2.php.expectf index eba4e680b..c69002837 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation5.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation5.php.expectf index eba4e680b..c69002837 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_uassoc_variation5.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect_uassoc() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation1.php.expectf index 6342e48af..a63dd8241 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation1.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation2.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation2.php.expectf index 6342e48af..a63dd8241 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation2.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation4.php.expectf b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation4.php.expectf index 6342e48af..a63dd8241 100644 --- a/hphp/test/zend/good/ext-standard-array/array_uintersect_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_uintersect_variation4.php.expectf @@ -1,102 +1,102 @@ *** Testing array_uintersect() : usage variation *** --int 0-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 1-- -HipHop Warning: %a +HipHop Warning: %s NULL --int 12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --int -12345-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -10.5-- -HipHop Warning: %a +HipHop Warning: %s NULL --float 12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float -12.3456789000e10-- -HipHop Warning: %a +HipHop Warning: %s NULL --float .5-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase NULL-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase null-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase true-- -HipHop Warning: %a +HipHop Warning: %s NULL --lowercase false-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase TRUE-- -HipHop Warning: %a +HipHop Warning: %s NULL --uppercase FALSE-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --empty string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string DQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --string SQ-- -HipHop Warning: %a +HipHop Warning: %s NULL --mixed case string-- -HipHop Warning: %a +HipHop Warning: %s NULL --heredoc-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --instance of classWithoutToString-- -HipHop Warning: %a +HipHop Warning: %s NULL --undefined var-- -HipHop Warning: %a +HipHop Warning: %s NULL --unset var-- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_unique_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unique_error.php.expectf index 90d689878..e2bce328b 100644 --- a/hphp/test/zend/good/ext-standard-array/array_unique_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_unique_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_unique() : error conditions *** -- Testing array_unique() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_unique() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_unique_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unique_variation1.php.expectf index 2300fc0fd..90583a261 100644 --- a/hphp/test/zend/good/ext-standard-array/array_unique_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_unique_variation1.php.expectf @@ -1,74 +1,74 @@ *** Testing array_unique() : Passing non array values to $input argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_unshift_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_unshift_error.php.expectf index e2b0de339..2a593b4b0 100644 --- a/hphp/test/zend/good/ext-standard-array/array_unshift_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_unshift_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_unshift() : error conditions *** -- Testing array_unshift() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_unshift() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_values_error.php.expectf b/hphp/test/zend/good/ext-standard-array/array_values_error.php.expectf index 546857dbb..93b82c24a 100644 --- a/hphp/test/zend/good/ext-standard-array/array_values_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_values_error.php.expectf @@ -1,10 +1,10 @@ *** Testing array_values() : error conditions *** -- Testing array_values() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing array_values() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_values_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/array_values_variation1.php.expectf index 805c31dac..f2745ebea 100644 --- a/hphp/test/zend/good/ext-standard-array/array_values_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_values_variation1.php.expectf @@ -1,71 +1,71 @@ *** Testing array_values() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- @@ -73,30 +73,30 @@ array(0) { } -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 25 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/array_walk_basic2.php b/hphp/test/zend/good/ext-standard-array/array_walk_basic2.php index b64939de5..059759d70 100644 --- a/hphp/test/zend/good/ext-standard-array/array_walk_basic2.php +++ b/hphp/test/zend/good/ext-standard-array/array_walk_basic2.php @@ -22,7 +22,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/hphp/test/zend/good/ext-standard-array/array_walk_recursive_basic2.php b/hphp/test/zend/good/ext-standard-array/array_walk_recursive_basic2.php index d2a028dba..00269c1d4 100644 --- a/hphp/test/zend/good/ext-standard-array/array_walk_recursive_basic2.php +++ b/hphp/test/zend/good/ext-standard-array/array_walk_recursive_basic2.php @@ -22,7 +22,7 @@ function test_alter(&$item, $key, $prefix) // with proper type var_dump($item); // value var_dump($key); // key - var_dump($prefix); // additional agument passed to callback function + var_dump($prefix); // additional argument passed to callback function echo "\n"; // new line to separate the output between each element } diff --git a/hphp/test/zend/good/ext-standard-array/array_walk_recursive_variation7.php.expectf b/hphp/test/zend/good/ext-standard-array/array_walk_recursive_variation7.php.expectf index f66d92fee..9f187d8fc 100644 --- a/hphp/test/zend/good/ext-standard-array/array_walk_recursive_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_walk_recursive_variation7.php.expectf @@ -42,7 +42,7 @@ int(10) bool(true) -- Anonymous function with one more argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Anonymous function with null argument -- 1 diff --git a/hphp/test/zend/good/ext-standard-array/array_walk_variation7.php.expectf b/hphp/test/zend/good/ext-standard-array/array_walk_variation7.php.expectf index 0df02bf8e..4712628a1 100644 --- a/hphp/test/zend/good/ext-standard-array/array_walk_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/array_walk_variation7.php.expectf @@ -42,7 +42,7 @@ int(10) bool(true) -- Anonymous function with one more argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Anonymous function with null argument -- 1 diff --git a/hphp/test/zend/good/ext-standard-array/arsort_object1.php.expectf b/hphp/test/zend/good/ext-standard-array/arsort_object1.php.expectf index e3df27093..0df31a1ad 100644 --- a/hphp/test/zend/good/ext-standard-array/arsort_object1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/arsort_object1.php.expectf @@ -1,2 +1,2 @@ *** Testing arsort() : object functionality *** -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/arsort_object2.php.expectf b/hphp/test/zend/good/ext-standard-array/arsort_object2.php.expectf index e3df27093..0df31a1ad 100644 --- a/hphp/test/zend/good/ext-standard-array/arsort_object2.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/arsort_object2.php.expectf @@ -1,2 +1,2 @@ *** Testing arsort() : object functionality *** -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/arsort_variation1.php b/hphp/test/zend/good/ext-standard-array/arsort_variation1.php index 0fb2a5a8e..c2be5cf83 100644 --- a/hphp/test/zend/good/ext-standard-array/arsort_variation1.php +++ b/hphp/test/zend/good/ext-standard-array/arsort_variation1.php @@ -71,7 +71,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of arsort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/arsort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/arsort_variation1.php.expectf index 384f4f4cb..eb7cbfff9 100644 --- a/hphp/test/zend/good/ext-standard-array/arsort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/arsort_variation1.php.expectf @@ -4,210 +4,210 @@ -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -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) -- Iteration 2 -- -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) -- Iteration 3 -- -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) -- Iteration 4 -- -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) -- Iteration 5 -- -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) -- Iteration 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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -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) -- Iteration 8 -- -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) -- Iteration 9 -- -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) -- Iteration 10 -- -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) -- Iteration 11 -- -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) -- Iteration 12 -- -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) -- Iteration 13 -- -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) -- Iteration 14 -- -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) -- Iteration 15 -- -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) -- Iteration 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) -- Iteration 17 -- -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) -- Iteration 18 -- -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) -- Iteration 19 -- -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) -- Iteration 20 -- -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) -- Iteration 21 -- -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) -- Iteration 22 -- -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) -- Iteration 23 -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/asort_variation1.php b/hphp/test/zend/good/ext-standard-array/asort_variation1.php index 5c6ff3387..bfc1ee843 100644 --- a/hphp/test/zend/good/ext-standard-array/asort_variation1.php +++ b/hphp/test/zend/good/ext-standard-array/asort_variation1.php @@ -71,7 +71,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of asort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/asort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/asort_variation1.php.expectf index d8d0da390..aac490160 100644 --- a/hphp/test/zend/good/ext-standard-array/asort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/asort_variation1.php.expectf @@ -4,210 +4,210 @@ -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -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) -- Iteration 2 -- -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) -- Iteration 3 -- -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) -- Iteration 4 -- -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) -- Iteration 5 -- -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) -- Iteration 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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -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) -- Iteration 8 -- -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) -- Iteration 9 -- -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) -- Iteration 10 -- -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) -- Iteration 11 -- -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) -- Iteration 12 -- -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) -- Iteration 13 -- -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) -- Iteration 14 -- -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) -- Iteration 15 -- -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) -- Iteration 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) -- Iteration 17 -- -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) -- Iteration 18 -- -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) -- Iteration 19 -- -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) -- Iteration 20 -- -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) -- Iteration 21 -- -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) -- Iteration 22 -- -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) -- Iteration 23 -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/bug40191.php.expectf b/hphp/test/zend/good/ext-standard-array/bug40191.php.expectf index 68357b99d..55369d6b8 100644 --- a/hphp/test/zend/good/ext-standard-array/bug40191.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/bug40191.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/bug40709.php b/hphp/test/zend/good/ext-standard-array/bug40709.php index b8f96d301..a1b7ab733 100644 --- a/hphp/test/zend/good/ext-standard-array/bug40709.php +++ b/hphp/test/zend/good/ext-standard-array/bug40709.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/compact.php b/hphp/test/zend/good/ext-standard-array/compact.php new file mode 100644 index 000000000..d53d180b1 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-array/compact.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/compact.php.expectf b/hphp/test/zend/good/ext-standard-array/compact.php.expectf new file mode 100644 index 000000000..fc257eb7b --- /dev/null +++ b/hphp/test/zend/good/ext-standard-array/compact.php.expectf @@ -0,0 +1,6 @@ +array(2) { + ["event"]=> + string(8) "SIGGRAPH" + ["state"]=> + string(2) "CA" +} \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/compact_error.php.expectf b/hphp/test/zend/good/ext-standard-array/compact_error.php.expectf index 8006eda67..641e3bfd1 100644 --- a/hphp/test/zend/good/ext-standard-array/compact_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/compact_error.php.expectf @@ -1,6 +1,6 @@ *** Testing compact() : error conditions *** -- Testing compact() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/count_error.php.expectf b/hphp/test/zend/good/ext-standard-array/count_error.php.expectf index efb12368d..2cce944f0 100644 --- a/hphp/test/zend/good/ext-standard-array/count_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/count_error.php.expectf @@ -1,10 +1,10 @@ *** Testing count() : error conditions *** -- Testing count() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing count() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/current_error.php.expectf b/hphp/test/zend/good/ext-standard-array/current_error.php.expectf index d66f8ff3b..b8bbc0b45 100644 --- a/hphp/test/zend/good/ext-standard-array/current_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/current_error.php.expectf @@ -1,10 +1,10 @@ *** Testing current() : error conditions *** -- Testing current() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing current() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/each_error.php.expectf b/hphp/test/zend/good/ext-standard-array/each_error.php.expectf index e34e385aa..ba01084fc 100644 --- a/hphp/test/zend/good/ext-standard-array/each_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/each_error.php.expectf @@ -1,10 +1,10 @@ *** Testing each() : error conditions *** -- Testing each() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing each() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/end_error.php.expectf b/hphp/test/zend/good/ext-standard-array/end_error.php.expectf index 1440d64d4..0d5b50eef 100644 --- a/hphp/test/zend/good/ext-standard-array/end_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/end_error.php.expectf @@ -1,10 +1,10 @@ *** Testing end() : error conditions *** -- Testing end() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing end() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/key_error.php.expectf b/hphp/test/zend/good/ext-standard-array/key_error.php.expectf index 82d55b4fb..ea2777406 100644 --- a/hphp/test/zend/good/ext-standard-array/key_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/key_error.php.expectf @@ -1,10 +1,10 @@ *** Testing key() : error conditions *** -- Testing key() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing key() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/key_exists_error.php.expectf b/hphp/test/zend/good/ext-standard-array/key_exists_error.php.expectf index 805dad3dd..421d38bab 100644 --- a/hphp/test/zend/good/ext-standard-array/key_exists_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/key_exists_error.php.expectf @@ -1,5 +1,5 @@ *** Test by calling method or function with incorrect numbers of arguments *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/krsort_variation1.php b/hphp/test/zend/good/ext-standard-array/krsort_variation1.php index 76fc66e6c..1c1e354c9 100644 --- a/hphp/test/zend/good/ext-standard-array/krsort_variation1.php +++ b/hphp/test/zend/good/ext-standard-array/krsort_variation1.php @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of krsort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/krsort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/krsort_variation1.php.expectf index 6a1b78fa8..252bbf4f2 100644 --- a/hphp/test/zend/good/ext-standard-array/krsort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/krsort_variation1.php.expectf @@ -4,210 +4,210 @@ -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -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) -- Iteration 2 -- -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) -- Iteration 3 -- -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) -- Iteration 4 -- -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) -- Iteration 5 -- -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) -- Iteration 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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -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) -- Iteration 8 -- -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) -- Iteration 9 -- -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) -- Iteration 10 -- -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) -- Iteration 11 -- -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) -- Iteration 12 -- -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) -- Iteration 13 -- -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) -- Iteration 14 -- -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) -- Iteration 15 -- -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) -- Iteration 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) -- Iteration 17 -- -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) -- Iteration 18 -- -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) -- Iteration 19 -- -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) -- Iteration 20 -- -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) -- Iteration 21 -- -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) -- Iteration 22 -- -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) -- Iteration 23 -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/ksort_variation1.php b/hphp/test/zend/good/ext-standard-array/ksort_variation1.php index b7d4e639d..9f596d807 100644 --- a/hphp/test/zend/good/ext-standard-array/ksort_variation1.php +++ b/hphp/test/zend/good/ext-standard-array/ksort_variation1.php @@ -69,7 +69,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of ksort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/ksort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/ksort_variation1.php.expectf index cf2614cbc..c83ec86eb 100644 --- a/hphp/test/zend/good/ext-standard-array/ksort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/ksort_variation1.php.expectf @@ -4,210 +4,210 @@ -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -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) -- Iteration 2 -- -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) -- Iteration 3 -- -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) -- Iteration 4 -- -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) -- Iteration 5 -- -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) -- Iteration 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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -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) -- Iteration 8 -- -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) -- Iteration 9 -- -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) -- Iteration 10 -- -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) -- Iteration 11 -- -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) -- Iteration 12 -- -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) -- Iteration 13 -- -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) -- Iteration 14 -- -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) -- Iteration 15 -- -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) -- Iteration 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) -- Iteration 17 -- -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) -- Iteration 18 -- -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) -- Iteration 19 -- -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) -- Iteration 20 -- -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) -- Iteration 21 -- -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) -- Iteration 22 -- -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) -- Iteration 23 -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/locale_sort.php b/hphp/test/zend/good/ext-standard-array/locale_sort.php new file mode 100644 index 000000000..a9e924e0a --- /dev/null +++ b/hphp/test/zend/good/ext-standard-array/locale_sort.php @@ -0,0 +1,18 @@ + "Alberta", +"BC" => "Colombie-Britannique", +"MB" => "Manitoba", +"NB" => "Nouveau-Brunswick", +"NL" => "Terre-Neuve-et-Labrador", +"NS" => "Nouvelle-Écosse", +"ON" => "Ontario", +"PE" => "Île-du-Prince-Édouard", +"QC" => "Québec", +"SK" => "Saskatchewan", +"NT" => "Territoires du Nord-Ouest", +"NU" => "Nunavut", +"YT" => "Territoire du Yukon"); +asort($table, SORT_LOCALE_STRING); +var_dump($table); +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/locale_sort.php.expectf b/hphp/test/zend/good/ext-standard-array/locale_sort.php.expectf new file mode 100644 index 000000000..bf0824e25 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-array/locale_sort.php.expectf @@ -0,0 +1,28 @@ +array(13) { + ["AB"]=> + string(7) "Alberta" + ["BC"]=> + string(20) "Colombie-Britannique" + ["PE"]=> + string(21) "Île-du-Prince-Édouard" + ["MB"]=> + string(8) "Manitoba" + ["NB"]=> + string(17) "Nouveau-Brunswick" + ["NS"]=> + string(15) "Nouvelle-Écosse" + ["NU"]=> + string(7) "Nunavut" + ["ON"]=> + string(7) "Ontario" + ["QC"]=> + string(6) "Québec" + ["SK"]=> + string(12) "Saskatchewan" + ["NL"]=> + string(23) "Terre-Neuve-et-Labrador" + ["YT"]=> + string(19) "Territoire du Yukon" + ["NT"]=> + string(25) "Territoires du Nord-Ouest" +} \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/natcasesort_error.php.expectf b/hphp/test/zend/good/ext-standard-array/natcasesort_error.php.expectf index 14457f43b..2fd9a7982 100644 --- a/hphp/test/zend/good/ext-standard-array/natcasesort_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/natcasesort_error.php.expectf @@ -1,10 +1,10 @@ *** Testing natcasesort() : error conditions *** -- Testing natcasesort() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing natcasesort() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/next_error.php.expectf b/hphp/test/zend/good/ext-standard-array/next_error.php.expectf index db5cbbd4a..c150d3613 100644 --- a/hphp/test/zend/good/ext-standard-array/next_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/next_error.php.expectf @@ -1,10 +1,10 @@ *** Testing next() : error conditions *** -- Testing next() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing next() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/prev_error1.php.expectf b/hphp/test/zend/good/ext-standard-array/prev_error1.php.expectf index 75dc24e26..5130d3d3a 100644 --- a/hphp/test/zend/good/ext-standard-array/prev_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/prev_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing prev() : error conditions *** -- Testing prev() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing prev() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf b/hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/prev_error3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/reset_error.php.expectf b/hphp/test/zend/good/ext-standard-array/reset_error.php.expectf index 4e9be624a..6405c86cf 100644 --- a/hphp/test/zend/good/ext-standard-array/reset_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/reset_error.php.expectf @@ -1,10 +1,10 @@ *** Testing reset() : error conditions *** -- Testing reset() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing reset() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/rsort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/rsort_variation1.php.expectf index 3f710c2f9..35f3b11ac 100644 --- a/hphp/test/zend/good/ext-standard-array/rsort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/rsort_variation1.php.expectf @@ -1,314 +1,314 @@ *** Testing rsort() : variation *** -- Iteration 1 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 10 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 11 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 12 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 13 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 14 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 15 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 24 -- Flag = default: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_REGULAR: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_NUMERIC: -HipHop Warning: %a +HipHop Warning: %s bool(false) Flag = SORT_STRING: -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/shuffle_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/shuffle_variation1.php.expectf index 532f28b7a..17020a50a 100644 --- a/hphp/test/zend/good/ext-standard-array/shuffle_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/shuffle_variation1.php.expectf @@ -1,94 +1,94 @@ *** Testing shuffle() : with unexpected values for 'array_arg' argument *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- 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 Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/sizeof_basic2.php b/hphp/test/zend/good/ext-standard-array/sizeof_basic2.php index f6f98b301..d6d7e68c3 100644 --- a/hphp/test/zend/good/ext-standard-array/sizeof_basic2.php +++ b/hphp/test/zend/good/ext-standard-array/sizeof_basic2.php @@ -16,7 +16,7 @@ echo "*** Testing sizeof() : basic functionality ***\n"; $int_array = array(1, 2, 3, 4); $string_array = array("Saffron", "White", "Green"); -$indexed_array = array("Agression" => "Saffron", "Peace" => "White", "Growth" => "Green"); +$indexed_array = array("Aggression" => "Saffron", "Peace" => "White", "Growth" => "Green"); $mixed_array = array(1, 2, "Aggression" => "Saffron", 10 => "Ten", "Ten" => 10); echo "-- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/sizeof_error.php.expectf b/hphp/test/zend/good/ext-standard-array/sizeof_error.php.expectf index 2727356c0..01578180b 100644 --- a/hphp/test/zend/good/ext-standard-array/sizeof_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/sizeof_error.php.expectf @@ -1,11 +1,11 @@ *** Testing sizeof() : error conditions *** -- Testing sizeof() with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing sizeof() function with more than two arguments under COUNT_NORMAL mode -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing sizeof() function with more than two arguments under COUNT_RECURSIVE mode -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/sort_variation1.php b/hphp/test/zend/good/ext-standard-array/sort_variation1.php index a180bae28..2b3c5e6ec 100644 --- a/hphp/test/zend/good/ext-standard-array/sort_variation1.php +++ b/hphp/test/zend/good/ext-standard-array/sort_variation1.php @@ -70,7 +70,7 @@ $unexpected_values = array ( ); // loop though each element of the array and check the working of sort() -// when $array arugment is supplied with different values from $unexpected_values +// when $array argument is supplied with different values from $unexpected_values echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n"; echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; diff --git a/hphp/test/zend/good/ext-standard-array/sort_variation1.php.expectf b/hphp/test/zend/good/ext-standard-array/sort_variation1.php.expectf index 2671bb394..b3f696430 100644 --- a/hphp/test/zend/good/ext-standard-array/sort_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/sort_variation1.php.expectf @@ -4,210 +4,210 @@ -- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING -- -- Iteration 1 -- -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) -- Iteration 2 -- -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) -- Iteration 3 -- -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) -- Iteration 4 -- -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) -- Iteration 5 -- -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) -- Iteration 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) -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- -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) -- Iteration 8 -- -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) -- Iteration 9 -- -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) -- Iteration 10 -- -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) -- Iteration 11 -- -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) -- Iteration 12 -- -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) -- Iteration 13 -- -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) -- Iteration 14 -- -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) -- Iteration 15 -- -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) -- Iteration 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) -- Iteration 17 -- -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) -- Iteration 18 -- -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) -- Iteration 19 -- -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) -- Iteration 20 -- -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) -- Iteration 21 -- -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) -- Iteration 22 -- -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) -- Iteration 23 -- -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) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/uasort_variation9.php b/hphp/test/zend/good/ext-standard-array/uasort_variation9.php index 4bb25af34..9979428d6 100644 --- a/hphp/test/zend/good/ext-standard-array/uasort_variation9.php +++ b/hphp/test/zend/good/ext-standard-array/uasort_variation9.php @@ -11,7 +11,7 @@ echo "*** Testing uasort() : 'cmp_function' with reference arguments ***\n"; // comparison function /* Prototype : int cmp(mixed &$value1, mixed &$value2) - * Parameters : $value1 and $value2 - values recieved by reference + * Parameters : $value1 and $value2 - values received by reference * Return value : 0 - if both values are same * 1 - if value1 is greater than value2 * -1 - if value1 is less than value2 diff --git a/hphp/test/zend/good/ext-standard-array/uksort_error.php.expectf b/hphp/test/zend/good/ext-standard-array/uksort_error.php.expectf index a3f4ee316..e62edc7e8 100644 --- a/hphp/test/zend/good/ext-standard-array/uksort_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/uksort_error.php.expectf @@ -1,14 +1,14 @@ *** Testing uksort() : error conditions *** -- Testing uksort() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uksort() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing uksort() function with zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-array/usort_error1.php.expectf b/hphp/test/zend/good/ext-standard-array/usort_error1.php.expectf index 4ca740bec..ea049024c 100644 --- a/hphp/test/zend/good/ext-standard-array/usort_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-array/usort_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing usort() : error conditions *** -- Testing usort() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing usort() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/class_exists_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/class_exists_error_001.php.expectf index 611a45313..51e2ff0b1 100644 --- a/hphp/test/zend/good/ext-standard-class_object/class_exists_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/class_exists_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing class_exists() : error conditions *** -- Testing class_exists() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing class_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/get_class_methods_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_class_methods_error_001.php.expectf index 859cf40b4..4f921c6dd 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_class_methods_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_class_methods_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing get_class_methods() : error conditions *** -- Testing get_class_methods() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_class_methods() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/get_class_vars_error.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_class_vars_error.php.expectf index 65933fc9f..7ccfb7a75 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_class_vars_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_class_vars_error.php.expectf @@ -1,10 +1,10 @@ *** Testing get_class_vars() : error conditions *** -- Testing get_class_vars() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_class_vars() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_classes_basic_001.php b/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_basic_001.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_classes_basic_001.php rename to hphp/test/zend/good/ext-standard-class_object/get_declared_classes_basic_001.php diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_classes_basic_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_basic_001.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_classes_basic_001.php.expectf rename to hphp/test/zend/good/ext-standard-class_object/get_declared_classes_basic_001.php.expectf diff --git a/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_error_001.php.expectf index 5881b9d22..d03a30e15 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_declared_classes_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing get_declared_classes() : error conditions *** -- Testing get_declared_classes() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_interfaces_basic_001.php b/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_basic_001.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_interfaces_basic_001.php rename to hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_basic_001.php diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_interfaces_basic_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_basic_001.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_interfaces_basic_001.php.expectf rename to hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_basic_001.php.expectf diff --git a/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_error_001.php.expectf index 85bf122a6..29c8e629d 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_declared_interfaces_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing get_declared_interfaces() : error conditions *** -- Testing get_declared_interfaces() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_traits_basic_001.php b/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_basic_001.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_traits_basic_001.php rename to hphp/test/zend/good/ext-standard-class_object/get_declared_traits_basic_001.php diff --git a/hphp/test/zend/bad/ext-standard-class_object/get_declared_traits_basic_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_basic_001.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-class_object/get_declared_traits_basic_001.php.expectf rename to hphp/test/zend/good/ext-standard-class_object/get_declared_traits_basic_001.php.expectf diff --git a/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_error_001.php.expectf index 74c16acbd..6d88ef8b5 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_declared_traits_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing get_declared_traits() : error conditions *** -- Testing get_declared_traits() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_object_vars_error_001.php.expectf index ce17cac5e..bc26ab091 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_object_vars_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing get_object_vars() : error conditions *** -- Testing get_object_vars() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_object_vars() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf index 4a6d3e2b2..f40b4c3ee 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_object_vars_variation_003.php.expectf @@ -1,108 +1,108 @@ *** Testing get_object_vars() : usage variations *** -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s Arg value 0 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value Array -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value 1 -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value string -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Arg value -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/get_parent_class_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/get_parent_class_error_001.php.expectf index 896ec287a..c6e44eb47 100644 --- a/hphp/test/zend/good/ext-standard-class_object/get_parent_class_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/get_parent_class_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing get_parent_class() : error conditions *** -- Testing get_parent_class() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/interface_exists_error.php.expectf b/hphp/test/zend/good/ext-standard-class_object/interface_exists_error.php.expectf index 1ff5a66de..5774cd86a 100644 --- a/hphp/test/zend/good/ext-standard-class_object/interface_exists_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/interface_exists_error.php.expectf @@ -1,10 +1,10 @@ *** Testing interface_exists() : error conditions *** -- Testing interface_exists() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing interface_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/method_exists_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/method_exists_error_001.php.expectf index 63ceae856..4a52936b2 100644 --- a/hphp/test/zend/good/ext-standard-class_object/method_exists_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/method_exists_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing method_exists() : error conditions *** -- Testing method_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing method_exists() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/property_exists_error.php.expectf b/hphp/test/zend/good/ext-standard-class_object/property_exists_error.php.expectf index 08e0bdb82..210a59590 100644 --- a/hphp/test/zend/good/ext-standard-class_object/property_exists_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/property_exists_error.php.expectf @@ -1,14 +1,14 @@ *** Testing property_exists() : error conditions *** -- Testing property_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing property_exists() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing property_exists() function with incorrect arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-class_object/trait_exists_error_001.php.expectf b/hphp/test/zend/good/ext-standard-class_object/trait_exists_error_001.php.expectf index ebf9563ba..fe818f72e 100644 --- a/hphp/test/zend/good/ext-standard-class_object/trait_exists_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-class_object/trait_exists_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing trait_exists() : error conditions *** -- Testing trait_exists() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing trait_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/closedir_variation1.php.expectf b/hphp/test/zend/good/ext-standard-dir/closedir_variation1.php.expectf index 655308f57..20734c266 100644 --- a/hphp/test/zend/good/ext-standard-dir/closedir_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-dir/closedir_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing closedir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/getcwd_error.php.expectf b/hphp/test/zend/good/ext-standard-dir/getcwd_error.php.expectf index 6c471ce9a..054645554 100644 --- a/hphp/test/zend/good/ext-standard-dir/getcwd_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-dir/getcwd_error.php.expectf @@ -1,6 +1,6 @@ *** Testing getcwd() : error conditions *** -- Testing getcwd() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/readdir_variation7.php.expectf b/hphp/test/zend/good/ext-standard-dir/readdir_variation7.php.expectf index ebacf243d..4064ce5f3 100644 --- a/hphp/test/zend/good/ext-standard-dir/readdir_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-dir/readdir_variation7.php.expectf @@ -1,5 +1,5 @@ *** Testing readdir() : usage variations *** resource(%d) of type (stream) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-dir/rewinddir_variation1.php.expectf b/hphp/test/zend/good/ext-standard-dir/rewinddir_variation1.php.expectf index 9afa3f447..0de5fc60b 100644 --- a/hphp/test/zend/good/ext-standard-dir/rewinddir_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-dir/rewinddir_variation1.php.expectf @@ -1,98 +1,98 @@ *** Testing rewinddir() : usage variations *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 24 -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/basename_error.php.expectf b/hphp/test/zend/good/ext-standard-file/basename_error.php.expectf index 7e57ea3b2..95965b9cc 100644 --- a/hphp/test/zend/good/ext-standard-file/basename_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/basename_error.php.expectf @@ -1,10 +1,10 @@ *** Testing basename() : error conditions *** -- Testing basename() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing basename() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/bug24482.php b/hphp/test/zend/good/ext-standard-file/bug24482.php index 42ec24c60..83c0fedc3 100644 --- a/hphp/test/zend/good/ext-standard-file/bug24482.php +++ b/hphp/test/zend/good/ext-standard-file/bug24482.php @@ -1,4 +1,9 @@ + \ No newline at end of file +?> diff --git a/hphp/test/zend/bad/ext-standard-file/bug53241.php.expectf b/hphp/test/zend/good/ext-standard-file/bug53241.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-file/bug53241.php.expectf rename to hphp/test/zend/good/ext-standard-file/bug53241.php.expectf diff --git a/hphp/test/zend/good/ext-standard-file/clearstatcache_error.php.expectf b/hphp/test/zend/good/ext-standard-file/clearstatcache_error.php.expectf index ab9277574..2e62b618e 100644 --- a/hphp/test/zend/good/ext-standard-file/clearstatcache_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/clearstatcache_error.php.expectf @@ -1,4 +1,4 @@ *** Testing clearstatcache() function: error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/dirname_error.php.expectf b/hphp/test/zend/good/ext-standard-file/dirname_error.php.expectf index e95c195a1..71ceb9a49 100644 --- a/hphp/test/zend/good/ext-standard-file/dirname_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/dirname_error.php.expectf @@ -1,10 +1,10 @@ *** Testing dirname() : error conditions *** -- Testing dirname() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing dirname() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fclose_variation1.php.expectf b/hphp/test/zend/good/ext-standard-file/fclose_variation1.php.expectf index 46941ec3a..167e186cd 100644 --- a/hphp/test/zend/good/ext-standard-file/fclose_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fclose_variation1.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s Done. \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/feof_basic.php.expectf b/hphp/test/zend/good/ext-standard-file/feof_basic.php.expectf index b7da35858..29990e629 100644 --- a/hphp/test/zend/good/ext-standard-file/feof_basic.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/feof_basic.php.expectf @@ -23,5 +23,5 @@ bool(false) *** testing feof after a seek passed the end *** bool(false) *** closing file, testing eof *** -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fgetc_variation4.php b/hphp/test/zend/good/ext-standard-file/fgetc_variation4.php index 3739c6f4a..0f02b3fea 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetc_variation4.php +++ b/hphp/test/zend/good/ext-standard-file/fgetc_variation4.php @@ -26,7 +26,7 @@ foreach ($file_modes as $file_mode ) { $data = "fgetc\n test"; fwrite($file_handle, $data); - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); var_dump( feof($file_handle) ); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php index 191f16e6f..2621b1b79 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation10.php @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php index 969053317..921f48457 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation13.php @@ -33,7 +33,7 @@ $loop_counter = 1; fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php index 13c3247c3..7a0926a1d 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation14.php @@ -33,7 +33,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php index fe952ee61..4dfb508d3 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation15.php @@ -50,7 +50,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php index dca119fdc..c44bda718 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation16.php @@ -52,7 +52,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php index 123b819da..097119d74 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation18.php @@ -52,7 +52,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php index a19b4d6be..704ec0a05 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation20.php @@ -35,7 +35,7 @@ $loop_counter = 1; fwrite($file_handle, "This is line of text without csv fields\n"); // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php index 2d616c7cc..246afc868 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation21.php @@ -35,7 +35,7 @@ $loop_counter = 1; fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php index a53f79764..a3cb57fc9 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation29.php @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php similarity index 97% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php index d5f530a2c..1d71b8976 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php @@ -56,7 +56,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php.expectf b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php.expectf similarity index 82% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php.expectf rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php.expectf index b70c2e65b..d7583c689 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation3.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with delimiter as NULL *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php index 1b7eb7dd4..35999d2ad 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation31.php @@ -54,7 +54,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php similarity index 97% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php index 489ab072d..e065c1311 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php @@ -55,7 +55,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php.expectf b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php.expectf similarity index 82% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php.expectf rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php.expectf index 462bc6257..03ab78600 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation4.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with enclosure as NULL *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php similarity index 97% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php index f043e4fcd..9514844e6 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php.expectf b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php.expectf similarity index 82% rename from hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php.expectf rename to hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php.expectf index 48ac1b587..f6c119e1d 100644 --- a/hphp/test/zend/bad/ext-standard-file/fgetcsv_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation5.php.expectf @@ -1,721 +1,721 @@ *** Testing fgetcsv() : with delimiter & enclosure as NULL *** -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rb mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using rt mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using r+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+ mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+b mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x+t mode -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php index 314087e09..40f7997a0 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation8.php @@ -59,7 +59,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php index 2daa13e3d..da23d6176 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php +++ b/hphp/test/zend/good/ext-standard-file/fgetcsv_variation9.php @@ -58,7 +58,7 @@ foreach ($csv_lists as $csv_list) { fwrite($file_handle, "\n"); // blank line // close the file if the mode to be used is read mode and re-open using read mode - // else rewind the file pointer to begining of the file + // else rewind the file pointer to beginning of the file if ( strstr($file_modes[$mode_counter], "r" ) ) { fclose($file_handle); $file_handle = fopen($filename, $file_modes[$mode_counter]); diff --git a/hphp/test/zend/good/ext-standard-file/fgetss_variation5.php b/hphp/test/zend/good/ext-standard-file/fgetss_variation5.php index 7fe1aec38..e9f095f19 100644 --- a/hphp/test/zend/good/ext-standard-file/fgetss_variation5.php +++ b/hphp/test/zend/good/ext-standard-file/fgetss_variation5.php @@ -40,7 +40,7 @@ for($mode_counter = 0; $mode_counter < count($file_modes); $mode_counter++) { echo "Error: failed to open file $filename!\n"; exit(); } - // rewind the file pointer to begining of the file + // rewind the file pointer to beginning of the file var_dump( filesize($filename) ); var_dump( rewind($file_handle) ); var_dump( ftell($file_handle) ); diff --git a/hphp/test/zend/good/ext-standard-file/file_exists_error.php.expectf b/hphp/test/zend/good/ext-standard-file/file_exists_error.php.expectf index 4391e239f..49d93ff78 100644 --- a/hphp/test/zend/good/ext-standard-file/file_exists_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/file_exists_error.php.expectf @@ -1,10 +1,10 @@ *** Testing file_exists() : error conditions *** -- Testing file_exists() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing file_exists() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/file_get_contents_variation7.php.expectf b/hphp/test/zend/good/ext-standard-file/file_get_contents_variation7.php.expectf index 496dc945d..7c7317c47 100644 --- a/hphp/test/zend/good/ext-standard-file/file_get_contents_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/file_get_contents_variation7.php.expectf @@ -13,11 +13,11 @@ string(%d) "contents read" string(%d) "contents read" -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -33,7 +33,7 @@ string(%d) "contents read" string(%d) "contents read" -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/file_put_contents_variation7.php.expectf b/hphp/test/zend/good/ext-standard-file/file_put_contents_variation7.php.expectf index f06bb59f5..c5a584f60 100644 --- a/hphp/test/zend/good/ext-standard-file/file_put_contents_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/file_put_contents_variation7.php.expectf @@ -13,11 +13,11 @@ Data written correctly Data written correctly -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s No data written -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s No data written -- Iteration 7 -- @@ -33,7 +33,7 @@ Data written correctly Data written correctly -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s No data written *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/file_variation8.php.expectf b/hphp/test/zend/good/ext-standard-file/file_variation8.php.expectf index 6aa89f8f9..d08089171 100644 --- a/hphp/test/zend/good/ext-standard-file/file_variation8.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/file_variation8.php.expectf @@ -25,11 +25,11 @@ array(1) { } -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -57,7 +57,7 @@ array(1) { } -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_basic.php b/hphp/test/zend/good/ext-standard-file/fileinode_basic.php similarity index 94% rename from hphp/test/zend/bad/ext-standard-file/fileinode_basic.php rename to hphp/test/zend/good/ext-standard-file/fileinode_basic.php index d86e1918e..2112f40a1 100644 --- a/hphp/test/zend/bad/ext-standard-file/fileinode_basic.php +++ b/hphp/test/zend/good/ext-standard-file/fileinode_basic.php @@ -18,6 +18,7 @@ print( fileinode(__FILE__) )."\n"; print( fileinode(".") )."\n"; print( fileinode("./..") )."\n"; -echo "\n*** Done ***"; + \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fileinode_basic.php.expectf b/hphp/test/zend/good/ext-standard-file/fileinode_basic.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-file/fileinode_basic.php.expectf rename to hphp/test/zend/good/ext-standard-file/fileinode_basic.php.expectf diff --git a/hphp/test/zend/good/ext-standard-file/fpassthru_variation.php b/hphp/test/zend/good/ext-standard-file/fpassthru_variation.php index 114404e8e..73e925154 100644 --- a/hphp/test/zend/good/ext-standard-file/fpassthru_variation.php +++ b/hphp/test/zend/good/ext-standard-file/fpassthru_variation.php @@ -9,7 +9,7 @@ echo "*** Testing fpassthru() function with files ***\n\n"; echo "--- Testing with different offsets ---\n"; -$file_name = dirname(__FILE__)."/fpassthru_variation.tmp"; +$file_name = dirname(__FILE__)."/passthru_variation.tmp"; $file_write = fopen($file_name, "w"); fwrite($file_write, "1234567890abcdefghijklmnopqrstuvwxyz"); fclose($file_write); diff --git a/hphp/test/zend/good/ext-standard-file/fpassthru_variation1.php.expectf b/hphp/test/zend/good/ext-standard-file/fpassthru_variation1.php.expectf index 2fa3b919d..e6faa0046 100644 --- a/hphp/test/zend/good/ext-standard-file/fpassthru_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fpassthru_variation1.php.expectf @@ -1,110 +1,110 @@ *** Testing fpassthru() : usage variations *** Arg value 0 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 12345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -2345 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -10.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 101234567000 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1.07654321E-9 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 0.5 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value Array -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value 1 -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value string -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value testClass -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Arg value -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation2.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation2.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation2.php rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation2.php diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation2.php.expectf b/hphp/test/zend/good/ext-standard-file/fputcsv_variation2.php.expectf similarity index 78% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation2.php.expectf rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation2.php.expectf index 1a089eaa7..15291bcab 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fputcsv_variation2.php.expectf @@ -1,756 +1,756 @@ *** Testing fputcsv() : with delimiter as NULL *** -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation3.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation3.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation3.php rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation3.php diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation3.php.expectf b/hphp/test/zend/good/ext-standard-file/fputcsv_variation3.php.expectf similarity index 78% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation3.php.expectf rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation3.php.expectf index 6a2848fa0..4af2745f7 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fputcsv_variation3.php.expectf @@ -1,756 +1,756 @@ *** Testing fputcsv() : with enclosure as NULL *** -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation4.php b/hphp/test/zend/good/ext-standard-file/fputcsv_variation4.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation4.php rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation4.php diff --git a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation4.php.expectf b/hphp/test/zend/good/ext-standard-file/fputcsv_variation4.php.expectf similarity index 78% rename from hphp/test/zend/bad/ext-standard-file/fputcsv_variation4.php.expectf rename to hphp/test/zend/good/ext-standard-file/fputcsv_variation4.php.expectf index 79c966170..aa6124ef2 100644 --- a/hphp/test/zend/bad/ext-standard-file/fputcsv_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fputcsv_variation4.php.expectf @@ -1,756 +1,756 @@ *** Testing fputcsv() : with delimiter and enclosure as NULL *** -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in r+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in a+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in w+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+ -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+b -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) string(0) "" -- file opened in x+t -- -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) bool(false) diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation1.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation1.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation1.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation2.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation2.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation2.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation3.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation3.php.expectf index 2ec6984df..4c1d0da4d 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation3.php.expectf @@ -1,13 +1,13 @@ -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) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation4.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation4.php.expectf index 04e26233c..b968e1ff7 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation4.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation4.php.expectf @@ -1,11 +1,11 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation5.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation5.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation5.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/fstat_variation7.php.expectf b/hphp/test/zend/good/ext-standard-file/fstat_variation7.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-standard-file/fstat_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/fstat_variation7.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/get_current_user.php.expectf b/hphp/test/zend/good/ext-standard-file/get_current_user.php.expectf index 6ab26c714..2c62bdebe 100644 --- a/hphp/test/zend/good/ext-standard-file/get_current_user.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/get_current_user.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL string(%d) %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/is_executable_error.php.expectf b/hphp/test/zend/good/ext-standard-file/is_executable_error.php.expectf index 9dc724004..f790c2716 100644 --- a/hphp/test/zend/good/ext-standard-file/is_executable_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/is_executable_error.php.expectf @@ -1,7 +1,7 @@ *** Testing is_executable(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing is_exceutable() on non-existent directory *** diff --git a/hphp/test/zend/good/ext-standard-file/is_readable_error.php.expectf b/hphp/test/zend/good/ext-standard-file/is_readable_error.php.expectf index 11bd2cb52..e80fbcfe5 100644 --- a/hphp/test/zend/good/ext-standard-file/is_readable_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/is_readable_error.php.expectf @@ -1,7 +1,7 @@ *** Testing is_readable(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing is_readable() on non-existent file *** diff --git a/hphp/test/zend/good/ext-standard-file/is_writable_error.php.expectf b/hphp/test/zend/good/ext-standard-file/is_writable_error.php.expectf index 6819aac71..2b4d8ad2d 100644 --- a/hphp/test/zend/good/ext-standard-file/is_writable_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/is_writable_error.php.expectf @@ -1,13 +1,13 @@ *** Testing is_writable(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing is_writeable(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing is_writable() on non-existent file *** diff --git a/hphp/test/zend/good/ext-standard-file/parse_ini_file_variation6.php.expectf b/hphp/test/zend/good/ext-standard-file/parse_ini_file_variation6.php.expectf index 6d88edc71..08095176c 100644 --- a/hphp/test/zend/good/ext-standard-file/parse_ini_file_variation6.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/parse_ini_file_variation6.php.expectf @@ -25,11 +25,11 @@ array(1) { } -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -57,7 +57,7 @@ array(1) { } -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/pathinfo_error.php.expectf b/hphp/test/zend/good/ext-standard-file/pathinfo_error.php.expectf index 1a461222a..0da12052a 100644 --- a/hphp/test/zend/good/ext-standard-file/pathinfo_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/pathinfo_error.php.expectf @@ -1,6 +1,6 @@ *** Testing pathinfo() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/readfile_variation9.php.expectf b/hphp/test/zend/good/ext-standard-file/readfile_variation9.php.expectf index 2683bca7a..80f1ca1f1 100644 --- a/hphp/test/zend/good/ext-standard-file/readfile_variation9.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/readfile_variation9.php.expectf @@ -9,10 +9,10 @@ The File Contents -- Iteration 4 -- The File Contents -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s -- Iteration 7 -- The File Contents @@ -23,6 +23,6 @@ The File Contents -- Iteration 10 -- The File Contents -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/readlink_realpath_basic1.php.expectf b/hphp/test/zend/good/ext-standard-file/readlink_realpath_basic1.php.expectf index ca6276ba8..e64991e8d 100644 --- a/hphp/test/zend/good/ext-standard-file/readlink_realpath_basic1.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/readlink_realpath_basic1.php.expectf @@ -13,22 +13,22 @@ string(%d) "%s/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp" string(%d) "%s/readlink_realpath_basic1/home/test/readlink_realpath_basic1.tmp" -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) %s -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/readlink_realpath_error.php.expectf b/hphp/test/zend/good/ext-standard-file/readlink_realpath_error.php.expectf index f5e0ae56a..ea0271a2a 100644 --- a/hphp/test/zend/good/ext-standard-file/readlink_realpath_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/readlink_realpath_error.php.expectf @@ -1,24 +1,24 @@ *** Testing readlink(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing readlink() on a non-existent link *** -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing readlink() on existing file *** -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing readlink() on existing directory *** -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Testing realpath(): error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Testing realpath() on a non-existent file *** diff --git a/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation1.php.expectf b/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation1.php.expectf index 694a7f012..2720c3bc6 100644 --- a/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation1.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation1.php.expectf @@ -12,11 +12,11 @@ string(%d) "%s/readlink_realpath_variation1/home/tests/link/readlink_realpath_va -- Testing readlink() and realpath() with hardlink, linkname stored inside an object -- bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s/readlink_realpath_variation1/home/readlink_realpath_variation1_link.tmp" bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s/readlink_realpath_variation1_link.tmp" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation3.php.expectf b/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation3.php.expectf index 49ea9a8c4..848882ded 100644 --- a/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation3.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/readlink_realpath_variation3.php.expectf @@ -2,27 +2,27 @@ *** Testing readlink() and realpath() with linkname as empty string, NULL and single space *** -- Iteration1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) %s -- Iteration2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) %s -- Iteration3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" -- Iteration4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" -- Iteration5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" -- Iteration6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%s" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/realpath_error-win32.php.expectf b/hphp/test/zend/good/ext-standard-file/realpath_error-win32.php.expectf index af14cb64f..2957f74c6 100644 --- a/hphp/test/zend/good/ext-standard-file/realpath_error-win32.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/realpath_error-win32.php.expectf @@ -1,6 +1,6 @@ *** Testing realpath() for error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/rename_variation6-win32.php.expectf b/hphp/test/zend/good/ext-standard-file/rename_variation6-win32.php.expectf index d9d61faa0..3cf587f90 100644 --- a/hphp/test/zend/good/ext-standard-file/rename_variation6-win32.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/rename_variation6-win32.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%srename_variation6-win32.php.tmp" bool(true) diff --git a/hphp/test/zend/good/ext-standard-file/rename_variation6.php.expectf b/hphp/test/zend/good/ext-standard-file/rename_variation6.php.expectf index a7661dd60..eb2fa5399 100644 --- a/hphp/test/zend/good/ext-standard-file/rename_variation6.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/rename_variation6.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%srename_variation6.php.tmp" bool(true) diff --git a/hphp/test/zend/good/ext-standard-file/rename_variation7.php.expectf b/hphp/test/zend/good/ext-standard-file/rename_variation7.php.expectf index 3e3a0e9c6..8c2b0c433 100644 --- a/hphp/test/zend/good/ext-standard-file/rename_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/rename_variation7.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) string(%d) "%sthere_is_no_such_file" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-file/tempnam_error.php.expectf b/hphp/test/zend/good/ext-standard-file/tempnam_error.php.expectf index 3c0bbc51d..43f34485a 100644 --- a/hphp/test/zend/good/ext-standard-file/tempnam_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-file/tempnam_error.php.expectf @@ -1,16 +1,16 @@ *** Testing tempnam() error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/bug60227_1.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/bug60227_1.php.expectf index cf56c863f..ae2d7dcb0 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/bug60227_1.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/bug60227_1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s foo \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/call_user_func_array_variation_001.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/call_user_func_array_variation_001.php.expectf index d9cb61da9..7621d5eea 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/call_user_func_array_variation_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/call_user_func_array_variation_001.php.expectf @@ -4,7 +4,7 @@ array(1) { string(8) "original" } ------ Calling by_ref() with unreferenced argument ------ -HipHop Warning: %a +HipHop Warning: %s array(1) { [0]=> string(8) "original" diff --git a/hphp/test/zend/good/ext-standard-general_functions/callbacks_002.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/callbacks_002.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/callbacks_002.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/callbacks_002.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/debug_zval_dump_e.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/debug_zval_dump_e.php.expectf index 6d12c6ffd..f81329de4 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/debug_zval_dump_e.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/debug_zval_dump_e.php.expectf @@ -1,3 +1,3 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/floatval_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/floatval_error.php.expectf index d4e0b9695..caa35a41d 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/floatval_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/floatval_error.php.expectf @@ -1,14 +1,14 @@ *** Testing floatval() and doubleval() : error conditions *** -- Testing floatval() and doubleval() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing floatval() and doubleval() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/get_defined_constants_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/get_defined_constants_error.php.expectf index 526e9cf9a..a2ef7ac0f 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/get_defined_constants_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/get_defined_constants_error.php.expectf @@ -1,6 +1,6 @@ *** Testing get_defined_constants() : error conditions *** -- Testing get_defined_constants() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_error.php.expectf index 60fe865a1..4fc44d318 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/get_loaded_extensions_error.php.expectf @@ -1,6 +1,6 @@ *** Testing get_loaded_extensions() : error conditions *** -- Testing get_loaded_extensions() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_error.php.expectf index bc6acabd4..5b866464d 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/get_resource_type_error.php.expectf @@ -1,10 +1,10 @@ *** Testing get_resource_type() : error conditions *** -- Testing get_resource_type() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_resource_type() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/getservbyname_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/getservbyname_error.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/getservbyname_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/getservbyname_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/getservbyport_error.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/getservbyport_error.php.expectf index b9d470d59..dfe8e9538 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/getservbyport_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/getservbyport_error.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/is_numeric.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/is_numeric.php.expectf index 2af34ad68..77570970f 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/is_numeric.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/is_numeric.php.expectf @@ -215,8 +215,8 @@ bool(false) bool(false) *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/is_scalar.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/is_scalar.php.expectf index 65e7ca284..fab411940 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/is_scalar.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/is_scalar.php.expectf @@ -105,10 +105,10 @@ bool(false) bool(false) *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/proc_nice_variation5.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/proc_nice_variation5.php.expectf index 288442a0c..aca678e1f 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/proc_nice_variation5.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/proc_nice_variation5.php.expectf @@ -2,5 +2,5 @@ bool(true) bool(true) bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-general_functions/sys_getloadavg.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/sys_getloadavg.php.expectf index ae2ce0e3c..8b2e75e4a 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/sys_getloadavg.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/sys_getloadavg.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL array(3) { [0]=> diff --git a/hphp/test/zend/good/ext-standard-general_functions/var_export_error1.php.expectf b/hphp/test/zend/good/ext-standard-general_functions/var_export_error1.php.expectf index 677edc85a..0e203efca 100644 --- a/hphp/test/zend/good/ext-standard-general_functions/var_export_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-general_functions/var_export_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing var_export() : error conditions *** -- Testing var_export() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing var_export() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-image/getimagesize_error1.php.expectf b/hphp/test/zend/good/ext-standard-image/getimagesize_error1.php.expectf index 30a3062ba..6c9f00a75 100644 --- a/hphp/test/zend/good/ext-standard-image/getimagesize_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-image/getimagesize_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing getimagesize() : error conditions *** -- Testing getimagesize() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing getimagesize() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-image/image_type_to_mime_type_error.php.expectf b/hphp/test/zend/good/ext-standard-image/image_type_to_mime_type_error.php.expectf index 973e21875..9c9b409bc 100644 --- a/hphp/test/zend/good/ext-standard-image/image_type_to_mime_type_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-image/image_type_to_mime_type_error.php.expectf @@ -1,10 +1,10 @@ *** Testing image_type_to_mime_type() : error conditions *** -- Testing image_type_to_mime_type() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing image_type_to_mime_type() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-mail/mail_error.php.expectf b/hphp/test/zend/good/ext-standard-mail/mail_error.php.expectf index f837f4416..7e3fe46b4 100644 --- a/hphp/test/zend/good/ext-standard-mail/mail_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-mail/mail_error.php.expectf @@ -1,10 +1,10 @@ *** Testing mail() : error conditions *** -- Testing mail() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing mail() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/abs_error.php.expectf b/hphp/test/zend/good/ext-standard-math/abs_error.php.expectf index 18a4c9d7b..b77d44259 100644 --- a/hphp/test/zend/good/ext-standard-math/abs_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/abs_error.php.expectf @@ -1,10 +1,10 @@ *** Testing abs() : error conditions *** Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/atan2_error.php.expectf b/hphp/test/zend/good/ext-standard-math/atan2_error.php.expectf index 771ac268e..49623a580 100644 --- a/hphp/test/zend/good/ext-standard-math/atan2_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/atan2_error.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/base_convert_error.php b/hphp/test/zend/good/ext-standard-math/base_convert_error.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-math/base_convert_error.php rename to hphp/test/zend/good/ext-standard-math/base_convert_error.php diff --git a/hphp/test/zend/good/ext-standard-math/base_convert_error.php.expectf b/hphp/test/zend/good/ext-standard-math/base_convert_error.php.expectf new file mode 100644 index 000000000..5f4b55f48 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-math/base_convert_error.php.expectf @@ -0,0 +1,9 @@ +*** Testing base_convert() : error conditions *** +Incorrect number of arguments +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +HipHop Warning: %s +Incorrect input +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/bindec_error.php b/hphp/test/zend/good/ext-standard-math/bindec_error.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-math/bindec_error.php rename to hphp/test/zend/good/ext-standard-math/bindec_error.php diff --git a/hphp/test/zend/bad/ext-standard-math/bindec_error.php.expectf b/hphp/test/zend/good/ext-standard-math/bindec_error.php.expectf similarity index 59% rename from hphp/test/zend/bad/ext-standard-math/bindec_error.php.expectf rename to hphp/test/zend/good/ext-standard-math/bindec_error.php.expectf index 7815bd0c6..ee2b69cfa 100644 --- a/hphp/test/zend/bad/ext-standard-math/bindec_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/bindec_error.php.expectf @@ -1,7 +1,6 @@ *** Testing bindec() : error conditions *** Incorrect number of arguments -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s Incorrect input - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/ceil_error.php.expectf b/hphp/test/zend/good/ext-standard-math/ceil_error.php.expectf index 5955496f4..49d9b996c 100644 --- a/hphp/test/zend/good/ext-standard-math/ceil_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/ceil_error.php.expectf @@ -1,10 +1,10 @@ *** Testing ceil() : error conditions *** Too many arguments -HipHop Warning: %a +HipHop Warning: %s NULL Too few arguments -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/dechex_error.php.expectf b/hphp/test/zend/good/ext-standard-math/dechex_error.php.expectf index 753302573..f622e7164 100644 --- a/hphp/test/zend/good/ext-standard-math/dechex_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/dechex_error.php.expectf @@ -1,6 +1,6 @@ *** Testing dechex() : error conditions *** Incorrect number of arguments -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/decoct_error.php.expectf b/hphp/test/zend/good/ext-standard-math/decoct_error.php.expectf index 32f6f376a..d0f02bb43 100644 --- a/hphp/test/zend/good/ext-standard-math/decoct_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/decoct_error.php.expectf @@ -1,5 +1,5 @@ *** Testing decoct() : error conditions *** Incorrect number of arguments -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/expm1_error.php.expectf b/hphp/test/zend/good/ext-standard-math/expm1_error.php.expectf index 7aca28b17..448a3c728 100644 --- a/hphp/test/zend/good/ext-standard-math/expm1_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/expm1_error.php.expectf @@ -1,8 +1,8 @@ *** Testing expm1() : error conditions *** -- Testing expm1() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing expm1() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/floor_error.php.expectf b/hphp/test/zend/good/ext-standard-math/floor_error.php.expectf index 9ea13ea06..9b0d5f0b5 100644 --- a/hphp/test/zend/good/ext-standard-math/floor_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/floor_error.php.expectf @@ -1,10 +1,10 @@ *** Testing floor() : error conditions *** -- Too many arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Too few arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/getrandmax_error.php.expectf b/hphp/test/zend/good/ext-standard-math/getrandmax_error.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-standard-math/getrandmax_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/getrandmax_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/hexdec_error.php b/hphp/test/zend/good/ext-standard-math/hexdec_error.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-math/hexdec_error.php rename to hphp/test/zend/good/ext-standard-math/hexdec_error.php diff --git a/hphp/test/zend/bad/ext-standard-math/hexdec_error.php.expectf b/hphp/test/zend/good/ext-standard-math/hexdec_error.php.expectf similarity index 63% rename from hphp/test/zend/bad/ext-standard-math/hexdec_error.php.expectf rename to hphp/test/zend/good/ext-standard-math/hexdec_error.php.expectf index 63365e665..6baa0712b 100644 --- a/hphp/test/zend/bad/ext-standard-math/hexdec_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/hexdec_error.php.expectf @@ -1,9 +1,8 @@ *** Testing hexdec() : error conditions *** -- Incorrect number of arguments -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -- Incorrect input -- - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/hypot_error.php.expectf b/hphp/test/zend/good/ext-standard-math/hypot_error.php.expectf index 27e7d0094..bdca0afe4 100644 --- a/hphp/test/zend/good/ext-standard-math/hypot_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/hypot_error.php.expectf @@ -1,9 +1,9 @@ *** Testing hypot() : error conditions *** -- Testing hypot() function with less than expected no. of arguments -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -- Testing hypot() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/is_finite_error.php.expectf b/hphp/test/zend/good/ext-standard-math/is_finite_error.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-standard-math/is_finite_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/is_finite_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/is_infinite_error.php.expectf b/hphp/test/zend/good/ext-standard-math/is_infinite_error.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-standard-math/is_infinite_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/is_infinite_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/is_nan_error.php.expectf b/hphp/test/zend/good/ext-standard-math/is_nan_error.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/ext-standard-math/is_nan_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/is_nan_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/log1p_error.php.expectf b/hphp/test/zend/good/ext-standard-math/log1p_error.php.expectf index 5209aa3f0..17ff72b9e 100644 --- a/hphp/test/zend/good/ext-standard-math/log1p_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/log1p_error.php.expectf @@ -1,8 +1,8 @@ *** Testing log1p() : error conditions *** -- Testing log1p() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s -- Testing log1p() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/mt_getrandmax_error.php.expectf b/hphp/test/zend/good/ext-standard-math/mt_getrandmax_error.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-standard-math/mt_getrandmax_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/mt_getrandmax_error.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-math/octdec_error.php b/hphp/test/zend/good/ext-standard-math/octdec_error.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-math/octdec_error.php rename to hphp/test/zend/good/ext-standard-math/octdec_error.php diff --git a/hphp/test/zend/bad/ext-standard-math/octdec_error.php.expectf b/hphp/test/zend/good/ext-standard-math/octdec_error.php.expectf similarity index 63% rename from hphp/test/zend/bad/ext-standard-math/octdec_error.php.expectf rename to hphp/test/zend/good/ext-standard-math/octdec_error.php.expectf index 569767f77..8a9bbb1e0 100644 --- a/hphp/test/zend/bad/ext-standard-math/octdec_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/octdec_error.php.expectf @@ -1,9 +1,8 @@ *** Testing octdec() : error conditions *** -- Incorrect number of arguments -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s -- Incorrect input -- - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-math/round_error.php.expectf b/hphp/test/zend/good/ext-standard-math/round_error.php.expectf index 99abc4720..c12e00cbf 100644 --- a/hphp/test/zend/good/ext-standard-math/round_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-math/round_error.php.expectf @@ -1,7 +1,7 @@ *** Testing round() : error conditions *** -- Wrong nmumber of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL float(500) ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error3.php.expectf b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error3.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error3.php.expectf +++ b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error3.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error4.php.expectf b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error4.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error4.php.expectf +++ b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error4.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error5.php.expectf b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error5.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error5.php.expectf +++ b/hphp/test/zend/good/ext-standard-misc/time_nanosleep_error5.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error1.php.expectf b/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error1.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error1.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error3.php.expectf b/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error3.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error3.php.expectf +++ b/hphp/test/zend/good/ext-standard-misc/time_sleep_until_error3.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/bug41347.php.expectf b/hphp/test/zend/good/ext-standard-network/bug41347.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-standard-network/bug41347.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/bug41347.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/closelog_error.php.expectf b/hphp/test/zend/good/ext-standard-network/closelog_error.php.expectf index 564ed06d0..511535330 100644 --- a/hphp/test/zend/good/ext-standard-network/closelog_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/closelog_error.php.expectf @@ -1,6 +1,6 @@ *** Testing closelog() : error conditions *** -- Testing closelog() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/gethostbynamel_error.php.expectf b/hphp/test/zend/good/ext-standard-network/gethostbynamel_error.php.expectf index 8f48a27ed..90a61f41a 100644 --- a/hphp/test/zend/good/ext-standard-network/gethostbynamel_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/gethostbynamel_error.php.expectf @@ -1,10 +1,10 @@ *** Testing gethostbynamel() : error conditions *** -- Testing gethostbynamel() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gethostbynamel() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/inet_ipv6.php.expectf b/hphp/test/zend/good/ext-standard-network/inet_ipv6.php.expectf index 67842125f..25d1367c8 100644 --- a/hphp/test/zend/good/ext-standard-network/inet_ipv6.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/inet_ipv6.php.expectf @@ -3,8 +3,8 @@ string(3) "::2" string(4) "::35" string(5) "::255" string(6) "::1024" -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s bool(false) string(36) "2001:db8:85a3:8d3:1319:8a2e:370:7344" string(15) "2001:db8:1234::" diff --git a/hphp/test/zend/good/ext-standard-network/ip2long_error.php.expectf b/hphp/test/zend/good/ext-standard-network/ip2long_error.php.expectf index 13c90d3ac..30f8cab52 100644 --- a/hphp/test/zend/good/ext-standard-network/ip2long_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/ip2long_error.php.expectf @@ -1,10 +1,10 @@ *** Testing ip2long() : error conditions *** -- Testing ip2long() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ip2long() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/long2ip_error.php.expectf b/hphp/test/zend/good/ext-standard-network/long2ip_error.php.expectf index 410a8ba95..91ad64f99 100644 --- a/hphp/test/zend/good/ext-standard-network/long2ip_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/long2ip_error.php.expectf @@ -1,10 +1,10 @@ *** Testing long2ip() : error conditions *** -- Testing long2ip() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing long2ip() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-network/syslog_error.php.expectf b/hphp/test/zend/good/ext-standard-network/syslog_error.php.expectf index 861c5280a..b418c6d9d 100644 --- a/hphp/test/zend/good/ext-standard-network/syslog_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-network/syslog_error.php.expectf @@ -1,10 +1,10 @@ *** Testing syslog() : error conditions *** -- Testing syslog() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing syslog() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug25378.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug25378.php.expectf index d6978bb24..d368398e6 100644 --- a/hphp/test/zend/good/ext-standard-serialize/bug25378.php.expectf +++ b/hphp/test/zend/good/ext-standard-serialize/bug25378.php.expectf @@ -1,27 +1,27 @@ -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug27469.php b/hphp/test/zend/good/ext-standard-serialize/bug27469.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-serialize/bug27469.php rename to hphp/test/zend/good/ext-standard-serialize/bug27469.php diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug27469.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug27469.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-serialize/bug27469.php.expectf rename to hphp/test/zend/good/ext-standard-serialize/bug27469.php.expectf diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug62836_2.php b/hphp/test/zend/good/ext-standard-serialize/bug62836_2.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-serialize/bug62836_2.php rename to hphp/test/zend/good/ext-standard-serialize/bug62836_2.php diff --git a/hphp/test/zend/bad/ext-standard-serialize/bug62836_2.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug62836_2.php.expectf similarity index 100% rename from hphp/test/zend/bad/ext-standard-serialize/bug62836_2.php.expectf rename to hphp/test/zend/good/ext-standard-serialize/bug62836_2.php.expectf diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php b/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php new file mode 100644 index 000000000..d7a37ddf8 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php @@ -0,0 +1,19 @@ +getMessage()); +} + +try { + var_dump(unserialize('a:2:{i:0;O:1:"A":0:{}i:1;O:1:"A":0:{}}')); +} catch (Exception $e) { + var_dump($e->getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php.expectf new file mode 100644 index 000000000..7c2209448 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_1.php.expectf @@ -0,0 +1,2 @@ +string(6) "Failed" +string(6) "Failed" \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php b/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php new file mode 100644 index 000000000..63e8df188 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php @@ -0,0 +1,19 @@ +getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php.expectf new file mode 100644 index 000000000..756b09339 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_2.php.expectf @@ -0,0 +1 @@ +string(6) "Failed" \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php b/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php new file mode 100644 index 000000000..969e4b2d2 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php @@ -0,0 +1,24 @@ +getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php.expectf b/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php.expectf new file mode 100644 index 000000000..756b09339 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-serialize/bug64354_3.php.expectf @@ -0,0 +1 @@ +string(6) "Failed" \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-streams/bug54623.php.expectf b/hphp/test/zend/good/ext-standard-streams/bug54623.php.expectf index 22852157b..177bac660 100644 --- a/hphp/test/zend/good/ext-standard-streams/bug54623.php.expectf +++ b/hphp/test/zend/good/ext-standard-streams/bug54623.php.expectf @@ -1,3 +1,3 @@ int(%d) int(%d) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-streams/bug61115-1.php.expectf b/hphp/test/zend/good/ext-standard-streams/bug61115-1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-standard-streams/bug61115-1.php.expectf +++ b/hphp/test/zend/good/ext-standard-streams/bug61115-1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-streams/bug61115.php.expectf b/hphp/test/zend/good/ext-standard-streams/bug61115.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/ext-standard-streams/bug61115.php.expectf +++ b/hphp/test/zend/good/ext-standard-streams/bug61115.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/addslashes_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/addslashes_error.php.expectf index 2504adfd3..aa363833c 100644 --- a/hphp/test/zend/good/ext-standard-strings/addslashes_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/addslashes_error.php.expectf @@ -1,11 +1,11 @@ *** Testing addslashes() : error conditions *** -- Testing addslashes() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing addslashes() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL string(15) ""hello"\"world"" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bin2hex_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/bin2hex_error.php.expectf index a75f71935..0df8e4161 100644 --- a/hphp/test/zend/good/ext-standard-strings/bin2hex_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/bin2hex_error.php.expectf @@ -1,11 +1,11 @@ *** Testing bin2hex() : error conditions *** -- Testing bin2hex() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing bin2hex() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug36306.php b/hphp/test/zend/good/ext-standard-strings/bug36306.php index c114af0b9..c60f9b5d1 100644 --- a/hphp/test/zend/good/ext-standard-strings/bug36306.php +++ b/hphp/test/zend/good/ext-standard-strings/bug36306.php @@ -3,8 +3,8 @@ /* as an example how to write crc32 tests PHP does not have uint values, you cannot display crc32 like a signed integer. - Have to find some small strings to truely reproduce + Have to find some small strings to truly reproduce the problem, this example being not a problem */ -echo dechex(crc32("platform independant")) . "\n"; +echo dechex(crc32("platform independent")) . "\n"; ?> \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug36306.php.expectf b/hphp/test/zend/good/ext-standard-strings/bug36306.php.expectf index 7b08f70af..85b7ca735 100644 --- a/hphp/test/zend/good/ext-standard-strings/bug36306.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/bug36306.php.expectf @@ -1 +1 @@ -ccd9fe66 \ No newline at end of file +cbd056ba \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug36944.php.expectf b/hphp/test/zend/good/ext-standard-strings/bug36944.php.expectf index 372281a31..189b2a031 100644 --- a/hphp/test/zend/good/ext-standard-strings/bug36944.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/bug36944.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) int(%d) int(0) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(%d) int(0) diff --git a/hphp/test/zend/good/ext-standard-strings/bug61660.php.expectf b/hphp/test/zend/good/ext-standard-strings/bug61660.php.expectf index 32195d571..30eda3aaa 100644 --- a/hphp/test/zend/good/ext-standard-strings/bug61660.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/bug61660.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug63943.php.expectf b/hphp/test/zend/good/ext-standard-strings/bug63943.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-standard-strings/bug63943.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/bug63943.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug64879.php b/hphp/test/zend/good/ext-standard-strings/bug64879.php new file mode 100644 index 000000000..14826ac92 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-strings/bug64879.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/bug64879.php.expectf b/hphp/test/zend/good/ext-standard-strings/bug64879.php.expectf new file mode 100644 index 000000000..8ad96f878 --- /dev/null +++ b/hphp/test/zend/good/ext-standard-strings/bug64879.php.expectf @@ -0,0 +1 @@ +Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/chop_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/chop_error.php.expectf index 5d426d76e..4c1e59a4e 100644 --- a/hphp/test/zend/good/ext-standard-strings/chop_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/chop_error.php.expectf @@ -1,11 +1,11 @@ *** Testing chop() : error conditions *** -- Testing chop() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing chop() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL string(11) "string_val " Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/chr_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/chr_error.php.expectf index 782eb649a..e8ea41d73 100644 --- a/hphp/test/zend/good/ext-standard-strings/chr_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/chr_error.php.expectf @@ -1,10 +1,10 @@ *** Testing chr() : error conditions *** -- Testing chr() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing chr() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/chr_ord.php.expectf b/hphp/test/zend/good/ext-standard-strings/chr_ord.php.expectf index c08a1db12..5e126c432 100644 Binary files a/hphp/test/zend/good/ext-standard-strings/chr_ord.php.expectf and b/hphp/test/zend/good/ext-standard-strings/chr_ord.php.expectf differ diff --git a/hphp/test/zend/good/ext-standard-strings/convert_cyr_string_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/convert_cyr_string_error.php.expectf index 322120aa8..b335cfc59 100644 --- a/hphp/test/zend/good/ext-standard-strings/convert_cyr_string_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/convert_cyr_string_error.php.expectf @@ -1,28 +1,28 @@ *** Testing convert_cyr_string() : error conditions *** -- Testing convert_cyr_string() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing convert_cyr_string() function with no 'to' character set -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing convert_cyr_string() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing convert_cyr_string() function with invalid 'from' character set -- -HipHop Warning: %a +HipHop Warning: %s string(10) "68656c6c6f" -- Testing convert_cyr_string() function with invalid 'to' character set -- -HipHop Warning: %a +HipHop Warning: %s string(10) "68656c6c6f" -- Testing convert_cyr_string() function with invalid 'from' and 'to' character set -- -HipHop Warning: %a -HipHop Warning: %a +HipHop Warning: %s +HipHop Warning: %s string(10) "68656c6c6f" ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/count_chars_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/count_chars_error.php.expectf index f044d5eb4..33419cbeb 100644 --- a/hphp/test/zend/good/ext-standard-strings/count_chars_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/count_chars_error.php.expectf @@ -1,10 +1,10 @@ *** Testing count_chars() : error conditions *** -- Testing count_chars() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing count_chars() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/crc32_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/crc32_error.php.expectf index cb2222436..538b8678d 100644 --- a/hphp/test/zend/good/ext-standard-strings/crc32_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/crc32_error.php.expectf @@ -1,10 +1,10 @@ *** Testing crc32() : error conditions *** -- Testing crc32() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing crc32() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/crypt.php.expectf b/hphp/test/zend/good/ext-standard-strings/crypt.php.expectf index 777fd5c44..1422c1de4 100644 --- a/hphp/test/zend/good/ext-standard-strings/crypt.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/crypt.php.expectf @@ -3,7 +3,7 @@ EXT MD5 BLO string(%d) "%s" -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/dirname_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/dirname_error.php.expectf index 5dd17cf6d..bfe6831b2 100644 --- a/hphp/test/zend/good/ext-standard-strings/dirname_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/dirname_error.php.expectf @@ -1,6 +1,6 @@ *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/explode_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/explode_error.php.expectf index 55230d096..137cb8f84 100644 --- a/hphp/test/zend/good/ext-standard-strings/explode_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/explode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing explode() : error conditions *** -- Testing explode() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing explode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/fprintf_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/fprintf_error.php.expectf index 454dc3501..574f5f583 100644 --- a/hphp/test/zend/good/ext-standard-strings/fprintf_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/fprintf_error.php.expectf @@ -1,8 +1,8 @@ *** Testing Error Conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/get_html_translation_table_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/get_html_translation_table_error.php.expectf index 153e7806f..2444b0ca2 100644 --- a/hphp/test/zend/good/ext-standard-strings/get_html_translation_table_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/get_html_translation_table_error.php.expectf @@ -1,6 +1,6 @@ *** Testing get_html_translation_table() : error conditions *** -- Testing get_html_translation_table() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/hebrev_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/hebrev_error.php.expectf index 2fc582619..416840adb 100644 --- a/hphp/test/zend/good/ext-standard-strings/hebrev_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/hebrev_error.php.expectf @@ -1,11 +1,11 @@ *** Testing hebrev() : error conditions *** -- Testing hebrev() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hebrev() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/hebrevc_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/hebrevc_error.php.expectf index 5a5a83eba..79f217e16 100644 --- a/hphp/test/zend/good/ext-standard-strings/hebrevc_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/hebrevc_error.php.expectf @@ -1,11 +1,11 @@ *** Testing hebrevc() : error conditions *** -- Testing hebrevc() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing hebrevc() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/htmlspecialchars.php.expectf b/hphp/test/zend/good/ext-standard-strings/htmlspecialchars.php.expectf index c5dc21ca1..ffe58e607 100644 --- a/hphp/test/zend/good/ext-standard-strings/htmlspecialchars.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/htmlspecialchars.php.expectf @@ -276,7 +276,7 @@ string(36) "A 'quote' is <b>bold</b>" string(36) "A 'quote' is <b>bold</b>" *** Testing error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL string(10) "<br>" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/htmlspecialchars_decode_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/htmlspecialchars_decode_error.php.expectf index bb43ad505..ea44902fb 100644 --- a/hphp/test/zend/good/ext-standard-strings/htmlspecialchars_decode_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/htmlspecialchars_decode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing htmlspecialchars_decode() : error conditions *** -- Testing htmlspecialchars_decode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing htmlspecialchars_decode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/http_build_query_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/http_build_query_error.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/ext-standard-strings/http_build_query_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/http_build_query_error.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/join_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/join_error.php.expectf index c60e2eb39..943d11133 100644 --- a/hphp/test/zend/good/ext-standard-strings/join_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/join_error.php.expectf @@ -1,14 +1,14 @@ *** Testing join() : error conditions *** -- Testing join() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing join() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing join() with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/join_variation2.php b/hphp/test/zend/good/ext-standard-strings/join_variation2.php index 8365a4c6c..1fa93561c 100644 --- a/hphp/test/zend/good/ext-standard-strings/join_variation2.php +++ b/hphp/test/zend/good/ext-standard-strings/join_variation2.php @@ -79,7 +79,7 @@ $values = array ( // loop through each element of the array and check the working of join() -// when $pieces arugment is supplied with different values +// when $pieces argument is supplied with different values echo "\n--- Testing join() by supplying different values for 'pieces' argument ---\n"; $counter = 1; for($index = 0; $index < count($values); $index ++) { diff --git a/hphp/test/zend/good/ext-standard-strings/join_variation2.php.expectf b/hphp/test/zend/good/ext-standard-strings/join_variation2.php.expectf index cb53789a6..753d2dc2e 100644 --- a/hphp/test/zend/good/ext-standard-strings/join_variation2.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/join_variation2.php.expectf @@ -2,72 +2,72 @@ --- Testing join() by supplying different values for 'pieces' argument --- -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 9 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 10 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 11 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 12 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 13 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 14 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 15 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 20 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 21 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 22 -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Iteration 23 -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/ltrim_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/ltrim_error.php.expectf index b12493172..1554a8365 100644 --- a/hphp/test/zend/good/ext-standard-strings/ltrim_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/ltrim_error.php.expectf @@ -1,24 +1,24 @@ *** Testing ltrim() : error conditions *** -- Testing ltrim() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ltrim() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Test ltrim function with various invalid charlists -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/money_format_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/money_format_error.php.expectf index cf27827c8..0ee73f148 100644 --- a/hphp/test/zend/good/ext-standard-strings/money_format_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/money_format_error.php.expectf @@ -1,14 +1,14 @@ *** Testing money_format() : error conditions *** -- Testing money_format() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing money_format() function with insufficient arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing money_format() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/nl_langinfo_error1.php.expectf b/hphp/test/zend/good/ext-standard-strings/nl_langinfo_error1.php.expectf index aee03ad03..bbaf0f5d2 100644 --- a/hphp/test/zend/good/ext-standard-strings/nl_langinfo_error1.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/nl_langinfo_error1.php.expectf @@ -1,10 +1,10 @@ *** Testing nl_langinfo() : error conditions *** -- Testing nl_langinfo() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing nl_langinfo() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/ord_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/ord_error.php.expectf index d98f13ac1..517b110c9 100644 --- a/hphp/test/zend/good/ext-standard-strings/ord_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/ord_error.php.expectf @@ -1,10 +1,10 @@ *** Testing ord() : error conditions *** -- Testing ord() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing ord() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/quoted_printable_decode_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/quoted_printable_decode_error.php.expectf index 1cab91c1c..97c4cdd8a 100644 --- a/hphp/test/zend/good/ext-standard-strings/quoted_printable_decode_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/quoted_printable_decode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing quoted_printable_decode() : error conditions *** -- Testing quoted_printable_decode() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing quoted_printable_decode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/quotemeta_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/quotemeta_error.php.expectf index 47f402a23..da7327c6f 100644 --- a/hphp/test/zend/good/ext-standard-strings/quotemeta_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/quotemeta_error.php.expectf @@ -1,10 +1,10 @@ *** Testing quotemeta() : error conditions *** -- Testing quotemeta() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing quotemeta() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/rtrim_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/rtrim_error.php.expectf index b0f4066f2..34bb67a56 100644 --- a/hphp/test/zend/good/ext-standard-strings/rtrim_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/rtrim_error.php.expectf @@ -1,24 +1,24 @@ *** Testing rtrim() : error conditions *** -- Testing rtrim() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing rtrim() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Test rtrim function with various invalid charlists -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " -HipHop Warning: %a +HipHop Warning: %s string(14) " Hello World " ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/setlocale_variation3.php b/hphp/test/zend/good/ext-standard-strings/setlocale_variation3.php index 72d94318a..e9154ea58 100644 --- a/hphp/test/zend/good/ext-standard-strings/setlocale_variation3.php +++ b/hphp/test/zend/good/ext-standard-strings/setlocale_variation3.php @@ -2,7 +2,7 @@ /* Prototype : string setlocale (int $category , string $locale [,string $..] ) * : string setlocale(int $category , array $locale); * Description: Sets locale information.Returns the new current locale , or FALSE - * if locale functinality is not implemented in this platform. + * if locale functionality is not implemented in this platform. * Source code: ext/standard/string.c */ diff --git a/hphp/test/zend/good/ext-standard-strings/sha1.php.expectf b/hphp/test/zend/good/ext-standard-strings/sha1.php.expectf index 89d0431c4..5bc6259c1 100644 --- a/hphp/test/zend/good/ext-standard-strings/sha1.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/sha1.php.expectf @@ -15,5 +15,5 @@ string(40) "da39a3ee5e6b4b0d3255bfef95601890afd80709" bool(true) string(20) "%a" string(20) "%a" -HipHop Warning: %a +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/sha1_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/sha1_error.php.expectf index 0f36540eb..2811f7492 100644 --- a/hphp/test/zend/good/ext-standard-strings/sha1_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/sha1_error.php.expectf @@ -1,10 +1,10 @@ *** Testing sha1() : error conditions *** -- Testing sha1() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing sha1() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/sscanf_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/sscanf_error.php.expectf index a36716fb5..c68cd2a67 100644 --- a/hphp/test/zend/good/ext-standard-strings/sscanf_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/sscanf_error.php.expectf @@ -1,14 +1,14 @@ *** Testing sscanf() : error conditions *** -- Testing sscanf() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing sscanf() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing sscanf() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s int(-1) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/str_ireplace.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_ireplace.php.expectf index 7b9bbf236..8adab3b71 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_ireplace.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_ireplace.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL string(0) "" string(8) "aaaaaaaT" diff --git a/hphp/test/zend/good/ext-standard-strings/str_shuffle_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_shuffle_error.php.expectf index 6bb355a4e..f36ffffa1 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_shuffle_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_shuffle_error.php.expectf @@ -1,10 +1,10 @@ *** Testing str_shuffle() : error conditions *** -- Testing str_shuffle() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing str_shuffle() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/str_split_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_split_error.php.expectf index ac1e54368..0f2b69a76 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_split_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_split_error.php.expectf @@ -1,8 +1,8 @@ *** Testing str_split() : error conditions *** -- Testing str_split() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing str_split() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/str_split_variation6.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_split_variation6.php.expectf index 5a2e343fd..4221ddfa1 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_split_variation6.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_split_variation6.php.expectf @@ -1,6 +1,6 @@ *** Testing str_split() : different intger values for 'split_length' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- array(42) { @@ -90,7 +90,7 @@ array(42) { string(1) "t" } -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- array(1) { @@ -110,9 +110,9 @@ array(1) { string(42) "This is a string with 123 & escape char \t" } -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/str_split_variation7.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_split_variation7.php.expectf index afdf00620..af1516e76 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_split_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_split_variation7.php.expectf @@ -1,6 +1,6 @@ *** Testing str_split() : different intger values for 'split_length' with heredoc 'str' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- array(30) { @@ -66,7 +66,7 @@ array(30) { string(1) "." } -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- array(1) { @@ -86,9 +86,9 @@ array(1) { string(30) "string with 123,escape char ." } -- Iteration 7 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 8 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/str_word_count1.php.expectf b/hphp/test/zend/good/ext-standard-strings/str_word_count1.php.expectf index 1ea65ba34..e3cba84b7 100644 --- a/hphp/test/zend/good/ext-standard-strings/str_word_count1.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/str_word_count1.php.expectf @@ -1,9 +1,9 @@ int(0) -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strcoll_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strcoll_error.php.expectf index 7c7ebe9fe..fbd2ebff8 100644 --- a/hphp/test/zend/good/ext-standard-strings/strcoll_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strcoll_error.php.expectf @@ -1,16 +1,16 @@ *** Testing strcoll() : error conditions *** -- Testing strcoll() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strcoll() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strcoll() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strcspn_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strcspn_error.php.expectf index 2516fcb4f..d619635b1 100644 --- a/hphp/test/zend/good/ext-standard-strings/strcspn_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strcspn_error.php.expectf @@ -1,14 +1,14 @@ *** Testing strcspn() : error conditions *** -- Testing strcspn() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strcspn() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strcspn() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/stripcslashes_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/stripcslashes_error.php.expectf index 22197e92a..c7557cc66 100644 --- a/hphp/test/zend/good/ext-standard-strings/stripcslashes_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/stripcslashes_error.php.expectf @@ -1,9 +1,9 @@ *** Testing stripcslashes() : unexpected number of arguments *** -- Testing stripcslashes() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stripcslashes() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/stripos_variation7.php.expectf b/hphp/test/zend/good/ext-standard-strings/stripos_variation7.php.expectf index f7f4f32f1..3cf0170a9 100644 --- a/hphp/test/zend/good/ext-standard-strings/stripos_variation7.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/stripos_variation7.php.expectf @@ -1,7 +1,7 @@ *** Testing stripos() function: with heredoc strings *** -- With empty heredoc string -- bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) bool(false) bool(false) diff --git a/hphp/test/zend/good/ext-standard-strings/stripslashes_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/stripslashes_error.php.expectf index 387b69aef..bcaf195b6 100644 --- a/hphp/test/zend/good/ext-standard-strings/stripslashes_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/stripslashes_error.php.expectf @@ -1,11 +1,11 @@ *** Testing stripslashes() : error conditions *** -- Testing stripslashes() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing stripslashes() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL string(18) "\"hello\"\"world\"" Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strlen_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strlen_error.php.expectf index 457cf0380..0ef8dc425 100644 --- a/hphp/test/zend/good/ext-standard-strings/strlen_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strlen_error.php.expectf @@ -1,9 +1,9 @@ *** Testing strlen() : unexpected number of arguments *** -- Testing strlen() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strlen() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strncmp_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strncmp_error.php.expectf index 55b81ea59..274748bce 100644 --- a/hphp/test/zend/good/ext-standard-strings/strncmp_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strncmp_error.php.expectf @@ -1,12 +1,12 @@ *** Testing strncmp() function: error conditions *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strspn_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strspn_error.php.expectf index 7cbf92967..3190715c6 100644 --- a/hphp/test/zend/good/ext-standard-strings/strspn_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strspn_error.php.expectf @@ -1,14 +1,14 @@ *** Testing strspn() : error conditions *** -- Testing strspn() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strspn() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strspn() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/strtok_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strtok_error.php.expectf index d1a7262b1..c9be95c2e 100644 --- a/hphp/test/zend/good/ext-standard-strings/strtok_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strtok_error.php.expectf @@ -1,11 +1,11 @@ *** Testing strtok() : error conditions *** -- Testing strtok() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strtok() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL string(13) "sample string" diff --git a/hphp/test/zend/good/ext-standard-strings/strtr_variation8.php.expectf b/hphp/test/zend/good/ext-standard-strings/strtr_variation8.php.expectf index ab4af7775..041829a75 100644 --- a/hphp/test/zend/good/ext-standard-strings/strtr_variation8.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strtr_variation8.php.expectf @@ -1,27 +1,27 @@ *** Testing strtr() function: with unexpected inputs for 'replace_pairs' *** -- Iteration 1 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 2 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 3 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 4 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 5 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 6 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 7 -- @@ -34,42 +34,42 @@ string(6) "012atm" string(6) "122atm" -- 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 Warning: %a +HipHop Warning: %s bool(false) -- Iteration 16 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 17 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 18 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- Iteration 19 -- -HipHop Warning: %a +HipHop Warning: %s bool(false) *** Done *** \ No newline at end of file diff --git a/hphp/test/zend/bad/ext-standard-strings/strval_error.php b/hphp/test/zend/good/ext-standard-strings/strval_error.php similarity index 100% rename from hphp/test/zend/bad/ext-standard-strings/strval_error.php rename to hphp/test/zend/good/ext-standard-strings/strval_error.php diff --git a/hphp/test/zend/bad/ext-standard-strings/strval_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/strval_error.php.expectf similarity index 82% rename from hphp/test/zend/bad/ext-standard-strings/strval_error.php.expectf rename to hphp/test/zend/good/ext-standard-strings/strval_error.php.expectf index cb14c2a6d..ea2cff4da 100644 --- a/hphp/test/zend/bad/ext-standard-strings/strval_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/strval_error.php.expectf @@ -1,13 +1,12 @@ *** Testing strval() : error conditions *** -- Testing strval() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strval() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strval() function with object which has not toString() method -- - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/trim_error.php b/hphp/test/zend/good/ext-standard-strings/trim_error.php index 958108a86..f0429bd95 100644 --- a/hphp/test/zend/good/ext-standard-strings/trim_error.php +++ b/hphp/test/zend/good/ext-standard-strings/trim_error.php @@ -1,7 +1,7 @@ ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/unpack_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/unpack_error.php.expectf index 48e2311f7..1ba358c5b 100644 --- a/hphp/test/zend/good/ext-standard-strings/unpack_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/unpack_error.php.expectf @@ -1,14 +1,14 @@ *** Testing unpack() : error conditions *** -- Testing unpack() function with no arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing unpack() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing unpack() function with invalid format character -- -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-strings/wordwrap_error.php.expectf b/hphp/test/zend/good/ext-standard-strings/wordwrap_error.php.expectf index 0a556e98f..c2220222d 100644 --- a/hphp/test/zend/good/ext-standard-strings/wordwrap_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-strings/wordwrap_error.php.expectf @@ -1,18 +1,18 @@ *** Testing wordwrap() : error conditions *** -- Testing wordwrap() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing wordwrap() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing wordwrap() function with negative/zero value for width argument -- -- width = 0 & cut = false -- string(39) "testing
\nwordwrap
\nfunction" -- width = 0 & cut = true -- -HipHop Warning: %a +HipHop Warning: %s bool(false) -- width = -10 & cut = false -- string(39) "testing
\nwordwrap
\nfunction" diff --git a/hphp/test/zend/good/ext-standard-time/bug60222.php.expectf b/hphp/test/zend/good/ext-standard-time/bug60222.php.expectf index 3021de04a..7f2368659 100644 --- a/hphp/test/zend/good/ext-standard-time/bug60222.php.expectf +++ b/hphp/test/zend/good/ext-standard-time/bug60222.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-time/strptime_error.php.expectf b/hphp/test/zend/good/ext-standard-time/strptime_error.php.expectf index 2dc83a020..d330922c4 100644 --- a/hphp/test/zend/good/ext-standard-time/strptime_error.php.expectf +++ b/hphp/test/zend/good/ext-standard-time/strptime_error.php.expectf @@ -1,14 +1,14 @@ *** Testing strptime() : error conditions *** -- Testing strptime() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strptime() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing strptime() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/base64_decode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/base64_decode_error_001.php.expectf index cb541f122..54c3e2550 100644 --- a/hphp/test/zend/good/ext-standard-url/base64_decode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/base64_decode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing base64_decode() : error conditions *** -- Testing base64_decode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing base64_decode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/base64_encode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/base64_encode_error_001.php.expectf index 33a812a16..3456bc3ce 100644 --- a/hphp/test/zend/good/ext-standard-url/base64_encode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/base64_encode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing base64_encode() : error conditions - wrong number of args *** -- Testing base64_encode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing base64_encode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/get_headers_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/get_headers_error_001.php.expectf index 2a7fda6d3..08e9675ab 100644 --- a/hphp/test/zend/good/ext-standard-url/get_headers_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/get_headers_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing get_headers() : error conditions *** -- Testing get_headers() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing get_headers() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/parse_url_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/parse_url_error_001.php.expectf index 27d6e6942..7f39b0ff8 100644 --- a/hphp/test/zend/good/ext-standard-url/parse_url_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/parse_url_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing parse_url() : error conditions *** -- Testing parse_url() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing parse_url() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/rawurldecode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/rawurldecode_error_001.php.expectf index 99952a112..a93bc3c37 100644 --- a/hphp/test/zend/good/ext-standard-url/rawurldecode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/rawurldecode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing rawurldecode() : error conditions *** -- Testing rawurldecode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing rawurldecode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/rawurlencode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/rawurlencode_error_001.php.expectf index 02999dad4..011d45f9b 100644 --- a/hphp/test/zend/good/ext-standard-url/rawurlencode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/rawurlencode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing rawurlencode() : error conditions *** -- Testing rawurlencode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing rawurlencode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/urldecode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/urldecode_error_001.php.expectf index 53cd53251..ea1ee8b53 100644 --- a/hphp/test/zend/good/ext-standard-url/urldecode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/urldecode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing urldecode() : error conditions *** -- Testing urldecode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing urldecode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard-url/urlencode_error_001.php.expectf b/hphp/test/zend/good/ext-standard-url/urlencode_error_001.php.expectf index dee70b405..cdd44645c 100644 --- a/hphp/test/zend/good/ext-standard-url/urlencode_error_001.php.expectf +++ b/hphp/test/zend/good/ext-standard-url/urlencode_error_001.php.expectf @@ -1,10 +1,10 @@ *** Testing urlencode() : error conditions *** -- Testing urlencode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing urlencode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard/bug64370_var1.php b/hphp/test/zend/good/ext-standard/bug64370_var1.php new file mode 100644 index 000000000..f118db809 --- /dev/null +++ b/hphp/test/zend/good/ext-standard/bug64370_var1.php @@ -0,0 +1,10 @@ += 0)) . "\n"; +?> +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard/bug64370_var1.php.expectf b/hphp/test/zend/good/ext-standard/bug64370_var1.php.expectf new file mode 100644 index 000000000..360e02c6d --- /dev/null +++ b/hphp/test/zend/good/ext-standard/bug64370_var1.php.expectf @@ -0,0 +1,7 @@ +$_SERVER['REQUEST_TIME']: %d +$_SERVER['REQUEST_TIME_FLOAT']: %f +time(): %d +microtime(true): %f +created in %f ms +1 +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard/bug64370_var2.php b/hphp/test/zend/good/ext-standard/bug64370_var2.php new file mode 100644 index 000000000..602d792ff --- /dev/null +++ b/hphp/test/zend/good/ext-standard/bug64370_var2.php @@ -0,0 +1,17 @@ + $i++) { + $m0 = microtime(true); + $m1 = microtime(true); + $d = $m1 - $m0; + + /*echo "$d\n";*/ + + if ($d < 0) { + die("failed in {$i}th iteration"); + } +} +echo "ok\n"; +?> +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-standard/bug64370_var2.php.expectf b/hphp/test/zend/good/ext-standard/bug64370_var2.php.expectf new file mode 100644 index 000000000..1fabf04cf --- /dev/null +++ b/hphp/test/zend/good/ext-standard/bug64370_var2.php.expectf @@ -0,0 +1,2 @@ +ok +===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/utf8_decode_error.php.expectf b/hphp/test/zend/good/ext-xml/utf8_decode_error.php.expectf index e2c063bcf..06493ec85 100644 --- a/hphp/test/zend/good/ext-xml/utf8_decode_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/utf8_decode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing utf8_decode() : error conditions *** -- Testing utf8_decode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing utf8_decode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/utf8_encode_error.php.expectf b/hphp/test/zend/good/ext-xml/utf8_encode_error.php.expectf index a17f59563..ed3e3657e 100644 --- a/hphp/test/zend/good/ext-xml/utf8_encode_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/utf8_encode_error.php.expectf @@ -1,10 +1,10 @@ *** Testing utf8_encode() : error conditions *** -- Testing utf8_encode() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing utf8_encode() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_error_string_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_error_string_error.php.expectf index ea1756f56..9919b8489 100644 --- a/hphp/test/zend/good/ext-xml/xml_error_string_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_error_string_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_error_string() : error conditions *** -- Testing xml_error_string() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_error_string() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_get_current_byte_index_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_get_current_byte_index_error.php.expectf index 1a7d9120f..e74dbb607 100644 --- a/hphp/test/zend/good/ext-xml/xml_get_current_byte_index_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_get_current_byte_index_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_get_current_byte_index() : error conditions *** -- Testing xml_get_current_byte_index() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_get_current_byte_index() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_get_current_column_number_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_get_current_column_number_error.php.expectf index f0f4f2bf3..bc5ce3f78 100644 --- a/hphp/test/zend/good/ext-xml/xml_get_current_column_number_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_get_current_column_number_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_get_current_column_number() : error conditions *** -- Testing xml_get_current_column_number() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_get_current_column_number() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_get_current_line_number_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_get_current_line_number_error.php.expectf index 342597dd1..96f7fd023 100644 --- a/hphp/test/zend/good/ext-xml/xml_get_current_line_number_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_get_current_line_number_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_get_current_line_number() : error conditions *** -- Testing xml_get_current_line_number() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_get_current_line_number() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_get_error_code_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_get_error_code_error.php.expectf index c34d21c93..665b2cd42 100644 --- a/hphp/test/zend/good/ext-xml/xml_get_error_code_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_get_error_code_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_get_error_code() : error conditions *** -- Testing xml_get_error_code() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_get_error_code() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_parse_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_parse_error.php.expectf index df2c63d55..a152e85ea 100644 --- a/hphp/test/zend/good/ext-xml/xml_parse_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_parse_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_parse() : error conditions *** -- Testing xml_parse() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_parse() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_parse_into_struct_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_parse_into_struct_error.php.expectf index 8e9e590c0..5be97f1a5 100644 --- a/hphp/test/zend/good/ext-xml/xml_parse_into_struct_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_parse_into_struct_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_parse_into_struct() : error conditions *** -- Testing xml_parse_into_struct() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_parse_into_struct() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_parser_free_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_parser_free_error.php.expectf index 164f08f1f..acbbae701 100644 --- a/hphp/test/zend/good/ext-xml/xml_parser_free_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_parser_free_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_parser_free() : error conditions *** -- Testing xml_parser_free() function with Zero arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_parser_free() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_parser_get_option_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_parser_get_option_error.php.expectf index 6c44c318f..22cbe1120 100644 --- a/hphp/test/zend/good/ext-xml/xml_parser_get_option_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_parser_get_option_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_parser_get_option() : error conditions *** -- Testing xml_parser_get_option() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_parser_get_option() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_parser_set_option_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_parser_set_option_error.php.expectf index e040944b2..81a9f1b00 100644 --- a/hphp/test/zend/good/ext-xml/xml_parser_set_option_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_parser_set_option_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_parser_set_option() : error conditions *** -- Testing xml_parser_set_option() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_parser_set_option() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_character_data_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_character_data_handler_error.php.expectf index e4ac7b3bf..85a740f21 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_character_data_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_character_data_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_character_data_handler() : error conditions *** -- Testing xml_set_character_data_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_character_data_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_default_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_default_handler_error.php.expectf index 33c4e67c4..57689aae5 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_default_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_default_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_default_handler() : error conditions *** -- Testing xml_set_default_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_default_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_element_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_element_handler_error.php.expectf index 87c0e2e51..5fb309e7a 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_element_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_element_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_element_handler() : error conditions *** -- Testing xml_set_element_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_element_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_end_namespace_decl_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_end_namespace_decl_handler_error.php.expectf index ad7f49735..f9e16c0fd 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_end_namespace_decl_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_end_namespace_decl_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_end_namespace_decl_handler() : error conditions *** -- Testing xml_set_end_namespace_decl_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_end_namespace_decl_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_external_entity_ref_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_external_entity_ref_handler_error.php.expectf index 3c90af260..4b85f2672 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_external_entity_ref_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_external_entity_ref_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_external_entity_ref_handler() : error conditions *** -- Testing xml_set_external_entity_ref_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_external_entity_ref_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_notation_decl_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_notation_decl_handler_error.php.expectf index 560c7d5dc..25f7ed42c 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_notation_decl_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_notation_decl_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_notation_decl_handler() : error conditions *** -- Testing xml_set_notation_decl_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_notation_decl_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_object_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_object_error.php.expectf index b6dc3e5e3..0f2dca966 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_object_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_object_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_object() : error conditions *** -- Testing xml_set_object() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_object() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_processing_instruction_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_processing_instruction_handler_error.php.expectf index 8e2552157..1a03efb8c 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_processing_instruction_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_processing_instruction_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_processing_instruction_handler() : error conditions *** -- Testing xml_set_processing_instruction_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_processing_instruction_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_start_namespace_decl_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_start_namespace_decl_handler_error.php.expectf index 7634e4990..4ef7e9793 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_start_namespace_decl_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_start_namespace_decl_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_start_namespace_decl_handler() : error conditions *** -- Testing xml_set_start_namespace_decl_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_start_namespace_decl_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xml/xml_set_unparsed_entity_decl_handler_error.php.expectf b/hphp/test/zend/good/ext-xml/xml_set_unparsed_entity_decl_handler_error.php.expectf index fab74cc46..89f6f2548 100644 --- a/hphp/test/zend/good/ext-xml/xml_set_unparsed_entity_decl_handler_error.php.expectf +++ b/hphp/test/zend/good/ext-xml/xml_set_unparsed_entity_decl_handler_error.php.expectf @@ -1,10 +1,10 @@ *** Testing xml_set_unparsed_entity_decl_handler() : error conditions *** -- Testing xml_set_unparsed_entity_decl_handler() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing xml_set_unparsed_entity_decl_handler() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlreader/001.php.expectf b/hphp/test/zend/good/ext-xmlreader/001.php.expectf index df7a283de..f07d4065f 100644 --- a/hphp/test/zend/good/ext-xmlreader/001.php.expectf +++ b/hphp/test/zend/good/ext-xmlreader/001.php.expectf @@ -1,4 +1,4 @@ books books -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlreader/002.php.expectf b/hphp/test/zend/good/ext-xmlreader/002.php.expectf index 0d4bd8ebf..ba02c0a3a 100644 --- a/hphp/test/zend/good/ext-xmlreader/002.php.expectf +++ b/hphp/test/zend/good/ext-xmlreader/002.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s books books ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlreader/007.php b/hphp/test/zend/good/ext-xmlreader/007.php index f92891f96..42bdd77a7 100644 --- a/hphp/test/zend/good/ext-xmlreader/007.php +++ b/hphp/test/zend/good/ext-xmlreader/007.php @@ -3,7 +3,7 @@ $xmlstring = 'hello'; $relaxngfile = dirname(__FILE__) . '/relaxNG.rng'; -$file = dirname(__FILE__) . '/__007.xml'; +$file = dirname(__FILE__) . '/_007.xml'; file_put_contents($file, $xmlstring); $reader = new XMLReader(); diff --git a/hphp/test/zend/good/ext-xmlreader/007.php.expectf b/hphp/test/zend/good/ext-xmlreader/007.php.expectf index 1e11a61a8..b256472f1 100644 --- a/hphp/test/zend/good/ext-xmlreader/007.php.expectf +++ b/hphp/test/zend/good/ext-xmlreader/007.php.expectf @@ -1,4 +1,4 @@ file relaxNG: ok string relaxNG: ok -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlreader/008.php b/hphp/test/zend/good/ext-xmlreader/008.php index 66214bc23..8b0b0d712 100644 --- a/hphp/test/zend/good/ext-xmlreader/008.php +++ b/hphp/test/zend/good/ext-xmlreader/008.php @@ -18,7 +18,7 @@ $xmlstring = ' '; $dtdfile = rawurlencode(dirname(__FILE__)) . '/dtdexample.dtd'; -$file = dirname(__FILE__) . '/__008.xml'; +$file = dirname(__FILE__) . '/_008.xml'; file_put_contents($file, $xmlstring); diff --git a/hphp/test/zend/good/ext-xmlwriter/xmlwriter_open_uri_error_002.php.expectf b/hphp/test/zend/good/ext-xmlwriter/xmlwriter_open_uri_error_002.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-xmlwriter/xmlwriter_open_uri_error_002.php.expectf +++ b/hphp/test/zend/good/ext-xmlwriter/xmlwriter_open_uri_error_002.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-xmlwriter/xmlwriter_write_dtd_error_001.php.expectf b/hphp/test/zend/good/ext-xmlwriter/xmlwriter_write_dtd_error_001.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/ext-xmlwriter/xmlwriter_write_dtd_error_001.php.expectf +++ b/hphp/test/zend/good/ext-xmlwriter/xmlwriter_write_dtd_error_001.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/004.php.expectf b/hphp/test/zend/good/ext-zlib/004.php.expectf index 0199fac5e..3e0663691 100644 --- a/hphp/test/zend/good/ext-zlib/004.php.expectf +++ b/hphp/test/zend/good/ext-zlib/004.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL array(6) { [0]=> diff --git a/hphp/test/zend/good/ext-zlib/bug61139.php b/hphp/test/zend/good/ext-zlib/bug61139.php deleted file mode 100644 index 2a8699f9f..000000000 --- a/hphp/test/zend/good/ext-zlib/bug61139.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/bug61139.php.expectf b/hphp/test/zend/good/ext-zlib/bug61139.php.expectf deleted file mode 100644 index cfb6a8593..000000000 --- a/hphp/test/zend/good/ext-zlib/bug61139.php.expectf +++ /dev/null @@ -1 +0,0 @@ -HipHop Warning: %a \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzclose_basic.php.expectf b/hphp/test/zend/good/ext-zlib/gzclose_basic.php.expectf index 00411496a..25e41cfe9 100644 --- a/hphp/test/zend/good/ext-zlib/gzclose_basic.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzclose_basic.php.expectf @@ -1,5 +1,5 @@ bool(true) -HipHop Warning: %a +HipHop Warning: %s bool(true) -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzeof_variation1.php.expectf b/hphp/test/zend/good/ext-zlib/gzeof_variation1.php.expectf index f177a3672..af152ac91 100644 --- a/hphp/test/zend/good/ext-zlib/gzeof_variation1.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzeof_variation1.php.expectf @@ -1,5 +1,5 @@ bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s bool(false) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzfile_error.php.expectf b/hphp/test/zend/good/ext-zlib/gzfile_error.php.expectf index 54f5bdaf2..2820ac644 100644 --- a/hphp/test/zend/good/ext-zlib/gzfile_error.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzfile_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzfile_variation4.php.expectf b/hphp/test/zend/good/ext-zlib/gzfile_variation4.php.expectf index 04e26233c..b968e1ff7 100644 --- a/hphp/test/zend/good/ext-zlib/gzfile_variation4.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzfile_variation4.php.expectf @@ -1,11 +1,11 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzfile_variation5.php.expectf b/hphp/test/zend/good/ext-zlib/gzfile_variation5.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-zlib/gzfile_variation5.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzfile_variation5.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzfile_variation7.php.expectf b/hphp/test/zend/good/ext-zlib/gzfile_variation7.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-zlib/gzfile_variation7.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzfile_variation7.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/gzopen_error.php.expectf b/hphp/test/zend/good/ext-zlib/gzopen_error.php.expectf index b68c955ce..a1689bb04 100644 --- a/hphp/test/zend/good/ext-zlib/gzopen_error.php.expectf +++ b/hphp/test/zend/good/ext-zlib/gzopen_error.php.expectf @@ -1,10 +1,10 @@ *** Testing gzopen() : error conditions *** -- Testing gzopen() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL -- Testing gzopen() function with less than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/readgzfile_error.php.expectf b/hphp/test/zend/good/ext-zlib/readgzfile_error.php.expectf index 54f5bdaf2..2820ac644 100644 --- a/hphp/test/zend/good/ext-zlib/readgzfile_error.php.expectf +++ b/hphp/test/zend/good/ext-zlib/readgzfile_error.php.expectf @@ -1,5 +1,5 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/readgzfile_variation4.php.expectf b/hphp/test/zend/good/ext-zlib/readgzfile_variation4.php.expectf index 04e26233c..b968e1ff7 100644 --- a/hphp/test/zend/good/ext-zlib/readgzfile_variation4.php.expectf +++ b/hphp/test/zend/good/ext-zlib/readgzfile_variation4.php.expectf @@ -1,11 +1,11 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/readgzfile_variation5.php.expectf b/hphp/test/zend/good/ext-zlib/readgzfile_variation5.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-zlib/readgzfile_variation5.php.expectf +++ b/hphp/test/zend/good/ext-zlib/readgzfile_variation5.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/ext-zlib/readgzfile_variation7.php.expectf b/hphp/test/zend/good/ext-zlib/readgzfile_variation7.php.expectf index 1af86787f..b5f96fdc4 100644 --- a/hphp/test/zend/good/ext-zlib/readgzfile_variation7.php.expectf +++ b/hphp/test/zend/good/ext-zlib/readgzfile_variation7.php.expectf @@ -1,9 +1,9 @@ -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) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/002.php b/hphp/test/zend/good/tests-basic/002.php index 8ad7f8d67..f4ca78f7a 100644 --- a/hphp/test/zend/good/tests-basic/002.php +++ b/hphp/test/zend/good/tests-basic/002.php @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/003.php b/hphp/test/zend/good/tests-basic/003.php index b5ceb260f..e4ad7584a 100644 --- a/hphp/test/zend/good/tests-basic/003.php +++ b/hphp/test/zend/good/tests-basic/003.php @@ -1,7 +1,9 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/004.php b/hphp/test/zend/good/tests-basic/004.php index 42ea977b3..b253a072f 100644 --- a/hphp/test/zend/good/tests-basic/004.php +++ b/hphp/test/zend/good/tests-basic/004.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/005.php b/hphp/test/zend/good/tests-basic/005.php index 98959b6fa..7b266e19c 100644 --- a/hphp/test/zend/good/tests-basic/005.php +++ b/hphp/test/zend/good/tests-basic/005.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/013.php b/hphp/test/zend/good/tests-basic/013.php index fe2f4a3b6..45e44f2bb 100644 --- a/hphp/test/zend/good/tests-basic/013.php +++ b/hphp/test/zend/good/tests-basic/013.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/014.php b/hphp/test/zend/good/tests-basic/014.php index c6180276c..f83d6ad5e 100644 --- a/hphp/test/zend/good/tests-basic/014.php +++ b/hphp/test/zend/good/tests-basic/014.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/015.php b/hphp/test/zend/good/tests-basic/015.php index 85ad8ec1d..bf7a62924 100644 --- a/hphp/test/zend/good/tests-basic/015.php +++ b/hphp/test/zend/good/tests-basic/015.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/016.php b/hphp/test/zend/good/tests-basic/016.php index 106455735..7d26bdb5f 100644 --- a/hphp/test/zend/good/tests-basic/016.php +++ b/hphp/test/zend/good/tests-basic/016.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/017.php b/hphp/test/zend/good/tests-basic/017.php index c22812eeb..b6f124d45 100644 --- a/hphp/test/zend/good/tests-basic/017.php +++ b/hphp/test/zend/good/tests-basic/017.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/018.php b/hphp/test/zend/good/tests-basic/018.php index f0b946374..83c21866b 100644 --- a/hphp/test/zend/good/tests-basic/018.php +++ b/hphp/test/zend/good/tests-basic/018.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-basic/020.php b/hphp/test/zend/good/tests-basic/020.php index 8d4d57f40..beedc7d6e 100644 --- a/hphp/test/zend/good/tests-basic/020.php +++ b/hphp/test/zend/good/tests-basic/020.php @@ -1,5 +1,6 @@ \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/__call_002.php.expectf b/hphp/test/zend/good/tests-classes/__call_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/__call_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/__call_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/__set__get_002.php.expectf b/hphp/test/zend/good/tests-classes/__set__get_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/__set__get_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/__set__get_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/__set__get_003.php.expectf b/hphp/test/zend/good/tests-classes/__set__get_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/__set__get_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/__set__get_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract.php.expectf b/hphp/test/zend/good/tests-classes/abstract.php.expectf index c52a7aa3b..f40ea89b3 100644 --- a/hphp/test/zend/good/tests-classes/abstract.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract.php.expectf @@ -1,2 +1,2 @@ Call to function show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_by_interface_001.php.expectf b/hphp/test/zend/good/tests-classes/abstract_by_interface_001.php.expectf index a0e79fafa..850961ddc 100644 --- a/hphp/test/zend/good/tests-classes/abstract_by_interface_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_by_interface_001.php.expectf @@ -1,3 +1,3 @@ object(Leaf)#%d (0) { } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_by_interface_002.php.expectf b/hphp/test/zend/good/tests-classes/abstract_by_interface_002.php.expectf index a0e79fafa..850961ddc 100644 --- a/hphp/test/zend/good/tests-classes/abstract_by_interface_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_by_interface_002.php.expectf @@ -1,3 +1,3 @@ object(Leaf)#%d (0) { } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_class.php.expectf b/hphp/test/zend/good/tests-classes/abstract_class.php.expectf index c52a7aa3b..f40ea89b3 100644 --- a/hphp/test/zend/good/tests-classes/abstract_class.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_class.php.expectf @@ -1,2 +1,2 @@ Call to function show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_derived.php.expectf b/hphp/test/zend/good/tests-classes/abstract_derived.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/abstract_derived.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_derived.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_final.php.expectf b/hphp/test/zend/good/tests-classes/abstract_final.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/abstract_final.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_final.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_inherit.php.expectf b/hphp/test/zend/good/tests-classes/abstract_inherit.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/abstract_inherit.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_inherit.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_not_declared.php.expectf b/hphp/test/zend/good/tests-classes/abstract_not_declared.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/abstract_not_declared.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_not_declared.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_redeclare.php.expectf b/hphp/test/zend/good/tests-classes/abstract_redeclare.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/abstract_redeclare.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_redeclare.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/abstract_user_call.php.expectf b/hphp/test/zend/good/tests-classes/abstract_user_call.php.expectf index f81c6018c..76fac9bf5 100644 --- a/hphp/test/zend/good/tests-classes/abstract_user_call.php.expectf +++ b/hphp/test/zend/good/tests-classes/abstract_user_call.php.expectf @@ -1,2 +1,2 @@ test::func() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/array_access_001.php.expectf b/hphp/test/zend/good/tests-classes/array_access_001.php.expectf index 2f04bc8b0..b18e380f8 100644 --- a/hphp/test/zend/good/tests-classes/array_access_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/array_access_001.php.expectf @@ -48,10 +48,10 @@ string(3) "3rd" object::offsetGet(4th) int(4) object::offsetGet(5th) -HipHop Notice: %a +HipHop Notice: %s NULL object::offsetGet(6) -HipHop Notice: %a +HipHop Notice: %s NULL ===offsetSet=== WRITE 1 diff --git a/hphp/test/zend/good/tests-classes/array_access_002.php.expectf b/hphp/test/zend/good/tests-classes/array_access_002.php.expectf index 2f04bc8b0..b18e380f8 100644 --- a/hphp/test/zend/good/tests-classes/array_access_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/array_access_002.php.expectf @@ -48,10 +48,10 @@ string(3) "3rd" object::offsetGet(4th) int(4) object::offsetGet(5th) -HipHop Notice: %a +HipHop Notice: %s NULL object::offsetGet(6) -HipHop Notice: %a +HipHop Notice: %s NULL ===offsetSet=== WRITE 1 diff --git a/hphp/test/zend/good/tests-classes/autoload_009.php.expectf b/hphp/test/zend/good/tests-classes/autoload_009.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/autoload_009.php.expectf +++ b/hphp/test/zend/good/tests-classes/autoload_009.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/autoload_010.php.expectf b/hphp/test/zend/good/tests-classes/autoload_010.php.expectf index 1cd5d4d25..e91813107 100644 --- a/hphp/test/zend/good/tests-classes/autoload_010.php.expectf +++ b/hphp/test/zend/good/tests-classes/autoload_010.php.expectf @@ -1,2 +1,2 @@ In autoload: string(6) "UndefI" -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/autoload_011.php.expectf b/hphp/test/zend/good/tests-classes/autoload_011.php.expectf index 691dc4d49..211ce1d90 100644 --- a/hphp/test/zend/good/tests-classes/autoload_011.php.expectf +++ b/hphp/test/zend/good/tests-classes/autoload_011.php.expectf @@ -1,2 +1,2 @@ In autoload: string(9) "UndefBase" -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/autoload_012.php.expectf b/hphp/test/zend/good/tests-classes/autoload_012.php.expectf index 9106fbc50..ed4b50acc 100644 --- a/hphp/test/zend/good/tests-classes/autoload_012.php.expectf +++ b/hphp/test/zend/good/tests-classes/autoload_012.php.expectf @@ -1,2 +1,2 @@ In autoload: string(6) "UndefC" -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/bug27468.php.expectf b/hphp/test/zend/good/tests-classes/bug27468.php.expectf index 146c9c641..d5f1ebdf7 100644 --- a/hphp/test/zend/good/tests-classes/bug27468.php.expectf +++ b/hphp/test/zend/good/tests-classes/bug27468.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s OK \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/bug27504.php.expectf b/hphp/test/zend/good/tests-classes/bug27504.php.expectf index c6a092685..aa790f786 100644 --- a/hphp/test/zend/good/tests-classes/bug27504.php.expectf +++ b/hphp/test/zend/good/tests-classes/bug27504.php.expectf @@ -1,3 +1,3 @@ Called function foo:bar(1) -HipHop Warning: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Warning: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/bug29446.php.expectf b/hphp/test/zend/good/tests-classes/bug29446.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/bug29446.php.expectf +++ b/hphp/test/zend/good/tests-classes/bug29446.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/bug63462.php.expectf b/hphp/test/zend/good/tests-classes/bug63462.php.expectf index 4b8576c19..6016cabf8 100644 --- a/hphp/test/zend/good/tests-classes/bug63462.php.expectf +++ b/hphp/test/zend/good/tests-classes/bug63462.php.expectf @@ -1,11 +1,11 @@ __get nonExisting -HipHop Notice: %a +HipHop Notice: %s __get publicProperty -HipHop Notice: %a +HipHop Notice: %s __get protectedProperty -HipHop Notice: %a +HipHop Notice: %s __get privateProperty -HipHop Notice: %a +HipHop Notice: %s __isset nonExisting __isset publicProperty __isset protectedProperty diff --git a/hphp/test/zend/good/tests-classes/class_abstract.php.expectf b/hphp/test/zend/good/tests-classes/class_abstract.php.expectf index 26dcf9408..a290544d4 100644 --- a/hphp/test/zend/good/tests-classes/class_abstract.php.expectf +++ b/hphp/test/zend/good/tests-classes/class_abstract.php.expectf @@ -1,2 +1,2 @@ base -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/class_final.php.expectf b/hphp/test/zend/good/tests-classes/class_final.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/class_final.php.expectf +++ b/hphp/test/zend/good/tests-classes/class_final.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/clone_005.php.expectf b/hphp/test/zend/good/tests-classes/clone_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/clone_005.php.expectf +++ b/hphp/test/zend/good/tests-classes/clone_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/constants_basic_001.php.expectf b/hphp/test/zend/good/tests-classes/constants_basic_001.php.expectf index a9aebeec6..0d645eaac 100644 --- a/hphp/test/zend/good/tests-classes/constants_basic_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/constants_basic_001.php.expectf @@ -1,7 +1,7 @@ -HipHop Notice: %a +HipHop Notice: %s Attempt to access various kinds of class constants: -HipHop Notice: %a +HipHop Notice: %s string(9) "UNDEFINED" int(1) float(1.5) @@ -23,4 +23,4 @@ string(6) "hello2" string(6) "hello2" Expecting fatal error: -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/constants_error_001.php.expectf b/hphp/test/zend/good/tests-classes/constants_error_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/constants_error_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/constants_error_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/constants_error_002.php.expectf b/hphp/test/zend/good/tests-classes/constants_error_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/constants_error_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/constants_error_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/constants_error_003.php.expectf b/hphp/test/zend/good/tests-classes/constants_error_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/constants_error_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/constants_error_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/constants_scope_001.php.expectf b/hphp/test/zend/good/tests-classes/constants_scope_001.php.expectf index f74eaf432..b74c35f2a 100644 --- a/hphp/test/zend/good/tests-classes/constants_scope_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/constants_scope_001.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s FATAL = FATAL self::FATAL = Fatal error self::FATAL = Worst error diff --git a/hphp/test/zend/good/tests-classes/ctor_in_interface_01.php.expectf b/hphp/test/zend/good/tests-classes/ctor_in_interface_01.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/ctor_in_interface_01.php.expectf +++ b/hphp/test/zend/good/tests-classes/ctor_in_interface_01.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/ctor_in_interface_02.php.expectf b/hphp/test/zend/good/tests-classes/ctor_in_interface_02.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/ctor_in_interface_02.php.expectf +++ b/hphp/test/zend/good/tests-classes/ctor_in_interface_02.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/ctor_in_interface_03.php.expectf b/hphp/test/zend/good/tests-classes/ctor_in_interface_03.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/ctor_in_interface_03.php.expectf +++ b/hphp/test/zend/good/tests-classes/ctor_in_interface_03.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/ctor_in_interface_04.php.expectf b/hphp/test/zend/good/tests-classes/ctor_in_interface_04.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/ctor_in_interface_04.php.expectf +++ b/hphp/test/zend/good/tests-classes/ctor_in_interface_04.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/ctor_visibility.php.expectf b/hphp/test/zend/good/tests-classes/ctor_visibility.php.expectf index 401e5d9ec..aacc4413c 100644 --- a/hphp/test/zend/good/tests-classes/ctor_visibility.php.expectf +++ b/hphp/test/zend/good/tests-classes/ctor_visibility.php.expectf @@ -2,4 +2,4 @@ Derived::__construct() Test::__construct() TestPriv::__construct() DerivedPriv::__construct() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/factory_and_singleton_003.php.expectf b/hphp/test/zend/good/tests-classes/factory_and_singleton_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/factory_and_singleton_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/factory_and_singleton_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/factory_and_singleton_004.php.expectf b/hphp/test/zend/good/tests-classes/factory_and_singleton_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/factory_and_singleton_004.php.expectf +++ b/hphp/test/zend/good/tests-classes/factory_and_singleton_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/final_abstract.php.expectf b/hphp/test/zend/good/tests-classes/final_abstract.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/final_abstract.php.expectf +++ b/hphp/test/zend/good/tests-classes/final_abstract.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/final_ctor3.php.expectf b/hphp/test/zend/good/tests-classes/final_ctor3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/final_ctor3.php.expectf +++ b/hphp/test/zend/good/tests-classes/final_ctor3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/final_redeclare.php.expectf b/hphp/test/zend/good/tests-classes/final_redeclare.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/final_redeclare.php.expectf +++ b/hphp/test/zend/good/tests-classes/final_redeclare.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_and_extends.php.expectf b/hphp/test/zend/good/tests-classes/interface_and_extends.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_and_extends.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_and_extends.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_class.php.expectf b/hphp/test/zend/good/tests-classes/interface_class.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_class.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_class.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_001.php.expectf b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_002.php.expectf b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_003.php.expectf b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_constant_inheritance_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_constant_inheritance_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_instantiate.php.expectf b/hphp/test/zend/good/tests-classes/interface_instantiate.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_instantiate.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_instantiate.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_method.php.expectf b/hphp/test/zend/good/tests-classes/interface_method.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_method.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_method.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_method_final.php.expectf b/hphp/test/zend/good/tests-classes/interface_method_final.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_method_final.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_method_final.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_method_private.php.expectf b/hphp/test/zend/good/tests-classes/interface_method_private.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_method_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_method_private.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interface_must_be_implemented.php.expectf b/hphp/test/zend/good/tests-classes/interface_must_be_implemented.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interface_must_be_implemented.php.expectf +++ b/hphp/test/zend/good/tests-classes/interface_must_be_implemented.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/interfaces_002.php.expectf b/hphp/test/zend/good/tests-classes/interfaces_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/interfaces_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/interfaces_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_001.php.expectf b/hphp/test/zend/good/tests-classes/private_001.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_001.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_002.php.expectf b/hphp/test/zend/good/tests-classes/private_002.php.expectf index dc87827b7..cbf48e05b 100644 --- a/hphp/test/zend/good/tests-classes/private_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_002.php.expectf @@ -1,3 +1,3 @@ Call pass::show() Call fail::show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_003.php.expectf b/hphp/test/zend/good/tests-classes/private_003.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_003.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_003b.php.expectf b/hphp/test/zend/good/tests-classes/private_003b.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_003b.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_003b.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_004.php.expectf b/hphp/test/zend/good/tests-classes/private_004.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_004.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_004.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_004b.php.expectf b/hphp/test/zend/good/tests-classes/private_004b.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_004b.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_004b.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_005.php.expectf b/hphp/test/zend/good/tests-classes/private_005.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_005.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_005.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_005b.php.expectf b/hphp/test/zend/good/tests-classes/private_005b.php.expectf index 4fc8b4e69..114e9b4f1 100644 --- a/hphp/test/zend/good/tests-classes/private_005b.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_005b.php.expectf @@ -1,2 +1,2 @@ Call show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/private_redeclare.php.expectf b/hphp/test/zend/good/tests-classes/private_redeclare.php.expectf index c0c121da3..1fce48272 100644 --- a/hphp/test/zend/good/tests-classes/private_redeclare.php.expectf +++ b/hphp/test/zend/good/tests-classes/private_redeclare.php.expectf @@ -2,4 +2,4 @@ base test derived base -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_private.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_private.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_private.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_privateStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_privateStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_privateStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_privateStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_protected.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_protected.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_protected.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_protected.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_public.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_public.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protectedStatic_public.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protectedStatic_public.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protected_private.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protected_private.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protected_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protected_private.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protected_privateStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protected_privateStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protected_privateStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protected_privateStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protected_protectedStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protected_protectedStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protected_protectedStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protected_protectedStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_protected_publicStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_protected_publicStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_protected_publicStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_protected_publicStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_publicStatic_private.php.expectf b/hphp/test/zend/good/tests-classes/property_override_publicStatic_private.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_publicStatic_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_publicStatic_private.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_publicStatic_privateStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_publicStatic_privateStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_publicStatic_privateStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_publicStatic_privateStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_publicStatic_protected.php.expectf b/hphp/test/zend/good/tests-classes/property_override_publicStatic_protected.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_publicStatic_protected.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_publicStatic_protected.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_publicStatic_protectedStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_publicStatic_protectedStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_publicStatic_protectedStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_publicStatic_protectedStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_publicStatic_public.php.expectf b/hphp/test/zend/good/tests-classes/property_override_publicStatic_public.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_publicStatic_public.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_publicStatic_public.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_public_private.php.expectf b/hphp/test/zend/good/tests-classes/property_override_public_private.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_public_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_public_private.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_public_privateStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_public_privateStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_public_privateStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_public_privateStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_public_protected.php.expectf b/hphp/test/zend/good/tests-classes/property_override_public_protected.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_public_protected.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_public_protected.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_public_protectedStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_public_protectedStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_public_protectedStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_public_protectedStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_override_public_publicStatic.php.expectf b/hphp/test/zend/good/tests-classes/property_override_public_publicStatic.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/property_override_public_publicStatic.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_override_public_publicStatic.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_recreate_private.php.expectf b/hphp/test/zend/good/tests-classes/property_recreate_private.php.expectf index 50cc19b3a..6a148f685 100644 --- a/hphp/test/zend/good/tests-classes/property_recreate_private.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_recreate_private.php.expectf @@ -24,4 +24,4 @@ object(C)#%d (1) { } Unset a private property, and attempt to recreate at global scope (expecting failure): -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/property_recreate_protected.php.expectf b/hphp/test/zend/good/tests-classes/property_recreate_protected.php.expectf index 8a3e4fcb8..346fb1904 100644 --- a/hphp/test/zend/good/tests-classes/property_recreate_protected.php.expectf +++ b/hphp/test/zend/good/tests-classes/property_recreate_protected.php.expectf @@ -11,4 +11,4 @@ object(D)#%d (1) { } Unset a protected property, and attempt to recreate it outside of scope (expected failure): -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/protected_001.php.expectf b/hphp/test/zend/good/tests-classes/protected_001.php.expectf index e29d59c10..e3566a1fa 100644 --- a/hphp/test/zend/good/tests-classes/protected_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/protected_001.php.expectf @@ -1,2 +1,2 @@ Call fail() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/protected_001b.php.expectf b/hphp/test/zend/good/tests-classes/protected_001b.php.expectf index e29d59c10..e3566a1fa 100644 --- a/hphp/test/zend/good/tests-classes/protected_001b.php.expectf +++ b/hphp/test/zend/good/tests-classes/protected_001b.php.expectf @@ -1,2 +1,2 @@ Call fail() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/protected_002.php.expectf b/hphp/test/zend/good/tests-classes/protected_002.php.expectf index dc87827b7..cbf48e05b 100644 --- a/hphp/test/zend/good/tests-classes/protected_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/protected_002.php.expectf @@ -1,3 +1,3 @@ Call pass::show() Call fail::show() -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_mix_1.php.expectf b/hphp/test/zend/good/tests-classes/static_mix_1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_mix_1.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_mix_1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_mix_2.php.expectf b/hphp/test/zend/good/tests-classes/static_mix_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_mix_2.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_mix_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assign.php.expectf b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assign.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assign.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assign.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignInc.php.expectf b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignInc.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignInc.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignInc.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignRef.php.expectf b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignRef.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignRef.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_properties_undeclared_assignRef.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_properties_undeclared_inc.php.expectf b/hphp/test/zend/good/tests-classes/static_properties_undeclared_inc.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_properties_undeclared_inc.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_properties_undeclared_inc.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_properties_undeclared_read.php.expectf b/hphp/test/zend/good/tests-classes/static_properties_undeclared_read.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/static_properties_undeclared_read.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_properties_undeclared_read.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/static_this.php.expectf b/hphp/test/zend/good/tests-classes/static_this.php.expectf index 2d3c6e389..48205702a 100644 --- a/hphp/test/zend/good/tests-classes/static_this.php.expectf +++ b/hphp/test/zend/good/tests-classes/static_this.php.expectf @@ -1,6 +1,6 @@ -HipHop Notice: %a +HipHop Notice: %s NULL -HipHop Notice: %a +HipHop Notice: %s NULL object(stdClass)#%d (0) { } diff --git a/hphp/test/zend/good/tests-classes/this.php.expectf b/hphp/test/zend/good/tests-classes/this.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/this.php.expectf +++ b/hphp/test/zend/good/tests-classes/this.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/type_hinting_001.php.expectf b/hphp/test/zend/good/tests-classes/type_hinting_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/type_hinting_001.php.expectf +++ b/hphp/test/zend/good/tests-classes/type_hinting_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/type_hinting_002.php.expectf b/hphp/test/zend/good/tests-classes/type_hinting_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/type_hinting_002.php.expectf +++ b/hphp/test/zend/good/tests-classes/type_hinting_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-classes/type_hinting_003.php b/hphp/test/zend/good/tests-classes/type_hinting_003.php similarity index 100% rename from hphp/test/zend/bad/tests-classes/type_hinting_003.php rename to hphp/test/zend/good/tests-classes/type_hinting_003.php diff --git a/hphp/test/zend/bad/tests-classes/type_hinting_003.php.expectf b/hphp/test/zend/good/tests-classes/type_hinting_003.php.expectf similarity index 85% rename from hphp/test/zend/bad/tests-classes/type_hinting_003.php.expectf rename to hphp/test/zend/good/tests-classes/type_hinting_003.php.expectf index e03ac9131..473d81fc2 100644 --- a/hphp/test/zend/bad/tests-classes/type_hinting_003.php.expectf +++ b/hphp/test/zend/good/tests-classes/type_hinting_003.php.expectf @@ -15,5 +15,4 @@ array(1) { [0]=> int(25) } - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_000a.php.expectf b/hphp/test/zend/good/tests-classes/visibility_000a.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_000a.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_000a.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_000b.php.expectf b/hphp/test/zend/good/tests-classes/visibility_000b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_000b.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_000b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_001a.php.expectf b/hphp/test/zend/good/tests-classes/visibility_001a.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_001a.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_001a.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_001b.php.expectf b/hphp/test/zend/good/tests-classes/visibility_001b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_001b.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_001b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_002a.php.expectf b/hphp/test/zend/good/tests-classes/visibility_002a.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_002a.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_002a.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_002b.php.expectf b/hphp/test/zend/good/tests-classes/visibility_002b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_002b.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_002b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-classes/visibility_003b.php.expectf b/hphp/test/zend/good/tests-classes/visibility_003b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-classes/visibility_003b.php.expectf +++ b/hphp/test/zend/good/tests-classes/visibility_003b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/041.php.expectf b/hphp/test/zend/good/tests-lang/041.php.expectf index bc2901914..089fff1ac 100644 --- a/hphp/test/zend/good/tests-lang/041.php.expectf +++ b/hphp/test/zend/good/tests-lang/041.php.expectf @@ -1,2 +1,2 @@ foo -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/042.php.expectf b/hphp/test/zend/good/tests-lang/042.php.expectf index bc2901914..089fff1ac 100644 --- a/hphp/test/zend/good/tests-lang/042.php.expectf +++ b/hphp/test/zend/good/tests-lang/042.php.expectf @@ -1,2 +1,2 @@ foo -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/043.php.expectf b/hphp/test/zend/good/tests-lang/043.php.expectf index bc2901914..089fff1ac 100644 --- a/hphp/test/zend/good/tests-lang/043.php.expectf +++ b/hphp/test/zend/good/tests-lang/043.php.expectf @@ -1,2 +1,2 @@ foo -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/044.php.expectf b/hphp/test/zend/good/tests-lang/044.php.expectf index bc2901914..089fff1ac 100644 --- a/hphp/test/zend/good/tests-lang/044.php.expectf +++ b/hphp/test/zend/good/tests-lang/044.php.expectf @@ -1,2 +1,2 @@ foo -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/bug24573.php.expectf b/hphp/test/zend/good/tests-lang/bug24573.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/bug24573.php.expectf +++ b/hphp/test/zend/good/tests-lang/bug24573.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/tests-lang/bug24658.php b/hphp/test/zend/good/tests-lang/bug24658.php similarity index 100% rename from hphp/test/zend/bad/tests-lang/bug24658.php rename to hphp/test/zend/good/tests-lang/bug24658.php diff --git a/hphp/test/zend/bad/tests-lang/bug24658.php.expectf b/hphp/test/zend/good/tests-lang/bug24658.php.expectf similarity index 91% rename from hphp/test/zend/bad/tests-lang/bug24658.php.expectf rename to hphp/test/zend/good/tests-lang/bug24658.php.expectf index 46fb0d41f..753970f49 100644 --- a/hphp/test/zend/bad/tests-lang/bug24658.php.expectf +++ b/hphp/test/zend/good/tests-lang/bug24658.php.expectf @@ -19,5 +19,4 @@ int(2) ===typehint=== object(foo)#%d (0) { } - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/bug29893.php.expectf b/hphp/test/zend/good/tests-lang/bug29893.php.expectf index 48734b894..82465ddae 100644 --- a/hphp/test/zend/good/tests-lang/bug29893.php.expectf +++ b/hphp/test/zend/good/tests-lang/bug29893.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/catchable_error_001.php.expectf b/hphp/test/zend/good/tests-lang/catchable_error_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/catchable_error_001.php.expectf +++ b/hphp/test/zend/good/tests-lang/catchable_error_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/engine_assignExecutionOrder_002.php.expectf b/hphp/test/zend/good/tests-lang/engine_assignExecutionOrder_002.php.expectf index 5dffb1c20..d8c1c7df3 100644 --- a/hphp/test/zend/good/tests-lang/engine_assignExecutionOrder_002.php.expectf +++ b/hphp/test/zend/good/tests-lang/engine_assignExecutionOrder_002.php.expectf @@ -1,5 +1,5 @@ A=hello B=bye -HipHop Warning: %a +HipHop Warning: %s array(2) { [0]=> int(10) @@ -23,10 +23,10 @@ array(3) { L=100 M=200 N=300 O= and P= 10 20 40 50 60 70 80 -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s Y=,Z= -HipHop Notice: %a +HipHop Notice: %s AA=10 CC=10 DD=30 Array diff --git a/hphp/test/zend/good/tests-lang/foreachLoop.006.php.expectf b/hphp/test/zend/good/tests-lang/foreachLoop.006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/foreachLoop.006.php.expectf +++ b/hphp/test/zend/good/tests-lang/foreachLoop.006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/foreachLoopIterator.001.php.expectf b/hphp/test/zend/good/tests-lang/foreachLoopIterator.001.php.expectf index ee3d5d98b..d6259d731 100644 --- a/hphp/test/zend/good/tests-lang/foreachLoopIterator.001.php.expectf +++ b/hphp/test/zend/good/tests-lang/foreachLoopIterator.001.php.expectf @@ -59,6 +59,6 @@ meal 0 => breakfast --> MealIterator::next (2) --> MealIterator::valid (3) --> MealIterator::next (3) -HipHop Notice: %a +HipHop Notice: %s --> MealIterator::valid (4) ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/foreachLoopIterator.002.php.expectf b/hphp/test/zend/good/tests-lang/foreachLoopIterator.002.php.expectf index 2cf2316bd..eefd01c59 100644 --- a/hphp/test/zend/good/tests-lang/foreachLoopIterator.002.php.expectf +++ b/hphp/test/zend/good/tests-lang/foreachLoopIterator.002.php.expectf @@ -1,2 +1,2 @@ -----( Try to iterate with &$value: )----- -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/passByReference_002.php.expectf b/hphp/test/zend/good/tests-lang/passByReference_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/passByReference_002.php.expectf +++ b/hphp/test/zend/good/tests-lang/passByReference_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/type_hints_001.php.expectf b/hphp/test/zend/good/tests-lang/type_hints_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/type_hints_001.php.expectf +++ b/hphp/test/zend/good/tests-lang/type_hints_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-lang/type_hints_003.php.expectf b/hphp/test/zend/good/tests-lang/type_hints_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/tests-lang/type_hints_003.php.expectf +++ b/hphp/test/zend/good/tests-lang/type_hints_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_clean_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_clean_error_001.php.expectf index 046e060be..3921ebcd4 100644 --- a/hphp/test/zend/good/tests-output/ob_clean_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_clean_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_clean() : error conditions *** -- Testing ob_clean() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_end_flush_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_end_flush_error_001.php.expectf index 401fef907..01b54d352 100644 --- a/hphp/test/zend/good/tests-output/ob_end_flush_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_end_flush_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_end_flush() : error conditions *** -- Testing ob_end_flush() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_flush_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_flush_error_001.php.expectf index efc6315dd..7561c053e 100644 --- a/hphp/test/zend/good/tests-output/ob_flush_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_flush_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_flush() : error conditions *** -- Testing ob_flush() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_get_contents_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_get_contents_error_001.php.expectf index a017b4cb1..358ec138c 100644 --- a/hphp/test/zend/good/tests-output/ob_get_contents_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_get_contents_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_get_contents() : error cases *** -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_get_level_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_get_level_error_001.php.expectf index ebad13a2c..f3688b70f 100644 --- a/hphp/test/zend/good/tests-output/ob_get_level_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_get_level_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_get_level() : error conditions *** -- Testing ob_get_level() function with one argument -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/tests-output/ob_implicit_flush_error_001.php.expectf b/hphp/test/zend/good/tests-output/ob_implicit_flush_error_001.php.expectf index f1ade9bd3..0c917cee6 100644 --- a/hphp/test/zend/good/tests-output/ob_implicit_flush_error_001.php.expectf +++ b/hphp/test/zend/good/tests-output/ob_implicit_flush_error_001.php.expectf @@ -1,6 +1,6 @@ *** Testing ob_implicit_flush() : error conditions *** -- Testing ob_implicit_flush() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php new file mode 100644 index 000000000..52abd2b26 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_before_yield_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php new file mode 100644 index 000000000..7fd87cb29 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_cannot_return_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php b/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php new file mode 100644 index 000000000..e0fb3ca41 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_extend_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php b/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php new file mode 100644 index 000000000..709d529ef --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/generator_instantiate_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php b/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php new file mode 100644 index 000000000..9370e791c --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php @@ -0,0 +1,12 @@ +next(); +} + +$gen = gen(); +$gen->send($gen); +$gen->next(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/resume_running_generator_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php b/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php new file mode 100644 index 000000000..50b070cb9 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php.expectf b/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators-errors/yield_outside_function_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/bug63066.php b/hphp/test/zend/good/zend-generators/bug63066.php new file mode 100644 index 000000000..161884de3 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/bug63066.php @@ -0,0 +1,9 @@ +fatalError(); +} + +foreach(gen(new stdClass()) as $value) + echo $value, "\n"; \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/bug63066.php.expectf b/hphp/test/zend/good/zend-generators/bug63066.php.expectf new file mode 100644 index 000000000..089fff1ac --- /dev/null +++ b/hphp/test/zend/good/zend-generators/bug63066.php.expectf @@ -0,0 +1,2 @@ +foo +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/clone.php b/hphp/test/zend/good/zend-generators/clone.php new file mode 100644 index 000000000..027e95ba7 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/clone.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/clone.php.expectf b/hphp/test/zend/good/zend-generators/clone.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/clone.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/dynamic_call.php b/hphp/test/zend/good/zend-generators/dynamic_call.php new file mode 100644 index 000000000..1c937817d --- /dev/null +++ b/hphp/test/zend/good/zend-generators/dynamic_call.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/dynamic_call.php.expectf b/hphp/test/zend/good/zend-generators/dynamic_call.php.expectf new file mode 100644 index 000000000..20a784c00 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/dynamic_call.php.expectf @@ -0,0 +1,2 @@ +string(3) "bar" +string(3) "foo" \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/fibonacci.php b/hphp/test/zend/good/zend-generators/fibonacci.php new file mode 100644 index 000000000..d0d5d2d75 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/fibonacci.php @@ -0,0 +1,17 @@ + 1000) break; + + var_dump($n); +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/fibonacci.php.expectf b/hphp/test/zend/good/zend-generators/fibonacci.php.expectf new file mode 100644 index 000000000..a1eeef18a --- /dev/null +++ b/hphp/test/zend/good/zend-generators/fibonacci.php.expectf @@ -0,0 +1,15 @@ +int(1) +int(2) +int(3) +int(5) +int(8) +int(13) +int(21) +int(34) +int(55) +int(89) +int(144) +int(233) +int(377) +int(610) +int(987) \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_closure.php b/hphp/test/zend/good/zend-generators/generator_closure.php new file mode 100644 index 000000000..423f842ce --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_closure.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_closure.php.expectf b/hphp/test/zend/good/zend-generators/generator_closure.php.expectf new file mode 100644 index 000000000..a230030fe --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_closure.php.expectf @@ -0,0 +1,3 @@ +int(1) +int(2) +int(3) \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_method.php b/hphp/test/zend/good/zend-generators/generator_method.php new file mode 100644 index 000000000..4a6668dda --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_method.php @@ -0,0 +1,22 @@ +data = $data; + } + + public function getIterator() { + foreach ($this->data as $value) { + yield $value; + } + } +} + +$test = new Test(['foo', 'bar', 'baz']); +foreach ($test as $value) { + var_dump($value); +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_method.php.expectf b/hphp/test/zend/good/zend-generators/generator_method.php.expectf new file mode 100644 index 000000000..5eaf9b547 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_method.php.expectf @@ -0,0 +1,3 @@ +string(3) "foo" +string(3) "bar" +string(3) "baz" \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_static_method.php b/hphp/test/zend/good/zend-generators/generator_static_method.php new file mode 100644 index 000000000..bc2219003 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_static_method.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/generator_static_method.php.expectf b/hphp/test/zend/good/zend-generators/generator_static_method.php.expectf new file mode 100644 index 000000000..21613edf5 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/generator_static_method.php.expectf @@ -0,0 +1,5 @@ +string(4) "Test" +string(12) "ExtendedTest" +int(1) +int(2) +int(3) \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/throw_not_an_exception.php b/hphp/test/zend/good/zend-generators/throw_not_an_exception.php new file mode 100644 index 000000000..b3fc68713 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/throw_not_an_exception.php @@ -0,0 +1,10 @@ +throw(new stdClass); + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/throw_not_an_exception.php.expectf b/hphp/test/zend/good/zend-generators/throw_not_an_exception.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/throw_not_an_exception.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/xrange.php b/hphp/test/zend/good/zend-generators/xrange.php new file mode 100644 index 000000000..43e685db4 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/xrange.php @@ -0,0 +1,13 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/xrange.php.expectf b/hphp/test/zend/good/zend-generators/xrange.php.expectf new file mode 100644 index 000000000..2a4128b67 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/xrange.php.expectf @@ -0,0 +1,6 @@ +int(10) +int(12) +int(14) +int(16) +int(18) +int(20) \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/yield_closure.php b/hphp/test/zend/good/zend-generators/yield_closure.php new file mode 100644 index 000000000..ecc4124b9 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/yield_closure.php @@ -0,0 +1,12 @@ +next(); + +echo "Done!"; + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend-generators/yield_closure.php.expectf b/hphp/test/zend/good/zend-generators/yield_closure.php.expectf new file mode 100644 index 000000000..8d74cbaf1 --- /dev/null +++ b/hphp/test/zend/good/zend-generators/yield_closure.php.expectf @@ -0,0 +1 @@ +Done! \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits-bugs/abstract-methods01.php.expectf b/hphp/test/zend/good/zend-traits-bugs/abstract-methods01.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits-bugs/abstract-methods01.php.expectf +++ b/hphp/test/zend/good/zend-traits-bugs/abstract-methods01.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits-bugs/alias01.php.expectf b/hphp/test/zend/good/zend-traits-bugs/alias01.php.expectf index 5ba5767c6..dd5a89eff 100644 --- a/hphp/test/zend/good/zend-traits-bugs/alias01.php.expectf +++ b/hphp/test/zend/good/zend-traits-bugs/alias01.php.expectf @@ -1,4 +1,4 @@ T:m1 T:m1 T:m2 -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits-bugs/case-sensitive.php.expectf b/hphp/test/zend/good/zend-traits-bugs/case-sensitive.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits-bugs/case-sensitive.php.expectf +++ b/hphp/test/zend/good/zend-traits-bugs/case-sensitive.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits-bugs/missing-trait.php.expectf b/hphp/test/zend/good/zend-traits-bugs/missing-trait.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits-bugs/missing-trait.php.expectf +++ b/hphp/test/zend/good/zend-traits-bugs/missing-trait.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits-bugs/overridding-conflicting-property-initializer.php.expectf b/hphp/test/zend/good/zend-traits-bugs/overridding-conflicting-property-initializer.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits-bugs/overridding-conflicting-property-initializer.php.expectf +++ b/hphp/test/zend/good/zend-traits-bugs/overridding-conflicting-property-initializer.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug54441.php.expectf b/hphp/test/zend/good/zend-traits/bug54441.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug54441.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug54441.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug55524.php.expectf b/hphp/test/zend/good/zend-traits/bug55524.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug55524.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug55524.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug55554e.php.expectf b/hphp/test/zend/good/zend-traits/bug55554e.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug55554e.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug55554e.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60145.php.expectf b/hphp/test/zend/good/zend-traits/bug60145.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60145.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60145.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60153.php.expectf b/hphp/test/zend/good/zend-traits/bug60153.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60153.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60153.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60165a.php.expectf b/hphp/test/zend/good/zend-traits/bug60165a.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60165a.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60165a.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60165b.php.expectf b/hphp/test/zend/good/zend-traits/bug60165b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60165b.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60165b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60165c.php.expectf b/hphp/test/zend/good/zend-traits/bug60165c.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60165c.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60165c.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60165d.php.expectf b/hphp/test/zend/good/zend-traits/bug60165d.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60165d.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60165d.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60173.php.expectf b/hphp/test/zend/good/zend-traits/bug60173.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60173.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60173.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug60369.php.expectf b/hphp/test/zend/good/zend-traits/bug60369.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug60369.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug60369.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug61052.php.expectf b/hphp/test/zend/good/zend-traits/bug61052.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug61052.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug61052.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug64235.php.expectf b/hphp/test/zend/good/zend-traits/bug64235.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug64235.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug64235.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/bug64235b.php.expectf b/hphp/test/zend/good/zend-traits/bug64235b.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/bug64235b.php.expectf +++ b/hphp/test/zend/good/zend-traits/bug64235b.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/conflict001.php.expectf b/hphp/test/zend/good/zend-traits/conflict001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/conflict001.php.expectf +++ b/hphp/test/zend/good/zend-traits/conflict001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/conflict003.php.expectf b/hphp/test/zend/good/zend-traits/conflict003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/conflict003.php.expectf +++ b/hphp/test/zend/good/zend-traits/conflict003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_001.php.expectf b/hphp/test/zend/good/zend-traits/error_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_001.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_002.php.expectf b/hphp/test/zend/good/zend-traits/error_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_002.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_003.php.expectf b/hphp/test/zend/good/zend-traits/error_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_003.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_004.php.expectf b/hphp/test/zend/good/zend-traits/error_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_004.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_005.php.expectf b/hphp/test/zend/good/zend-traits/error_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_005.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_006.php.expectf b/hphp/test/zend/good/zend-traits/error_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_006.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_007.php.expectf b/hphp/test/zend/good/zend-traits/error_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_007.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_008.php.expectf b/hphp/test/zend/good/zend-traits/error_008.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_008.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_008.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_009.php.expectf b/hphp/test/zend/good/zend-traits/error_009.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_009.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_009.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_010.php.expectf b/hphp/test/zend/good/zend-traits/error_010.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_010.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_010.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_011.php.expectf b/hphp/test/zend/good/zend-traits/error_011.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_011.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_011.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_012.php.expectf b/hphp/test/zend/good/zend-traits/error_012.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_012.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_012.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_013.php.expectf b/hphp/test/zend/good/zend-traits/error_013.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_013.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_013.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_014.php.expectf b/hphp/test/zend/good/zend-traits/error_014.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_014.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_014.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_015.php.expectf b/hphp/test/zend/good/zend-traits/error_015.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_015.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_015.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/error_016.php.expectf b/hphp/test/zend/good/zend-traits/error_016.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/error_016.php.expectf +++ b/hphp/test/zend/good/zend-traits/error_016.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/inheritance003.php.expectf b/hphp/test/zend/good/zend-traits/inheritance003.php.expectf index 949201534..dd3b7bdb2 100644 --- a/hphp/test/zend/good/zend-traits/inheritance003.php.expectf +++ b/hphp/test/zend/good/zend-traits/inheritance003.php.expectf @@ -1,2 +1,2 @@ World! -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/interface_002.php.expectf b/hphp/test/zend/good/zend-traits/interface_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/interface_002.php.expectf +++ b/hphp/test/zend/good/zend-traits/interface_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language008a.php.expectf b/hphp/test/zend/good/zend-traits/language008a.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language008a.php.expectf +++ b/hphp/test/zend/good/zend-traits/language008a.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language010.php.expectf b/hphp/test/zend/good/zend-traits/language010.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language010.php.expectf +++ b/hphp/test/zend/good/zend-traits/language010.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language011.php.expectf b/hphp/test/zend/good/zend-traits/language011.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language011.php.expectf +++ b/hphp/test/zend/good/zend-traits/language011.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language014.php.expectf b/hphp/test/zend/good/zend-traits/language014.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language014.php.expectf +++ b/hphp/test/zend/good/zend-traits/language014.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language015.php.expectf b/hphp/test/zend/good/zend-traits/language015.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language015.php.expectf +++ b/hphp/test/zend/good/zend-traits/language015.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language016.php.expectf b/hphp/test/zend/good/zend-traits/language016.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language016.php.expectf +++ b/hphp/test/zend/good/zend-traits/language016.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/language018.php.expectf b/hphp/test/zend/good/zend-traits/language018.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/language018.php.expectf +++ b/hphp/test/zend/good/zend-traits/language018.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/methods_002.php.expectf b/hphp/test/zend/good/zend-traits/methods_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend-traits/methods_002.php.expectf +++ b/hphp/test/zend/good/zend-traits/methods_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/property003.php.expectf b/hphp/test/zend/good/zend-traits/property003.php.expectf index 9dac2ebd6..bbd525224 100644 --- a/hphp/test/zend/good/zend-traits/property003.php.expectf +++ b/hphp/test/zend/good/zend-traits/property003.php.expectf @@ -1,2 +1,2 @@ PRE-CLASS-GUARD -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend-traits/property004.php.expectf b/hphp/test/zend/good/zend-traits/property004.php.expectf index 9dac2ebd6..bbd525224 100644 --- a/hphp/test/zend/good/zend-traits/property004.php.expectf +++ b/hphp/test/zend/good/zend-traits/property004.php.expectf @@ -1,2 +1,2 @@ PRE-CLASS-GUARD -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/004.php.expectf b/hphp/test/zend/good/zend/004.php.expectf index c3439a682..1aff6f2e0 100644 --- a/hphp/test/zend/good/zend/004.php.expectf +++ b/hphp/test/zend/good/zend/004.php.expectf @@ -1,7 +1,7 @@ -HipHop Warning: %a +HipHop Warning: %s NULL int(0) -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) int(0) diff --git a/hphp/test/zend/good/zend/005.php.expectf b/hphp/test/zend/good/zend/005.php.expectf index 3a6b119f6..159e6faf4 100644 --- a/hphp/test/zend/good/zend/005.php.expectf +++ b/hphp/test/zend/good/zend/005.php.expectf @@ -1,4 +1,4 @@ -HipHop Warning: %a +HipHop Warning: %s NULL int(0) int(-3) diff --git a/hphp/test/zend/good/zend/006.php.expectf b/hphp/test/zend/good/zend/006.php.expectf index a6f75fa2e..ec1c4ccea 100644 --- a/hphp/test/zend/good/zend/006.php.expectf +++ b/hphp/test/zend/good/zend/006.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) int(0) int(-3) diff --git a/hphp/test/zend/good/zend/007.php.expectf b/hphp/test/zend/good/zend/007.php.expectf index 94f73ee49..1cd71f2de 100644 --- a/hphp/test/zend/good/zend/007.php.expectf +++ b/hphp/test/zend/good/zend/007.php.expectf @@ -1,8 +1,8 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL array(4) { [1]=> diff --git a/hphp/test/zend/good/zend/011.php.expectf b/hphp/test/zend/good/zend/011.php.expectf index 50f458511..0d8d6e497 100644 --- a/hphp/test/zend/good/zend/011.php.expectf +++ b/hphp/test/zend/good/zend/011.php.expectf @@ -1,6 +1,6 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) bool(true) @@ -15,11 +15,11 @@ bool(true) bool(true) bool(false) bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s NULL bool(true) bool(true) diff --git a/hphp/test/zend/good/zend/020.php.expectf b/hphp/test/zend/good/zend/020.php.expectf index 2b85b487d..1213f412e 100644 --- a/hphp/test/zend/good/zend/020.php.expectf +++ b/hphp/test/zend/good/zend/020.php.expectf @@ -1,9 +1,9 @@ -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) -HipHop Warning: %a +HipHop Warning: %s NULL -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/028.php.expectf b/hphp/test/zend/good/zend/028.php.expectf index 36def5772..1e7c2dec2 100644 --- a/hphp/test/zend/good/zend/028.php.expectf +++ b/hphp/test/zend/good/zend/028.php.expectf @@ -1,5 +1,5 @@ bool(true) bool(true) bool(true) -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/036.php.expectf b/hphp/test/zend/good/zend/036.php.expectf index 55529a618..faef6b49b 100644 --- a/hphp/test/zend/good/zend/036.php.expectf +++ b/hphp/test/zend/good/zend/036.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/037.php.expectf b/hphp/test/zend/good/zend/037.php.expectf index 4b24928f0..7198bbf0a 100644 --- a/hphp/test/zend/good/zend/037.php.expectf +++ b/hphp/test/zend/good/zend/037.php.expectf @@ -1,2 +1,2 @@ int(1) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/038.php.expectf b/hphp/test/zend/good/zend/038.php.expectf index a08a35322..b97a6e08d 100644 --- a/hphp/test/zend/good/zend/038.php.expectf +++ b/hphp/test/zend/good/zend/038.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s array(0) { } \ No newline at end of file diff --git a/hphp/test/zend/good/zend/access_modifiers_002.php.expectf b/hphp/test/zend/good/zend/access_modifiers_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/access_modifiers_002.php.expectf +++ b/hphp/test/zend/good/zend/access_modifiers_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/access_modifiers_004.php.expectf b/hphp/test/zend/good/zend/access_modifiers_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/access_modifiers_004.php.expectf +++ b/hphp/test/zend/good/zend/access_modifiers_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/access_modifiers_007.php.expectf b/hphp/test/zend/good/zend/access_modifiers_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/access_modifiers_007.php.expectf +++ b/hphp/test/zend/good/zend/access_modifiers_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/access_modifiers_010.php.expectf b/hphp/test/zend/good/zend/access_modifiers_010.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/access_modifiers_010.php.expectf +++ b/hphp/test/zend/good/zend/access_modifiers_010.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/add_004.php.expectf b/hphp/test/zend/good/zend/add_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/add_004.php.expectf +++ b/hphp/test/zend/good/zend/add_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/add_007.php.expectf b/hphp/test/zend/good/zend/add_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/add_007.php.expectf +++ b/hphp/test/zend/good/zend/add_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/argument_restriction_005.php.expectf b/hphp/test/zend/good/zend/argument_restriction_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/argument_restriction_005.php.expectf +++ b/hphp/test/zend/good/zend/argument_restriction_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/array_type_hint_001.php b/hphp/test/zend/good/zend/array_type_hint_001.php similarity index 100% rename from hphp/test/zend/bad/zend/array_type_hint_001.php rename to hphp/test/zend/good/zend/array_type_hint_001.php diff --git a/hphp/test/zend/good/zend/array_type_hint_001.php.expectf b/hphp/test/zend/good/zend/array_type_hint_001.php.expectf new file mode 100644 index 000000000..eeb22d5d6 --- /dev/null +++ b/hphp/test/zend/good/zend/array_type_hint_001.php.expectf @@ -0,0 +1,2 @@ +3 +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug18556.php b/hphp/test/zend/good/zend/bug18556.php new file mode 100644 index 000000000..1ef45d4e6 --- /dev/null +++ b/hphp/test/zend/good/zend/bug18556.php @@ -0,0 +1,28 @@ +foo = "Foo"; + } +} + +echo "Instantiating an infoBlob with a lowercase i\n"; +$foobar = new infoBlob(); +echo $foobar->foo; +echo "\nInstantiating an InfoBlob with an uppercase I\n"; +$foobar = new InfoBlob(); +echo $foobar->foo; +echo "\n"; +setlocale(LC_ALL, "tr_TR.utf8"); +foreach(get_declared_classes() as $class) +{ + if(!class_exists($class)) + echo "$class No Longer Exists!\n"; + +} +echo "Done.\n"; +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug18556.php.expectf b/hphp/test/zend/good/zend/bug18556.php.expectf new file mode 100644 index 000000000..9dc669774 --- /dev/null +++ b/hphp/test/zend/good/zend/bug18556.php.expectf @@ -0,0 +1,5 @@ +Instantiating an infoBlob with a lowercase i +Foo +Instantiating an InfoBlob with an uppercase I +Foo +Done. \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug24773.php.expectf b/hphp/test/zend/good/zend/bug24773.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug24773.php.expectf +++ b/hphp/test/zend/good/zend/bug24773.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug29015.php.expectf b/hphp/test/zend/good/zend/bug29015.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug29015.php.expectf +++ b/hphp/test/zend/good/zend/bug29015.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug29674.php.expectf b/hphp/test/zend/good/zend/bug29674.php.expectf index e7421a3fc..83dd5421b 100644 --- a/hphp/test/zend/good/zend/bug29674.php.expectf +++ b/hphp/test/zend/good/zend/bug29674.php.expectf @@ -1,7 +1,7 @@ ===BASE=== string(4) "Base" -HipHop Notice: %a +HipHop Notice: %s NULL ===CHILD=== string(4) "Base" -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug30162.php.expectf b/hphp/test/zend/good/zend/bug30162.php.expectf index 36c59eabf..d6579f538 100644 --- a/hphp/test/zend/good/zend/bug30162.php.expectf +++ b/hphp/test/zend/good/zend/bug30162.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a +HipHop Notice: %s NULL object(hariCow)#%d (2) { ["x"]=> diff --git a/hphp/test/zend/good/zend/bug30519.php.expectf b/hphp/test/zend/good/zend/bug30519.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug30519.php.expectf +++ b/hphp/test/zend/good/zend/bug30519.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug30922.php.expectf b/hphp/test/zend/good/zend/bug30922.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug30922.php.expectf +++ b/hphp/test/zend/good/zend/bug30922.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug31102.php.expectf b/hphp/test/zend/good/zend/bug31102.php.expectf index 439ec2790..8a76831ad 100644 --- a/hphp/test/zend/good/zend/bug31102.php.expectf +++ b/hphp/test/zend/good/zend/bug31102.php.expectf @@ -3,4 +3,4 @@ Caught: Test1::__construct __autoload(Test2,2) Caught: __autoload __autoload(Test3,3) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug31720.php.expectf b/hphp/test/zend/good/zend/bug31720.php.expectf index d4a40834b..bdf408019 100644 --- a/hphp/test/zend/good/zend/bug31720.php.expectf +++ b/hphp/test/zend/good/zend/bug31720.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s ===DONE=== \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug33318.php.expectf b/hphp/test/zend/good/zend/bug33318.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug33318.php.expectf +++ b/hphp/test/zend/good/zend/bug33318.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug39003.php.expectf b/hphp/test/zend/good/zend/bug39003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug39003.php.expectf +++ b/hphp/test/zend/good/zend/bug39003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41026.php.expectf b/hphp/test/zend/good/zend/bug41026.php.expectf index d2532d524..bd282071e 100644 --- a/hphp/test/zend/good/zend/bug41026.php.expectf +++ b/hphp/test/zend/good/zend/bug41026.php.expectf @@ -1,2 +1,2 @@ Done -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41117_1.php.expectf b/hphp/test/zend/good/zend/bug41117_1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41117_1.php.expectf +++ b/hphp/test/zend/good/zend/bug41117_1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41351.php.expectf b/hphp/test/zend/good/zend/bug41351.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41351.php.expectf +++ b/hphp/test/zend/good/zend/bug41351.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41351_2.php.expectf b/hphp/test/zend/good/zend/bug41351_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41351_2.php.expectf +++ b/hphp/test/zend/good/zend/bug41351_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41351_3.php.expectf b/hphp/test/zend/good/zend/bug41351_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41351_3.php.expectf +++ b/hphp/test/zend/good/zend/bug41351_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41633_2.php.expectf b/hphp/test/zend/good/zend/bug41633_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41633_2.php.expectf +++ b/hphp/test/zend/good/zend/bug41633_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41813.php.expectf b/hphp/test/zend/good/zend/bug41813.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41813.php.expectf +++ b/hphp/test/zend/good/zend/bug41813.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug41919.php.expectf b/hphp/test/zend/good/zend/bug41919.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug41919.php.expectf +++ b/hphp/test/zend/good/zend/bug41919.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug42802.php b/hphp/test/zend/good/zend/bug42802.php similarity index 100% rename from hphp/test/zend/bad/zend/bug42802.php rename to hphp/test/zend/good/zend/bug42802.php diff --git a/hphp/test/zend/good/zend/bug42802.php.expectf b/hphp/test/zend/good/zend/bug42802.php.expectf new file mode 100644 index 000000000..e2156c53c --- /dev/null +++ b/hphp/test/zend/good/zend/bug42802.php.expectf @@ -0,0 +1,5 @@ +ok +ok +ok +ok +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug42817.php.expectf b/hphp/test/zend/good/zend/bug42817.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug42817.php.expectf +++ b/hphp/test/zend/good/zend/bug42817.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug42818.php.expectf b/hphp/test/zend/good/zend/bug42818.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug42818.php.expectf +++ b/hphp/test/zend/good/zend/bug42818.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug42819.php.expectf b/hphp/test/zend/good/zend/bug42819.php.expectf index 8bd9d9b96..c0d0c33b2 100644 --- a/hphp/test/zend/good/zend/bug42819.php.expectf +++ b/hphp/test/zend/good/zend/bug42819.php.expectf @@ -154,4 +154,4 @@ Array ( [1] => 1 ) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug42820.php b/hphp/test/zend/good/zend/bug42820.php similarity index 100% rename from hphp/test/zend/bad/zend/bug42820.php rename to hphp/test/zend/good/zend/bug42820.php diff --git a/hphp/test/zend/bad/zend/bug42820.php.expectf b/hphp/test/zend/good/zend/bug42820.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/bug42820.php.expectf rename to hphp/test/zend/good/zend/bug42820.php.expectf diff --git a/hphp/test/zend/good/zend/bug42859.php.expectf b/hphp/test/zend/good/zend/bug42859.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug42859.php.expectf +++ b/hphp/test/zend/good/zend/bug42859.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug42937.php.expectf b/hphp/test/zend/good/zend/bug42937.php.expectf index be1359d3a..073366caa 100644 --- a/hphp/test/zend/good/zend/bug42937.php.expectf +++ b/hphp/test/zend/good/zend/bug42937.php.expectf @@ -4,4 +4,4 @@ test2 test3 test4 test5 -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43323.php.expectf b/hphp/test/zend/good/zend/bug43323.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43323.php.expectf +++ b/hphp/test/zend/good/zend/bug43323.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43332_1.php.expectf b/hphp/test/zend/good/zend/bug43332_1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43332_1.php.expectf +++ b/hphp/test/zend/good/zend/bug43332_1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43332_2.php.expectf b/hphp/test/zend/good/zend/bug43332_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43332_2.php.expectf +++ b/hphp/test/zend/good/zend/bug43332_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_1.php.expectf b/hphp/test/zend/good/zend/bug43344_1.php.expectf index 3d76e8d71..30aafeecf 100644 --- a/hphp/test/zend/good/zend/bug43344_1.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_1.php.expectf @@ -1,8 +1,8 @@ -HipHop Notice: %a +HipHop Notice: %s bar -HipHop Notice: %a +HipHop Notice: %s bar -HipHop Notice: %a +HipHop Notice: %s bar -HipHop Notice: %a +HipHop Notice: %s bar \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_10.php.expectf b/hphp/test/zend/good/zend/bug43344_10.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_10.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_10.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_11.php.expectf b/hphp/test/zend/good/zend/bug43344_11.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_11.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_11.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_12.php.expectf b/hphp/test/zend/good/zend/bug43344_12.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_12.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_12.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_13.php.expectf b/hphp/test/zend/good/zend/bug43344_13.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_13.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_13.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_2.php.expectf b/hphp/test/zend/good/zend/bug43344_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_2.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_3.php.expectf b/hphp/test/zend/good/zend/bug43344_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_3.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_4.php.expectf b/hphp/test/zend/good/zend/bug43344_4.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_4.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_4.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_5.php.expectf b/hphp/test/zend/good/zend/bug43344_5.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_5.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_5.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_6.php.expectf b/hphp/test/zend/good/zend/bug43344_6.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_6.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_6.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_7.php.expectf b/hphp/test/zend/good/zend/bug43344_7.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_7.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_7.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_8.php.expectf b/hphp/test/zend/good/zend/bug43344_8.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_8.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_8.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug43344_9.php.expectf b/hphp/test/zend/good/zend/bug43344_9.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug43344_9.php.expectf +++ b/hphp/test/zend/good/zend/bug43344_9.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug43651.php b/hphp/test/zend/good/zend/bug43651.php similarity index 100% rename from hphp/test/zend/bad/zend/bug43651.php rename to hphp/test/zend/good/zend/bug43651.php diff --git a/hphp/test/zend/bad/zend/bug43651.php.expectf b/hphp/test/zend/good/zend/bug43651.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/bug43651.php.expectf rename to hphp/test/zend/good/zend/bug43651.php.expectf diff --git a/hphp/test/zend/good/zend/bug44141.php.expectf b/hphp/test/zend/good/zend/bug44141.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug44141.php.expectf +++ b/hphp/test/zend/good/zend/bug44141.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug44414.php.expectf b/hphp/test/zend/good/zend/bug44414.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug44414.php.expectf +++ b/hphp/test/zend/good/zend/bug44414.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug45186.php.expectf b/hphp/test/zend/good/zend/bug45186.php.expectf index 7793bf3a4..cb49475b1 100644 --- a/hphp/test/zend/good/zend/bug45186.php.expectf +++ b/hphp/test/zend/good/zend/bug45186.php.expectf @@ -13,4 +13,4 @@ string(1) "y" ok __callstatic: string(3) "www" -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug45186_2.php.expectf b/hphp/test/zend/good/zend/bug45186_2.php.expectf index 353dfc9de..6af6cf1b6 100644 --- a/hphp/test/zend/good/zend/bug45186_2.php.expectf +++ b/hphp/test/zend/good/zend/bug45186_2.php.expectf @@ -11,5 +11,5 @@ string(1) "y" __call: string(1) "y" ok -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug46381.php.expectf b/hphp/test/zend/good/zend/bug46381.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug46381.php.expectf +++ b/hphp/test/zend/good/zend/bug46381.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug46665.php b/hphp/test/zend/good/zend/bug46665.php similarity index 100% rename from hphp/test/zend/bad/zend/bug46665.php rename to hphp/test/zend/good/zend/bug46665.php diff --git a/hphp/test/zend/bad/zend/bug46665.php.expectf b/hphp/test/zend/good/zend/bug46665.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/bug46665.php.expectf rename to hphp/test/zend/good/zend/bug46665.php.expectf diff --git a/hphp/test/zend/good/zend/bug46665_autoload.inc b/hphp/test/zend/good/zend/bug46665_autoload.inc new file mode 100644 index 000000000..092b27296 --- /dev/null +++ b/hphp/test/zend/good/zend/bug46665_autoload.inc @@ -0,0 +1,5 @@ + int(1) diff --git a/hphp/test/zend/good/zend/bug48215_2.php.expectf b/hphp/test/zend/good/zend/bug48215_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug48215_2.php.expectf +++ b/hphp/test/zend/good/zend/bug48215_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug48770_3.php.expectf b/hphp/test/zend/good/zend/bug48770_3.php.expectf index 88f7214c8..96bf79b19 100644 --- a/hphp/test/zend/good/zend/bug48770_3.php.expectf +++ b/hphp/test/zend/good/zend/bug48770_3.php.expectf @@ -1,3 +1,3 @@ %unicode|string%(27) "B::func2: This should work!" %unicode|string%(27) "B::func3: This should work!" -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/bug48912.php b/hphp/test/zend/good/zend/bug48912.php similarity index 100% rename from hphp/test/zend/bad/zend/bug48912.php rename to hphp/test/zend/good/zend/bug48912.php diff --git a/hphp/test/zend/bad/zend/bug48912.php.expectf b/hphp/test/zend/good/zend/bug48912.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/bug48912.php.expectf rename to hphp/test/zend/good/zend/bug48912.php.expectf diff --git a/hphp/test/zend/good/zend/bug49472.php.expectf b/hphp/test/zend/good/zend/bug49472.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug49472.php.expectf +++ b/hphp/test/zend/good/zend/bug49472.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug49866.php.expectf b/hphp/test/zend/good/zend/bug49866.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug49866.php.expectf +++ b/hphp/test/zend/good/zend/bug49866.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug51791.php.expectf b/hphp/test/zend/good/zend/bug51791.php.expectf index e0d8c719d..909755029 100644 --- a/hphp/test/zend/good/zend/bug51791.php.expectf +++ b/hphp/test/zend/good/zend/bug51791.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug51827.php.expectf b/hphp/test/zend/good/zend/bug51827.php.expectf index 041d80e43..43d96cb9b 100644 --- a/hphp/test/zend/good/zend/bug51827.php.expectf +++ b/hphp/test/zend/good/zend/bug51827.php.expectf @@ -1,2 +1,2 @@ int(1) -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug52001.php.expectf b/hphp/test/zend/good/zend/bug52001.php.expectf index 86db4b000..c25afe003 100644 --- a/hphp/test/zend/good/zend/bug52001.php.expectf +++ b/hphp/test/zend/good/zend/bug52001.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(1) \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug52484.php.expectf b/hphp/test/zend/good/zend/bug52484.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug52484.php.expectf +++ b/hphp/test/zend/good/zend/bug52484.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug52484_2.php.expectf b/hphp/test/zend/good/zend/bug52484_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug52484_2.php.expectf +++ b/hphp/test/zend/good/zend/bug52484_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug52484_3.php.expectf b/hphp/test/zend/good/zend/bug52484_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug52484_3.php.expectf +++ b/hphp/test/zend/good/zend/bug52484_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug52614.php.expectf b/hphp/test/zend/good/zend/bug52614.php.expectf index 97b6ac274..bb545042d 100644 --- a/hphp/test/zend/good/zend/bug52614.php.expectf +++ b/hphp/test/zend/good/zend/bug52614.php.expectf @@ -3,7 +3,7 @@ array(0) { } array(0) { } -HipHop Warning: %a +HipHop Warning: %s NULL object(stdClass)#%d (1) { ["a"]=> diff --git a/hphp/test/zend/good/zend/bug55007.php.expectf b/hphp/test/zend/good/zend/bug55007.php.expectf index 0ae61a8a0..4f7943ddb 100644 --- a/hphp/test/zend/good/zend/bug55007.php.expectf +++ b/hphp/test/zend/good/zend/bug55007.php.expectf @@ -1,2 +1,2 @@ -HipHop Fatal error: %a +HipHop Fatal error: %s My error handler runs. \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug60099.php.expectf b/hphp/test/zend/good/zend/bug60099.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug60099.php.expectf +++ b/hphp/test/zend/good/zend/bug60099.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug60611.php.expectf b/hphp/test/zend/good/zend/bug60611.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug60611.php.expectf +++ b/hphp/test/zend/good/zend/bug60611.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug60613.php.expectf b/hphp/test/zend/good/zend/bug60613.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug60613.php.expectf +++ b/hphp/test/zend/good/zend/bug60613.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug61273.php.expectf b/hphp/test/zend/good/zend/bug61273.php.expectf index 6d484dec4..702b668b3 100644 --- a/hphp/test/zend/good/zend/bug61273.php.expectf +++ b/hphp/test/zend/good/zend/bug61273.php.expectf @@ -1,2 +1,2 @@ -HipHop Warning: %a +HipHop Warning: %s okey \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug62991.php b/hphp/test/zend/good/zend/bug62991.php new file mode 100644 index 000000000..8eb7b4ecd --- /dev/null +++ b/hphp/test/zend/good/zend/bug62991.php @@ -0,0 +1,33 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug62991.php.expectf b/hphp/test/zend/good/zend/bug62991.php.expectf new file mode 100644 index 000000000..fb8d9002f --- /dev/null +++ b/hphp/test/zend/good/zend/bug62991.php.expectf @@ -0,0 +1,13 @@ +Array +( + [0] => 1 + [1] => 2 + [2] => 3 +) +Array +( + [0] => 1 + [1] => 2 + [2] => 3 +) +okey \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63173.php.expectf b/hphp/test/zend/good/zend/bug63173.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug63173.php.expectf +++ b/hphp/test/zend/good/zend/bug63173.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63219.php.expectf b/hphp/test/zend/good/zend/bug63219.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/bug63219.php.expectf +++ b/hphp/test/zend/good/zend/bug63219.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63462.php.expectf b/hphp/test/zend/good/zend/bug63462.php.expectf index 4b8576c19..6016cabf8 100644 --- a/hphp/test/zend/good/zend/bug63462.php.expectf +++ b/hphp/test/zend/good/zend/bug63462.php.expectf @@ -1,11 +1,11 @@ __get nonExisting -HipHop Notice: %a +HipHop Notice: %s __get publicProperty -HipHop Notice: %a +HipHop Notice: %s __get protectedProperty -HipHop Notice: %a +HipHop Notice: %s __get privateProperty -HipHop Notice: %a +HipHop Notice: %s __isset nonExisting __isset publicProperty __isset protectedProperty diff --git a/hphp/test/zend/good/zend/bug63741.php b/hphp/test/zend/good/zend/bug63741.php new file mode 100644 index 000000000..506ccb02c --- /dev/null +++ b/hphp/test/zend/good/zend/bug63741.php @@ -0,0 +1,42 @@ + +EOT +); + +include dirname(__FILE__)."/bug63741.tmp.php"; +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63741.php.expectf b/hphp/test/zend/good/zend/bug63741.php.expectf new file mode 100644 index 000000000..1894967d4 --- /dev/null +++ b/hphp/test/zend/good/zend/bug63741.php.expectf @@ -0,0 +1,2 @@ +autoloading... +OK! \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63976.php b/hphp/test/zend/good/zend/bug63976.php new file mode 100644 index 000000000..75edce3cf --- /dev/null +++ b/hphp/test/zend/good/zend/bug63976.php @@ -0,0 +1,15 @@ +table); +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug63976.php.expectf b/hphp/test/zend/good/zend/bug63976.php.expectf new file mode 100644 index 000000000..f64a23f41 --- /dev/null +++ b/hphp/test/zend/good/zend/bug63976.php.expectf @@ -0,0 +1 @@ +string(3) "foo" \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64135.php b/hphp/test/zend/good/zend/bug64135.php new file mode 100644 index 000000000..f9ade6eb1 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64135.php @@ -0,0 +1,12 @@ +undefined(); +} catch(Exception $e) { + echo "Exception is thrown"; +} \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64135.php.expectf b/hphp/test/zend/good/zend/bug64135.php.expectf new file mode 100644 index 000000000..1a0863c2d --- /dev/null +++ b/hphp/test/zend/good/zend/bug64135.php.expectf @@ -0,0 +1 @@ +Exception is thrown \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_2.php b/hphp/test/zend/good/zend/bug64239_2.php new file mode 100644 index 000000000..c3670ca56 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_2.php @@ -0,0 +1,30 @@ +backtrace(); } +} + +class B { + use T2 { t2method as Bmethod; } +} + +class C extends A { +} + +trait T1 { + protected function backtrace() { + $b = new B(); + $b->Bmethod(); + } +} +trait T2 { + public function t2method() { + print_r(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1)); + } +} +$a = new A(); +$a->test(); + +$c = new C(); +$c->test(); +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_2.php.expectf b/hphp/test/zend/good/zend/bug64239_2.php.expectf new file mode 100644 index 000000000..74e78e361 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_2.php.expectf @@ -0,0 +1,24 @@ +Array +( + [0] => Array + ( + [file] => %sbug64239_2.php + [line] => %d + [function] => Bmethod + [class] => B + [type] => -> + ) + +) +Array +( + [0] => Array + ( + [file] => %sbug64239_2.php + [line] => %d + [function] => Bmethod + [class] => B + [type] => -> + ) + +) \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_3.php b/hphp/test/zend/good/zend/bug64239_3.php new file mode 100644 index 000000000..8f2cc0aa2 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_3.php @@ -0,0 +1,25 @@ +Bmethod(); +$a->t2method(); + +$c = new C(); +$c->Bmethod(); +$c->t2method(); +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_3.php.expectf b/hphp/test/zend/good/zend/bug64239_3.php.expectf new file mode 100644 index 000000000..15abd4ad4 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_3.php.expectf @@ -0,0 +1,4 @@ +#0 A->Bmethod() called at [%sbug64239_3.php:%d] +#0 A->t2method() called at [%sbug64239_3.php:%d] +#0 C->Bmethod() called at [%sbug64239_3.php:%d] +#0 A->t2method() called at [%sbug64239_3.php:%d] \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_4.php b/hphp/test/zend/good/zend/bug64239_4.php new file mode 100644 index 000000000..826a4f35e --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_4.php @@ -0,0 +1,23 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64239_4.php.expectf b/hphp/test/zend/good/zend/bug64239_4.php.expectf new file mode 100644 index 000000000..96ab7d3c5 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64239_4.php.expectf @@ -0,0 +1,4 @@ +#0 A::Bmethod() called at [%sbug64239_4.php:%d] +#0 A::t2method() called at [%sbug64239_4.php:%d] +#0 C::Bmethod() called at [%sbug64239_4.php:%d] +#0 A::t2method() called at [%sbug64239_4.php:%d] \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64354.php b/hphp/test/zend/good/zend/bug64354.php new file mode 100644 index 000000000..62fb5d233 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64354.php @@ -0,0 +1,19 @@ +getMessage()); +} +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64354.php.expectf b/hphp/test/zend/good/zend/bug64354.php.expectf new file mode 100644 index 000000000..915b586c6 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64354.php.expectf @@ -0,0 +1 @@ +string(9) "serialize" \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64417.php b/hphp/test/zend/good/zend/bug64417.php new file mode 100644 index 000000000..4b97dd03e --- /dev/null +++ b/hphp/test/zend/good/zend/bug64417.php @@ -0,0 +1,33 @@ +container[] = $value; + } else { + $this->container[$offset] = $value; + } + } + public function offsetExists($offset) { + return isset($this->container[$offset]); + } + public function offsetUnset($offset) { + unset($this->container[$offset]); + } + public function &offsetGet($offset) { + $result = null; + if (isset($this->container[$offset])) { + $result = &$this->container[$offset]; + } + return $result; + } +} + +class obj implements ArrayAccess { + use aa; +} + +$o = new obj; +$o['x'] = 1; +++$o['x']; +echo $o['x'], "\n"; \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64417.php.expectf b/hphp/test/zend/good/zend/bug64417.php.expectf new file mode 100644 index 000000000..d8263ee98 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64417.php.expectf @@ -0,0 +1 @@ +2 \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64515.php b/hphp/test/zend/good/zend/bug64515.php new file mode 100644 index 000000000..4bf50ad29 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64515.php @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64515.php.expectf b/hphp/test/zend/good/zend/bug64515.php.expectf new file mode 100644 index 000000000..820394749 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64515.php.expectf @@ -0,0 +1 @@ +okey \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64555.php b/hphp/test/zend/good/zend/bug64555.php new file mode 100644 index 000000000..3e0304b85 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64555.php @@ -0,0 +1,28 @@ + $v) { + if ($k == 'unsetme') { + echo "Unsetting: $k\n"; + unset($a[$k]); + } else if ($k == 'keepme') { + echo "Changing: $k\n"; + $a[$k] = 42; + $a['keepme'] = 43; + } + } + + var_dump($a, array_keys($a)); + } +} + +$f = new Foo; +$f->test(); + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64555.php.expectf b/hphp/test/zend/good/zend/bug64555.php.expectf new file mode 100644 index 000000000..cf33f0bf9 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64555.php.expectf @@ -0,0 +1,10 @@ +Unsetting: unsetme +Changing: keepme +array(1) { + ["keepme"]=> + int(43) +} +array(1) { + [0]=> + string(6) "keepme" +} \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64677.php b/hphp/test/zend/good/zend/bug64677.php new file mode 100644 index 000000000..1700667a3 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64677.php @@ -0,0 +1,16 @@ +show_output('Files: ', trim(`cd .`)); // this gives invalid args to shell_exec +$cat->show_output('Files: ', `cd .`); // this causes a segmentation fault +$cat->show_output(`cd .`); // this causes a segmentation fault + +function show_outputa($prepend, $output) { + echo "Okey"; +} +show_outputa('Files: ', `cd .`); // this works as expected + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug64677.php.expectf b/hphp/test/zend/good/zend/bug64677.php.expectf new file mode 100644 index 000000000..1841c97c4 --- /dev/null +++ b/hphp/test/zend/good/zend/bug64677.php.expectf @@ -0,0 +1 @@ +Okey \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug65051.php b/hphp/test/zend/good/zend/bug65051.php new file mode 100644 index 000000000..4d3d9299a --- /dev/null +++ b/hphp/test/zend/good/zend/bug65051.php @@ -0,0 +1,16 @@ +array[0])); + var_dump($this->array[0]); + } +} + +$array = [[new Foo]]; +$array[0][0]->array =& $array; +unset($array[0][0]); + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/bug65051.php.expectf b/hphp/test/zend/good/zend/bug65051.php.expectf new file mode 100644 index 000000000..fd0f4c7dc --- /dev/null +++ b/hphp/test/zend/good/zend/bug65051.php.expectf @@ -0,0 +1,3 @@ +int(0) +array(0) { +} \ No newline at end of file diff --git a/hphp/test/zend/good/zend/call_static_004.php.expectf b/hphp/test/zend/good/zend/call_static_004.php.expectf index 9891d95e6..3e4896416 100644 --- a/hphp/test/zend/good/zend/call_static_004.php.expectf +++ b/hphp/test/zend/good/zend/call_static_004.php.expectf @@ -1,2 +1,2 @@ string(3) "AaA" -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/call_static_005.php.expectf b/hphp/test/zend/good/zend/call_static_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/call_static_005.php.expectf +++ b/hphp/test/zend/good/zend/call_static_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/call_user_func_001.php.expectf b/hphp/test/zend/good/zend/call_user_func_001.php.expectf index ed51fbc35..7a998584f 100644 --- a/hphp/test/zend/good/zend/call_user_func_001.php.expectf +++ b/hphp/test/zend/good/zend/call_user_func_001.php.expectf @@ -1,3 +1,3 @@ %string|unicode%(6) "foobar" -HipHop Warning: %a -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/cast_to_int.php.expectf b/hphp/test/zend/good/zend/cast_to_int.php.expectf index 9344b1a5f..08929415b 100644 --- a/hphp/test/zend/good/zend/cast_to_int.php.expectf +++ b/hphp/test/zend/good/zend/cast_to_int.php.expectf @@ -10,6 +10,6 @@ int(0) int(1) int(0) int(%d) -HipHop Notice: %a +HipHop Notice: %s int(1) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_002.php.expectf b/hphp/test/zend/good/zend/class_alias_002.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/zend/class_alias_002.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_002.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_004.php.expectf b/hphp/test/zend/good/zend/class_alias_004.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/zend/class_alias_004.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_004.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_008.php.expectf b/hphp/test/zend/good/zend/class_alias_008.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/class_alias_008.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_008.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_010.php.expectf b/hphp/test/zend/good/zend/class_alias_010.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/zend/class_alias_010.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_010.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/class_alias_014.php b/hphp/test/zend/good/zend/class_alias_014.php similarity index 100% rename from hphp/test/zend/bad/zend/class_alias_014.php rename to hphp/test/zend/good/zend/class_alias_014.php diff --git a/hphp/test/zend/good/zend/class_alias_014.php.expectf b/hphp/test/zend/good/zend/class_alias_014.php.expectf new file mode 100644 index 000000000..fc6847bfe --- /dev/null +++ b/hphp/test/zend/good/zend/class_alias_014.php.expectf @@ -0,0 +1 @@ +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_016.php.expectf b/hphp/test/zend/good/zend/class_alias_016.php.expectf index 4d2e85474..d79215727 100644 --- a/hphp/test/zend/good/zend/class_alias_016.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_016.php.expectf @@ -1,3 +1,3 @@ object(foo\bar)#%d (0) { } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_019.php.expectf b/hphp/test/zend/good/zend/class_alias_019.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/zend/class_alias_019.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_019.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_alias_020.php.expectf b/hphp/test/zend/good/zend/class_alias_020.php.expectf index 99e88b46f..a36111b82 100644 --- a/hphp/test/zend/good/zend/class_alias_020.php.expectf +++ b/hphp/test/zend/good/zend/class_alias_020.php.expectf @@ -2,4 +2,4 @@ object(foo\foo)#1 (0) { } object(foo\bar\foo)#2 (0) { } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_constants_001.php.expectf b/hphp/test/zend/good/zend/class_constants_001.php.expectf index 9a2e36f4d..d25f6af5e 100644 --- a/hphp/test/zend/good/zend/class_constants_001.php.expectf +++ b/hphp/test/zend/good/zend/class_constants_001.php.expectf @@ -1,3 +1,3 @@ string(6) "string" int(1) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_constants_002.php.expectf b/hphp/test/zend/good/zend/class_constants_002.php.expectf index 8cd2350fe..de7d44c40 100644 --- a/hphp/test/zend/good/zend/class_constants_002.php.expectf +++ b/hphp/test/zend/good/zend/class_constants_002.php.expectf @@ -1,4 +1,4 @@ int(1) int(5) int(10) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php new file mode 100644 index 000000000..0b51c59ce --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_001.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php new file mode 100644 index 000000000..35ba1f3c7 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_002.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php new file mode 100644 index 000000000..50c0319f7 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_003.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php new file mode 100644 index 000000000..efe508725 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_004.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php new file mode 100644 index 000000000..0ad88bafd --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_005.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php b/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php new file mode 100644 index 000000000..b770ee120 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php.expectf b/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/class_name_as_scalar_error_006.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/clone_001.php.expectf b/hphp/test/zend/good/zend/clone_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/clone_001.php.expectf +++ b/hphp/test/zend/good/zend/clone_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/clone_003.php.expectf b/hphp/test/zend/good/zend/clone_003.php.expectf index aaaa48bec..07eb98c70 100644 --- a/hphp/test/zend/good/zend/clone_003.php.expectf +++ b/hphp/test/zend/good/zend/clone_003.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/clone_004.php.expectf b/hphp/test/zend/good/zend/clone_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/clone_004.php.expectf +++ b/hphp/test/zend/good/zend/clone_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/closure_012.php.expectf b/hphp/test/zend/good/zend/closure_012.php.expectf index 22612d320..2fc5b76b4 100644 --- a/hphp/test/zend/good/zend/closure_012.php.expectf +++ b/hphp/test/zend/good/zend/closure_012.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s NULL int(2) \ No newline at end of file diff --git a/hphp/test/zend/good/zend/closure_019.php.expectf b/hphp/test/zend/good/zend/closure_019.php.expectf index db4645990..7e58d35d5 100644 --- a/hphp/test/zend/good/zend/closure_019.php.expectf +++ b/hphp/test/zend/good/zend/closure_019.php.expectf @@ -1,3 +1,3 @@ int(9) int(81) -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/closure_022.php.expectf b/hphp/test/zend/good/zend/closure_022.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/closure_022.php.expectf +++ b/hphp/test/zend/good/zend/closure_022.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_027.php b/hphp/test/zend/good/zend/closure_027.php similarity index 100% rename from hphp/test/zend/bad/zend/closure_027.php rename to hphp/test/zend/good/zend/closure_027.php diff --git a/hphp/test/zend/good/zend/closure_027.php.expectf b/hphp/test/zend/good/zend/closure_027.php.expectf new file mode 100644 index 000000000..edbf181ce --- /dev/null +++ b/hphp/test/zend/good/zend/closure_027.php.expectf @@ -0,0 +1,7 @@ +object(stdClass)#%d (0) { +} +NULL +HipHop Notice: %s +HipHop Warning: %s +NULL +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/closure_033.php b/hphp/test/zend/good/zend/closure_033.php similarity index 100% rename from hphp/test/zend/bad/zend/closure_033.php rename to hphp/test/zend/good/zend/closure_033.php diff --git a/hphp/test/zend/good/zend/closure_033.php.expectf b/hphp/test/zend/good/zend/closure_033.php.expectf new file mode 100644 index 000000000..595e8d7ef --- /dev/null +++ b/hphp/test/zend/good/zend/closure_033.php.expectf @@ -0,0 +1,2 @@ +Test::{closure}() +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/const_dereference_001.php b/hphp/test/zend/good/zend/const_dereference_001.php new file mode 100644 index 000000000..7438b5ab8 --- /dev/null +++ b/hphp/test/zend/good/zend/const_dereference_001.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/const_dereference_001.php.expectf b/hphp/test/zend/good/zend/const_dereference_001.php.expectf new file mode 100644 index 000000000..1da699412 --- /dev/null +++ b/hphp/test/zend/good/zend/const_dereference_001.php.expectf @@ -0,0 +1,5 @@ +int(4) +HipHop Notice: %s +NULL +int(6) +123 \ No newline at end of file diff --git a/hphp/test/zend/good/zend/const_dereference_003.php b/hphp/test/zend/good/zend/const_dereference_003.php new file mode 100644 index 000000000..1e2a4ea46 --- /dev/null +++ b/hphp/test/zend/good/zend/const_dereference_003.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/const_dereference_003.php.expectf b/hphp/test/zend/good/zend/const_dereference_003.php.expectf new file mode 100644 index 000000000..1da699412 --- /dev/null +++ b/hphp/test/zend/good/zend/const_dereference_003.php.expectf @@ -0,0 +1,5 @@ +int(4) +HipHop Notice: %s +NULL +int(6) +123 \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/constants_003.php b/hphp/test/zend/good/zend/constants_003.php similarity index 100% rename from hphp/test/zend/bad/zend/constants_003.php rename to hphp/test/zend/good/zend/constants_003.php diff --git a/hphp/test/zend/bad/zend/constants_003.php.expectf b/hphp/test/zend/good/zend/constants_003.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/constants_003.php.expectf rename to hphp/test/zend/good/zend/constants_003.php.expectf diff --git a/hphp/test/zend/good/zend/constants_005.php.expectf b/hphp/test/zend/good/zend/constants_005.php.expectf index a04f6676d..7866da1d6 100644 --- a/hphp/test/zend/good/zend/constants_005.php.expectf +++ b/hphp/test/zend/good/zend/constants_005.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a +HipHop Notice: %s string(16) "ZEND_THREAD_safe" int(123) \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/constants_009.php b/hphp/test/zend/good/zend/constants_009.php similarity index 100% rename from hphp/test/zend/bad/zend/constants_009.php rename to hphp/test/zend/good/zend/constants_009.php diff --git a/hphp/test/zend/bad/zend/constants_009.php.expectf b/hphp/test/zend/good/zend/constants_009.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/constants_009.php.expectf rename to hphp/test/zend/good/zend/constants_009.php.expectf diff --git a/hphp/test/zend/bad/zend/debug_print_backtrace_limit.php b/hphp/test/zend/good/zend/debug_print_backtrace_limit.php similarity index 100% rename from hphp/test/zend/bad/zend/debug_print_backtrace_limit.php rename to hphp/test/zend/good/zend/debug_print_backtrace_limit.php diff --git a/hphp/test/zend/bad/zend/debug_print_backtrace_limit.php.expectf b/hphp/test/zend/good/zend/debug_print_backtrace_limit.php.expectf similarity index 100% rename from hphp/test/zend/bad/zend/debug_print_backtrace_limit.php.expectf rename to hphp/test/zend/good/zend/debug_print_backtrace_limit.php.expectf diff --git a/hphp/test/zend/good/zend/dereference_001.php.expectf b/hphp/test/zend/good/zend/dereference_001.php.expectf index 47b111f11..465bce5f4 100644 --- a/hphp/test/zend/good/zend/dereference_001.php.expectf +++ b/hphp/test/zend/good/zend/dereference_001.php.expectf @@ -1,5 +1,5 @@ int(5) -HipHop Notice: %a +HipHop Notice: %s NULL int(1) string(1) "b" diff --git a/hphp/test/zend/good/zend/dereference_013.php.expectf b/hphp/test/zend/good/zend/dereference_013.php.expectf index 63f40164e..243e2933c 100644 --- a/hphp/test/zend/good/zend/dereference_013.php.expectf +++ b/hphp/test/zend/good/zend/dereference_013.php.expectf @@ -3,5 +3,5 @@ array(1) { [0]=> int(1) } -HipHop Notice: %a +HipHop Notice: %s NULL \ No newline at end of file diff --git a/hphp/test/zend/good/zend/div_002.php.expectf b/hphp/test/zend/good/zend/div_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/div_002.php.expectf +++ b/hphp/test/zend/good/zend/div_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/dynamic_call_002.php.expectf b/hphp/test/zend/good/zend/dynamic_call_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/dynamic_call_002.php.expectf +++ b/hphp/test/zend/good/zend/dynamic_call_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/dynamic_call_003.php.expectf b/hphp/test/zend/good/zend/dynamic_call_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/dynamic_call_003.php.expectf +++ b/hphp/test/zend/good/zend/dynamic_call_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/dynamic_call_004.php.expectf b/hphp/test/zend/good/zend/dynamic_call_004.php.expectf index aaaa48bec..07eb98c70 100644 --- a/hphp/test/zend/good/zend/dynamic_call_004.php.expectf +++ b/hphp/test/zend/good/zend/dynamic_call_004.php.expectf @@ -1,2 +1,2 @@ -HipHop Notice: %a -HipHop Fatal error: %a \ No newline at end of file +HipHop Notice: %s +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/each_001.php.expectf b/hphp/test/zend/good/zend/each_001.php.expectf index cfb6a8593..fc6847bfe 100644 --- a/hphp/test/zend/good/zend/each_001.php.expectf +++ b/hphp/test/zend/good/zend/each_001.php.expectf @@ -1 +1 @@ -HipHop Warning: %a \ No newline at end of file +HipHop Warning: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_001.php.expectf b/hphp/test/zend/good/zend/errmsg_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_001.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_002.php.expectf b/hphp/test/zend/good/zend/errmsg_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_002.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_003.php.expectf b/hphp/test/zend/good/zend/errmsg_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_003.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_004.php.expectf b/hphp/test/zend/good/zend/errmsg_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_004.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_005.php.expectf b/hphp/test/zend/good/zend/errmsg_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_005.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_006.php.expectf b/hphp/test/zend/good/zend/errmsg_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_006.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_007.php.expectf b/hphp/test/zend/good/zend/errmsg_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_007.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_008.php.expectf b/hphp/test/zend/good/zend/errmsg_008.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_008.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_008.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_011.php.expectf b/hphp/test/zend/good/zend/errmsg_011.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_011.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_011.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_013.php.expectf b/hphp/test/zend/good/zend/errmsg_013.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_013.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_013.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_016.php.expectf b/hphp/test/zend/good/zend/errmsg_016.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_016.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_016.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_017.php.expectf b/hphp/test/zend/good/zend/errmsg_017.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_017.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_017.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_022.php.expectf b/hphp/test/zend/good/zend/errmsg_022.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_022.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_022.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_023.php.expectf b/hphp/test/zend/good/zend/errmsg_023.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_023.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_023.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_025.php.expectf b/hphp/test/zend/good/zend/errmsg_025.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_025.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_025.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_026.php.expectf b/hphp/test/zend/good/zend/errmsg_026.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_026.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_026.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_028.php.expectf b/hphp/test/zend/good/zend/errmsg_028.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_028.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_028.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_029.php.expectf b/hphp/test/zend/good/zend/errmsg_029.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_029.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_029.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_030.php.expectf b/hphp/test/zend/good/zend/errmsg_030.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_030.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_030.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_031.php.expectf b/hphp/test/zend/good/zend/errmsg_031.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_031.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_031.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_032.php.expectf b/hphp/test/zend/good/zend/errmsg_032.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_032.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_032.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_035.php.expectf b/hphp/test/zend/good/zend/errmsg_035.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_035.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_035.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_036.php.expectf b/hphp/test/zend/good/zend/errmsg_036.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_036.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_036.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_037.php.expectf b/hphp/test/zend/good/zend/errmsg_037.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_037.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_037.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_038.php.expectf b/hphp/test/zend/good/zend/errmsg_038.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_038.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_038.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_039.php.expectf b/hphp/test/zend/good/zend/errmsg_039.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_039.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_039.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_040.php.expectf b/hphp/test/zend/good/zend/errmsg_040.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_040.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_040.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_042.php.expectf b/hphp/test/zend/good/zend/errmsg_042.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_042.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_042.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/errmsg_044.php.expectf b/hphp/test/zend/good/zend/errmsg_044.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/errmsg_044.php.expectf +++ b/hphp/test/zend/good/zend/errmsg_044.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/error_reporting04.php.expectf b/hphp/test/zend/good/zend/error_reporting04.php.expectf index 44a9b498d..1f2ebac21 100644 --- a/hphp/test/zend/good/zend/error_reporting04.php.expectf +++ b/hphp/test/zend/good/zend/error_reporting04.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a +HipHop Notice: %s int(32767) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/error_reporting09.php.expectf b/hphp/test/zend/good/zend/error_reporting09.php.expectf index 2d23d9e24..ccb416b9b 100644 --- a/hphp/test/zend/good/zend/error_reporting09.php.expectf +++ b/hphp/test/zend/good/zend/error_reporting09.php.expectf @@ -1,4 +1,4 @@ -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(32767) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/exception_004.php.expectf b/hphp/test/zend/good/zend/exception_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/exception_004.php.expectf +++ b/hphp/test/zend/good/zend/exception_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/exception_005.php.expectf b/hphp/test/zend/good/zend/exception_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/exception_005.php.expectf +++ b/hphp/test/zend/good/zend/exception_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/exception_006.php.expectf b/hphp/test/zend/good/zend/exception_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/exception_006.php.expectf +++ b/hphp/test/zend/good/zend/exception_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_list_003.php b/hphp/test/zend/good/zend/foreach_list_003.php new file mode 100644 index 000000000..d2992c821 --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_list_003.php @@ -0,0 +1,8 @@ + list(list(), $a)) { +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_list_003.php.expectf b/hphp/test/zend/good/zend/foreach_list_003.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_list_003.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_list_004.php b/hphp/test/zend/good/zend/foreach_list_004.php new file mode 100644 index 000000000..be0bf0859 --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_list_004.php @@ -0,0 +1,8 @@ + list()) { +} + +?> \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_list_004.php.expectf b/hphp/test/zend/good/zend/foreach_list_004.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_list_004.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php b/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php new file mode 100644 index 000000000..8fdacaf28 --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php.expectf b/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php.expectf new file mode 100644 index 000000000..c5b419f6a --- /dev/null +++ b/hphp/test/zend/good/zend/foreach_temp_array_expr_with_refs.php.expectf @@ -0,0 +1,2 @@ +string(5) "a-foo" +string(5) "b-foo" \ No newline at end of file diff --git a/hphp/test/zend/good/zend/foreach_undefined.php.expectf b/hphp/test/zend/good/zend/foreach_undefined.php.expectf index 8c042bad4..099f3eadd 100644 --- a/hphp/test/zend/good/zend/foreach_undefined.php.expectf +++ b/hphp/test/zend/good/zend/foreach_undefined.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Warning: %a +HipHop Notice: %s +HipHop Warning: %s Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/get_class_vars_002.php.expectf b/hphp/test/zend/good/zend/get_class_vars_002.php.expectf index 2eab1e461..4281f783f 100644 --- a/hphp/test/zend/good/zend/get_class_vars_002.php.expectf +++ b/hphp/test/zend/good/zend/get_class_vars_002.php.expectf @@ -10,8 +10,8 @@ array(3) { ["cc"]=> int(6) } -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s int(1) NULL NULL \ No newline at end of file diff --git a/hphp/test/zend/good/zend/get_defined_functions_error.php.expectf b/hphp/test/zend/good/zend/get_defined_functions_error.php.expectf index 3ff81a36e..4fa9d07e7 100644 --- a/hphp/test/zend/good/zend/get_defined_functions_error.php.expectf +++ b/hphp/test/zend/good/zend/get_defined_functions_error.php.expectf @@ -1,7 +1,7 @@ *** Testing get_defined_functions() : error conditions *** -- Testing get_defined_functions() function with more than expected no. of arguments -- -HipHop Warning: %a +HipHop Warning: %s NULL ===Done=== \ No newline at end of file diff --git a/hphp/test/zend/good/zend/halt03.php.expectf b/hphp/test/zend/good/zend/halt03.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/halt03.php.expectf +++ b/hphp/test/zend/good/zend/halt03.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/indirect_call_array_001.php.expectf b/hphp/test/zend/good/zend/indirect_call_array_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/indirect_call_array_001.php.expectf +++ b/hphp/test/zend/good/zend/indirect_call_array_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/indirect_call_array_002.php.expectf b/hphp/test/zend/good/zend/indirect_call_array_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/indirect_call_array_002.php.expectf +++ b/hphp/test/zend/good/zend/indirect_call_array_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/indirect_method_call_002.php.expectf b/hphp/test/zend/good/zend/indirect_method_call_002.php.expectf index a4f7bb946..d22f1bba6 100644 --- a/hphp/test/zend/good/zend/indirect_method_call_002.php.expectf +++ b/hphp/test/zend/good/zend/indirect_method_call_002.php.expectf @@ -2,4 +2,4 @@ string(3) "foo" string(7) "testing" string(3) "foo" NULL -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/instanceof_001.php b/hphp/test/zend/good/zend/instanceof_001.php similarity index 100% rename from hphp/test/zend/bad/zend/instanceof_001.php rename to hphp/test/zend/good/zend/instanceof_001.php diff --git a/hphp/test/zend/bad/zend/instanceof_001.php.expectf b/hphp/test/zend/good/zend/instanceof_001.php.expectf similarity index 70% rename from hphp/test/zend/bad/zend/instanceof_001.php.expectf rename to hphp/test/zend/good/zend/instanceof_001.php.expectf index 2b8341916..5040f23a7 100644 --- a/hphp/test/zend/bad/zend/instanceof_001.php.expectf +++ b/hphp/test/zend/good/zend/instanceof_001.php.expectf @@ -3,5 +3,4 @@ bool(true) bool(true) bool(true) bool(false) - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/inter_01.php.expectf b/hphp/test/zend/good/zend/inter_01.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/inter_01.php.expectf +++ b/hphp/test/zend/good/zend/inter_01.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/inter_05.php.expectf b/hphp/test/zend/good/zend/inter_05.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/inter_05.php.expectf +++ b/hphp/test/zend/good/zend/inter_05.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/inter_06.php.expectf b/hphp/test/zend/good/zend/inter_06.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/inter_06.php.expectf +++ b/hphp/test/zend/good/zend/inter_06.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/isset_expr_error.php b/hphp/test/zend/good/zend/isset_expr_error.php new file mode 100644 index 000000000..d9267a85b --- /dev/null +++ b/hphp/test/zend/good/zend/isset_expr_error.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/isset_expr_error.php.expectf b/hphp/test/zend/good/zend/isset_expr_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/isset_expr_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/isset_func_error.php b/hphp/test/zend/good/zend/isset_func_error.php new file mode 100644 index 000000000..78232b3e2 --- /dev/null +++ b/hphp/test/zend/good/zend/isset_func_error.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/isset_func_error.php.expectf b/hphp/test/zend/good/zend/isset_func_error.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/isset_func_error.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/jump06.php.expectf b/hphp/test/zend/good/zend/jump06.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/jump06.php.expectf +++ b/hphp/test/zend/good/zend/jump06.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/jump07.php.expectf b/hphp/test/zend/good/zend/jump07.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/jump07.php.expectf +++ b/hphp/test/zend/good/zend/jump07.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/jump08.php.expectf b/hphp/test/zend/good/zend/jump08.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/jump08.php.expectf +++ b/hphp/test/zend/good/zend/jump08.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/jump09.php.expectf b/hphp/test/zend/good/zend/jump09.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/jump09.php.expectf +++ b/hphp/test/zend/good/zend/jump09.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/jump10.php.expectf b/hphp/test/zend/good/zend/jump10.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/jump10.php.expectf +++ b/hphp/test/zend/good/zend/jump10.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/list_006.php.expectf b/hphp/test/zend/good/zend/list_006.php.expectf index 04c7ae471..75f6e7161 100644 --- a/hphp/test/zend/good/zend/list_006.php.expectf +++ b/hphp/test/zend/good/zend/list_006.php.expectf @@ -1,3 +1,3 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_001.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_001.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_002.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_002.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_003.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_003.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_003.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_003.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_004.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_004.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_005.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_005.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_005.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_005.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_006.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_006.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_006.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_006.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/magic_by_ref_007.php.expectf b/hphp/test/zend/good/zend/magic_by_ref_007.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/magic_by_ref_007.php.expectf +++ b/hphp/test/zend/good/zend/magic_by_ref_007.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/mod_001.php.expectf b/hphp/test/zend/good/zend/mod_001.php.expectf index 1eef429bb..b31181d89 100644 --- a/hphp/test/zend/good/zend/mod_001.php.expectf +++ b/hphp/test/zend/good/zend/mod_001.php.expectf @@ -1,3 +1,3 @@ -HipHop Warning: %a +HipHop Warning: %s bool(false) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/mul_001.php.expectf b/hphp/test/zend/good/zend/mul_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/mul_001.php.expectf +++ b/hphp/test/zend/good/zend/mul_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/not_002.php.expectf b/hphp/test/zend/good/zend/not_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/not_002.php.expectf +++ b/hphp/test/zend/good/zend/not_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_004.php.expectf b/hphp/test/zend/good/zend/ns_004.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_004.php.expectf +++ b/hphp/test/zend/good/zend/ns_004.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_029.php.expectf b/hphp/test/zend/good/zend/ns_029.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_029.php.expectf +++ b/hphp/test/zend/good/zend/ns_029.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_030.php.expectf b/hphp/test/zend/good/zend/ns_030.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_030.php.expectf +++ b/hphp/test/zend/good/zend/ns_030.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_038.php.expectf b/hphp/test/zend/good/zend/ns_038.php.expectf index 3030c9cdf..859ba662f 100644 --- a/hphp/test/zend/good/zend/ns_038.php.expectf +++ b/hphp/test/zend/good/zend/ns_038.php.expectf @@ -1,2 +1,2 @@ ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_041.php.expectf b/hphp/test/zend/good/zend/ns_041.php.expectf index 4284c8897..38b3f9cb7 100644 --- a/hphp/test/zend/good/zend/ns_041.php.expectf +++ b/hphp/test/zend/good/zend/ns_041.php.expectf @@ -1,5 +1,5 @@ ok ok ok -HipHop Notice: %a +HipHop Notice: %s BAR \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_057.php.expectf b/hphp/test/zend/good/zend/ns_057.php.expectf index 1bb641c3c..88dce52eb 100644 --- a/hphp/test/zend/good/zend/ns_057.php.expectf +++ b/hphp/test/zend/good/zend/ns_057.php.expectf @@ -8,4 +8,4 @@ const ok const ok class ok ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_058.php.expectf b/hphp/test/zend/good/zend/ns_058.php.expectf index 1bb641c3c..88dce52eb 100644 --- a/hphp/test/zend/good/zend/ns_058.php.expectf +++ b/hphp/test/zend/good/zend/ns_058.php.expectf @@ -8,4 +8,4 @@ const ok const ok class ok ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_068.php.expectf b/hphp/test/zend/good/zend/ns_068.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_068.php.expectf +++ b/hphp/test/zend/good/zend/ns_068.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_071.php.expectf b/hphp/test/zend/good/zend/ns_071.php.expectf index 34b94af4c..8b338b528 100644 --- a/hphp/test/zend/good/zend/ns_071.php.expectf +++ b/hphp/test/zend/good/zend/ns_071.php.expectf @@ -1,2 +1,2 @@ NULL -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_072.php.expectf b/hphp/test/zend/good/zend/ns_072.php.expectf index 11f54fafa..bcd9a9383 100644 --- a/hphp/test/zend/good/zend/ns_072.php.expectf +++ b/hphp/test/zend/good/zend/ns_072.php.expectf @@ -1,4 +1,4 @@ object(foo\test)#%d (0) { } NULL -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_076.php.expectf b/hphp/test/zend/good/zend/ns_076.php.expectf index 7c3077aa1..2c941dbf8 100644 --- a/hphp/test/zend/good/zend/ns_076.php.expectf +++ b/hphp/test/zend/good/zend/ns_076.php.expectf @@ -1,9 +1,9 @@ -HipHop Notice: %a -HipHop Notice: %a -HipHop Notice: %a +HipHop Notice: %s +HipHop Notice: %s +HipHop Notice: %s unknown array(1) { ["unknown"]=> %s(7) "unknown" } -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_1.php.expectf b/hphp/test/zend/good/zend/ns_077_1.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_1.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_1.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_2.php.expectf b/hphp/test/zend/good/zend/ns_077_2.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_2.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_2.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_3.php.expectf b/hphp/test/zend/good/zend/ns_077_3.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_3.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_3.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_4.php.expectf b/hphp/test/zend/good/zend/ns_077_4.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_4.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_4.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_5.php.expectf b/hphp/test/zend/good/zend/ns_077_5.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_5.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_5.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_6.php.expectf b/hphp/test/zend/good/zend/ns_077_6.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_6.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_6.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_7.php.expectf b/hphp/test/zend/good/zend/ns_077_7.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_7.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_7.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_077_8.php.expectf b/hphp/test/zend/good/zend/ns_077_8.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_077_8.php.expectf +++ b/hphp/test/zend/good/zend/ns_077_8.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_079.php.expectf b/hphp/test/zend/good/zend/ns_079.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_079.php.expectf +++ b/hphp/test/zend/good/zend/ns_079.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_081.php.expectf b/hphp/test/zend/good/zend/ns_081.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_081.php.expectf +++ b/hphp/test/zend/good/zend/ns_081.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_083.php.expectf b/hphp/test/zend/good/zend/ns_083.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_083.php.expectf +++ b/hphp/test/zend/good/zend/ns_083.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_084.php.expectf b/hphp/test/zend/good/zend/ns_084.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_084.php.expectf +++ b/hphp/test/zend/good/zend/ns_084.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/ns_087.php.expectf b/hphp/test/zend/good/zend/ns_087.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/ns_087.php.expectf +++ b/hphp/test/zend/good/zend/ns_087.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/objects_001.php.expectf b/hphp/test/zend/good/zend/objects_001.php.expectf index 1bf3f577d..69b89138a 100644 --- a/hphp/test/zend/good/zend/objects_001.php.expectf +++ b/hphp/test/zend/good/zend/objects_001.php.expectf @@ -6,18 +6,18 @@ bool(false) bool(true) bool(false) bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) -HipHop Notice: %a +HipHop Notice: %s bool(false) -HipHop Notice: %a +HipHop Notice: %s bool(true) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/objects_012.php.expectf b/hphp/test/zend/good/zend/objects_012.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/objects_012.php.expectf +++ b/hphp/test/zend/good/zend/objects_012.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/objects_017.php.expectf b/hphp/test/zend/good/zend/objects_017.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/objects_017.php.expectf +++ b/hphp/test/zend/good/zend/objects_017.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/bad/zend/objects_022.php b/hphp/test/zend/good/zend/objects_022.php similarity index 100% rename from hphp/test/zend/bad/zend/objects_022.php rename to hphp/test/zend/good/zend/objects_022.php diff --git a/hphp/test/zend/bad/zend/objects_022.php.expectf b/hphp/test/zend/good/zend/objects_022.php.expectf similarity index 75% rename from hphp/test/zend/bad/zend/objects_022.php.expectf rename to hphp/test/zend/good/zend/objects_022.php.expectf index a6178b3ee..082606df3 100644 --- a/hphp/test/zend/bad/zend/objects_022.php.expectf +++ b/hphp/test/zend/good/zend/objects_022.php.expectf @@ -4,5 +4,4 @@ object(bar)#%d (0) { } object(baz)#%d (0) { } - -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/objects_025.php.expectf b/hphp/test/zend/good/zend/objects_025.php.expectf index cca8586fc..e49d22e1a 100644 --- a/hphp/test/zend/good/zend/objects_025.php.expectf +++ b/hphp/test/zend/good/zend/objects_025.php.expectf @@ -6,4 +6,4 @@ non-static - ok static - ok non-static - ok static - ok -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/objects_026.php.expectf b/hphp/test/zend/good/zend/objects_026.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/objects_026.php.expectf +++ b/hphp/test/zend/good/zend/objects_026.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/offset_object.php.expectf b/hphp/test/zend/good/zend/offset_object.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/offset_object.php.expectf +++ b/hphp/test/zend/good/zend/offset_object.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/settype_int.php.expectf b/hphp/test/zend/good/zend/settype_int.php.expectf index 9344b1a5f..08929415b 100644 --- a/hphp/test/zend/good/zend/settype_int.php.expectf +++ b/hphp/test/zend/good/zend/settype_int.php.expectf @@ -10,6 +10,6 @@ int(0) int(1) int(0) int(%d) -HipHop Notice: %a +HipHop Notice: %s int(1) Done \ No newline at end of file diff --git a/hphp/test/zend/good/zend/str_offset_002.php.expectf b/hphp/test/zend/good/zend/str_offset_002.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/str_offset_002.php.expectf +++ b/hphp/test/zend/good/zend/str_offset_002.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/sub_001.php.expectf b/hphp/test/zend/good/zend/sub_001.php.expectf index 3dad4aedf..651609b45 100644 --- a/hphp/test/zend/good/zend/sub_001.php.expectf +++ b/hphp/test/zend/good/zend/sub_001.php.expectf @@ -1 +1 @@ -HipHop Fatal error: %a \ No newline at end of file +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_004.php b/hphp/test/zend/good/zend/try_finally_004.php new file mode 100644 index 000000000..f1972ba62 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_004.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_004.php.expectf b/hphp/test/zend/good/zend/try_finally_004.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_004.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_005.php b/hphp/test/zend/good/zend/try_finally_005.php new file mode 100644 index 000000000..d758f648e --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_005.php @@ -0,0 +1,12 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_005.php.expectf b/hphp/test/zend/good/zend/try_finally_005.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_005.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_007.php b/hphp/test/zend/good/zend/try_finally_007.php new file mode 100644 index 000000000..3d0711930 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_007.php @@ -0,0 +1,17 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_007.php.expectf b/hphp/test/zend/good/zend/try_finally_007.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_007.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_008.php b/hphp/test/zend/good/zend/try_finally_008.php new file mode 100644 index 000000000..d7aa8e3ad --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_008.php @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_008.php.expectf b/hphp/test/zend/good/zend/try_finally_008.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_008.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_009.php b/hphp/test/zend/good/zend/try_finally_009.php new file mode 100644 index 000000000..d23964904 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_009.php @@ -0,0 +1,18 @@ + \ No newline at end of file diff --git a/hphp/test/zend/good/zend/try_finally_009.php.expectf b/hphp/test/zend/good/zend/try_finally_009.php.expectf new file mode 100644 index 000000000..651609b45 --- /dev/null +++ b/hphp/test/zend/good/zend/try_finally_009.php.expectf @@ -0,0 +1 @@ +HipHop Fatal error: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/unset_cv01.php.expectf b/hphp/test/zend/good/zend/unset_cv01.php.expectf index 34582be39..6c2248167 100644 --- a/hphp/test/zend/good/zend/unset_cv01.php.expectf +++ b/hphp/test/zend/good/zend/unset_cv01.php.expectf @@ -1,2 +1,2 @@ ok -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/unset_cv02.php.expectf b/hphp/test/zend/good/zend/unset_cv02.php.expectf index 34582be39..6c2248167 100644 --- a/hphp/test/zend/good/zend/unset_cv02.php.expectf +++ b/hphp/test/zend/good/zend/unset_cv02.php.expectf @@ -1,2 +1,2 @@ ok -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/unset_cv03.php.expectf b/hphp/test/zend/good/zend/unset_cv03.php.expectf index 34582be39..6c2248167 100644 --- a/hphp/test/zend/good/zend/unset_cv03.php.expectf +++ b/hphp/test/zend/good/zend/unset_cv03.php.expectf @@ -1,2 +1,2 @@ ok -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/unset_cv04.php.expectf b/hphp/test/zend/good/zend/unset_cv04.php.expectf index 34582be39..6c2248167 100644 --- a/hphp/test/zend/good/zend/unset_cv04.php.expectf +++ b/hphp/test/zend/good/zend/unset_cv04.php.expectf @@ -1,2 +1,2 @@ ok -HipHop Notice: %a \ No newline at end of file +HipHop Notice: %s \ No newline at end of file diff --git a/hphp/test/zend/good/zend/unset_cv10.php.expectf b/hphp/test/zend/good/zend/unset_cv10.php.expectf index 1eb86901a..c0763bc10 100644 --- a/hphp/test/zend/good/zend/unset_cv10.php.expectf +++ b/hphp/test/zend/good/zend/unset_cv10.php.expectf @@ -1,3 +1,3 @@ ok -HipHop Notice: %a +HipHop Notice: %s ok \ No newline at end of file diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py index bb7890b9c..3e31d18c2 100755 --- a/hphp/tools/import_zend_test.py +++ b/hphp/tools/import_zend_test.py @@ -209,6 +209,19 @@ bad_tests = ( other_files = ( '/ext-curl/curl_testdata1.txt', '/ext-curl/curl_testdata2.txt', + '/ext-date/examine_diff.inc', + '/ext-date/DateTime_data-absolute.inc', + '/ext-date/DateTime_data-spring-type2-type3.inc', + '/ext-date/DateTime_data-spring-type3-type2.inc', + '/ext-date/DateTime_data-fall-type3-type2.inc', + '/ext-date/DateTime_data-february.inc', + '/ext-date/DateTime_data-dates.inc', + '/ext-date/DateTime_data-spring-type2-type2.inc', + '/ext-date/DateTime_data-fall-type2-type3.inc', + '/ext-date/DateTime_data-massive.inc', + '/ext-date/DateTime_data-spring-type3-type3.inc', + '/ext-date/DateTime_data-fall-type3-type3.inc', + '/ext-date/DateTime_data-fall-type2-type2.inc', '/ext-exif/bug48378.jpeg', '/ext-gd/Tuffy.ttf', '/ext-gd/bug37346.gif', @@ -229,10 +242,13 @@ other_files = ( '/ext-mcrypt/vectors.txt', '/ext-mysql/connect.inc', '/ext-openssl/005_crt.txt', + '/ext-openssl/bug28382cert.txt', '/ext-openssl/bug37820cert.pem', '/ext-openssl/bug37820key.pem', '/ext-openssl/bug39217cert1.txt', '/ext-openssl/bug39217cert2.txt', + '/ext-openssl/bug41033.pem', + '/ext-openssl/bug41033pub.pem', '/ext-openssl/cert.crt', '/ext-openssl/openssl.cnf', '/ext-openssl/private.key', @@ -293,6 +309,7 @@ other_files = ( '/tests-lang/inc.inc', '/tests-lang/inc_throw.inc', '/tests/quicktester.inc', + '/zend/bug46665_autoload.inc', '/zend/bug54804.inc', '/zend/nowdoc.inc', '/zend/ns_022.inc', @@ -414,7 +431,7 @@ def walk(filename, source): exp = exp.replace('\n\nWarning:', '\nWarning:') exp = exp.replace('\n\nNotice:', '\nNotice:') - match_rest_of_line = '%a' + match_rest_of_line = '%s' if key == 'EXPECTREGEX': match_rest_of_line = '.+' @@ -582,6 +599,8 @@ def walk(filename, source): if '/ext-spl/SplFileObject_' in full_dest_filename: test = test.replace('testdata.csv', os.path.basename(full_dest_filename).replace('.php', '.csv')) + if '/ext-spl/SplFileObject_rewind_error001.php' in full_dest_filename: + test = test.replace("?>", "unlink('SplFileObject_rewind_error001.csv');\n?>") file(full_dest_filename, 'w').write(test) @@ -638,8 +657,9 @@ stdout = subprocess.Popen( # segfaults also print on stderr stdout = re.sub('\nsh: line 1:.*', '', stdout) -# fbmake, you are crazy -results = json.loads('['+stdout.strip().replace("\n", ",\n")+']')[-1]['results'] +# just the last line +last_line = stdout.strip().split("\n")[-1] +results = json.loads(last_line)['results'] if args.verbose: print results