From ab4929477ca6f404b40939233afe52644e6d5fa8 Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Tue, 23 Apr 2013 21:31:07 -0700
Subject: [PATCH] fully quality paths

I was pretty inconsistent in here. It is better to be explicit.

To keep myself honest, I did:

  rm -r test/zend; tools/import_zend_test.py -z /tmp/php-5.4.13/

Of the changed files:

* type_hinting_005a.php was missed in the original import
* closure_033.php someone changed by hand before
* date and posix tests now pass magically
* bug43703 too

The rest are whitespace updates
---
 hphp/test/zend/bad/ext-bz2/004.php            |  40 --
 hphp/test/zend/bad/ext-bz2/004.php.expectf    |  61 --
 hphp/test/zend/bad/ext-date/bug50055.php      |  18 -
 .../zend/bad/ext-date/bug50055.php.expectf    |   6 -
 hphp/test/zend/bad/ext-gd/crafted_gd2.php     |   3 -
 .../zend/bad/ext-gd/crafted_gd2.php.expectf   |   1 -
 hphp/test/zend/bad/ext-hash/hash_algos.php    |   2 +-
 .../zend/bad/ext-hash/hash_file_basic1.php    |   8 +-
 .../zend/bad/ext-hash/hash_hmac_basic.php     |   2 +-
 .../bad/ext-hash/hash_hmac_file_basic.php     |   8 +-
 hphp/test/zend/bad/ext-hash/joaat.php         |   2 +-
 hphp/test/zend/bad/ext-hash/mhash_002.php     |   4 +-
 .../zend/bad/ext-imap/bug31142_1.php.expectf  |   2 +-
 hphp/test/zend/bad/ext-imap/bug35669.php      |  14 +-
 .../zend/bad/ext-imap/bug40854.php.expectf    |   2 +-
 .../zend/bad/ext-imap/bug46918.php.expectf    |  18 +-
 .../zend/bad/ext-imap/imap_append_basic.php   |  10 +-
 hphp/test/zend/bad/ext-imap/imap_body.php     |   2 +-
 .../zend/bad/ext-imap/imap_body_basic.php     |   6 +-
 .../bad/ext-imap/imap_bodystruct_basic.php    |  22 +-
 .../ext-imap/imap_clearflag_full_basic.php    |   4 +-
 .../zend/bad/ext-imap/imap_close_basic.php    |   2 +-
 .../zend/bad/ext-imap/imap_close_error.php    |   2 +-
 .../bad/ext-imap/imap_close_variation1.php    |   6 +-
 .../bad/ext-imap/imap_close_variation2.php    |   4 +-
 .../bad/ext-imap/imap_close_variation3.php    |   2 +-
 .../bad/ext-imap/imap_close_variation4.php    |   2 +-
 .../bad/ext-imap/imap_createmailbox_basic.php |   8 +-
 .../zend/bad/ext-imap/imap_errors_basic.php   |   6 +-
 .../ext-imap/imap_fetch_overview_basic.php    |   4 +-
 .../ext-imap/imap_fetch_overview_error.php    |   4 +-
 .../imap_fetch_overview_variation1.php        |   8 +-
 .../imap_fetch_overview_variation2.php        |   8 +-
 .../imap_fetch_overview_variation3.php        |  10 +-
 .../imap_fetch_overview_variation4.php        |   4 +-
 .../imap_fetch_overview_variation5.php        |   6 +-
 .../imap_fetch_overview_variation6.php        |  12 +-
 .../bad/ext-imap/imap_fetchbody_basic.php     |   8 +-
 .../bad/ext-imap/imap_fetchbody_error.php     |   4 +-
 .../ext-imap/imap_fetchbody_variation1.php    |   8 +-
 .../ext-imap/imap_fetchbody_variation2.php    |   8 +-
 .../ext-imap/imap_fetchbody_variation3.php    |   8 +-
 .../ext-imap/imap_fetchbody_variation4.php    |   6 +-
 .../ext-imap/imap_fetchbody_variation5.php    |   4 +-
 .../ext-imap/imap_fetchbody_variation6.php    |   2 +-
 .../bad/ext-imap/imap_fetchheader_basic.php   |   4 +-
 .../bad/ext-imap/imap_fetchheader_error.php   |   2 +-
 .../ext-imap/imap_fetchheader_variation1.php  |  10 +-
 .../ext-imap/imap_fetchheader_variation2.php  |  10 +-
 .../ext-imap/imap_fetchheader_variation3.php  |   6 +-
 .../ext-imap/imap_fetchheader_variation4.php  |   2 +-
 .../ext-imap/imap_fetchheader_variation5.php  |   6 +-
 .../ext-imap/imap_fetchstructure_basic.php    |   2 +-
 hphp/test/zend/bad/ext-imap/imap_gc_error.php |   2 +-
 .../bad/ext-imap/imap_getsubscribed_basic.php |   4 +-
 .../bad/ext-imap/imap_headerinfo_basic.php    |   4 +-
 .../bad/ext-imap/imap_headerinfo_error.php    |   4 +-
 .../zend/bad/ext-imap/imap_list_basic.php     |   2 +-
 .../zend/bad/ext-imap/imap_lsub_basic.php     |   4 +-
 .../test/zend/bad/ext-imap/imap_mail_copy.php |   4 +-
 .../bad/ext-imap/imap_mail_copy_basic.php     |   6 +-
 .../test/zend/bad/ext-imap/imap_mail_move.php |   4 +-
 .../bad/ext-imap/imap_mail_move_basic.php     |   6 +-
 .../bad/ext-imap/imap_renamemailbox_basic.php |   4 +-
 .../imap_rfc822_parse_headers_basic.php       |   4 +-
 .../zend/bad/ext-imap/imap_savebody_basic.php |   2 +-
 .../zend/bad/ext-imap/imap_undelete_basic.php |   2 +-
 .../zend/bad/ext-imap/imap_undelete_error.php |   4 +-
 .../bad/tests-classes/type_hinting_005a.php   |  10 +
 .../type_hinting_005a.php.expectf             |   4 +
 hphp/test/zend/bad/tests-func/010.php         |  59 --
 hphp/test/zend/bad/tests-func/010.php.expectf |   8 -
 .../divide_basiclong_64bit.php                |  33 --
 .../divide_basiclong_64bit.php.expectf        | 541 ------------------
 .../modulus_basiclong_64bit.php               |  33 --
 .../modulus_basiclong_64bit.php.expectf       | 541 ------------------
 hphp/test/zend/bad/tests-lang/bug21820.php    |   8 -
 .../zend/bad/tests-lang/bug21820.php.expectf  |   1 -
 .../zend/bad/tests-lang/func_get_arg.003.php  |   5 -
 .../tests-lang/func_get_arg.003.php.expectf   |   2 -
 .../zend/bad/tests-lang/func_get_args.003.php |   5 -
 .../func_get_args.003.php.expectregex         |   2 -
 .../zend/bad/tests-lang/func_num_args.003.php |   5 -
 .../tests-lang/func_num_args.003.php.expectf  |   2 -
 hphp/test/zend/bad/zend/020.php               |  18 -
 hphp/test/zend/bad/zend/020.php.expectf       |   9 -
 hphp/test/zend/bad/zend/bug35239.php          |  11 -
 hphp/test/zend/bad/zend/bug35239.php.expectf  |  12 -
 hphp/test/zend/bad/zend/bug54265.php          |  10 -
 hphp/test/zend/bad/zend/bug54265.php.expectf  |   2 -
 hphp/test/zend/bad/zend/bug55705.php          |   4 -
 hphp/test/zend/bad/zend/bug55705.php.expectf  |   1 -
 .../zend/bad/zend/callable_type_hint_001.php  |  16 -
 .../zend/callable_type_hint_001.php.expectf   |  18 -
 .../zend/bad/zend/callable_type_hint_003.php  |  12 -
 .../zend/callable_type_hint_003.php.expectf   |   4 -
 .../zend/{good => bad}/zend/closure_033.php   |   0
 .../zend/bad/zend/closure_033.php.expectf     |   2 +
 hphp/test/zend/bad/zend/heredoc_005.php       |  17 -
 .../zend/bad/zend/heredoc_005.php.expectf     |   1 -
 hphp/test/zend/bad/zend/jump13.php            |  20 -
 hphp/test/zend/bad/zend/jump13.php.expectf    |   1 -
 hphp/test/zend/config.hdf                     |   4 +-
 .../ext-date/gmstrftime_basic.php             |   0
 .../ext-date/gmstrftime_basic.php.expectf     |   0
 .../ext-date/microtime_basic.php              |   0
 .../ext-date/microtime_basic.php.expectf      |   0
 .../{bad => good}/ext-date/strftime_basic.php |   0
 .../ext-date/strftime_basic.php.expectf       |   0
 hphp/test/zend/good/ext-hash/hash_error.php   |   4 +-
 .../zend/good/ext-hash/hash_file_basic.php    |   2 +-
 .../zend/good/ext-hash/hash_file_error.php    |   2 +-
 .../good/ext-hash/hash_hmac_file_error.php    |   4 +-
 .../zend/good/ext-imap/imap_alerts_error.php  |   4 +-
 .../zend/good/ext-imap/imap_base64_basic.php  |   2 +-
 .../zend/good/ext-imap/imap_binary_basic.php  |   2 +-
 .../{bad => good}/ext-posix/posix_ttyname.php |   0
 .../ext-posix/posix_ttyname.php.expectf       |   0
 .../ext-posix/posix_ttyname_variation1.php    |   0
 .../posix_ttyname_variation1.php.expectf      |   0
 .../ext-posix/posix_ttyname_variation2.php    |   0
 .../posix_ttyname_variation2.php.expectf      |   0
 .../ext-posix/posix_ttyname_variation3.php    |   0
 .../posix_ttyname_variation3.php.expectf      |   0
 .../ext-posix/posix_ttyname_variation4.php    |   0
 .../posix_ttyname_variation4.php.expectf      |   0
 .../ext-posix/posix_ttyname_variation7.php    |   0
 .../posix_ttyname_variation7.php.expectf      |   0
 .../test/zend/{bad => good}/zend/bug43703.php |   0
 .../{bad => good}/zend/bug43703.php.expectf   |   0
 .../zend/good/zend/closure_033.php.expectf    |   2 -
 hphp/tools/import_zend_test.py                | 260 +++++----
 132 files changed, 334 insertions(+), 1838 deletions(-)
 delete mode 100644 hphp/test/zend/bad/ext-bz2/004.php
 delete mode 100644 hphp/test/zend/bad/ext-bz2/004.php.expectf
 delete mode 100644 hphp/test/zend/bad/ext-date/bug50055.php
 delete mode 100644 hphp/test/zend/bad/ext-date/bug50055.php.expectf
 delete mode 100644 hphp/test/zend/bad/ext-gd/crafted_gd2.php
 delete mode 100644 hphp/test/zend/bad/ext-gd/crafted_gd2.php.expectf
 create mode 100644 hphp/test/zend/bad/tests-classes/type_hinting_005a.php
 create mode 100644 hphp/test/zend/bad/tests-classes/type_hinting_005a.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-func/010.php
 delete mode 100644 hphp/test/zend/bad/tests-func/010.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php
 delete mode 100644 hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php
 delete mode 100644 hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-lang/bug21820.php
 delete mode 100644 hphp/test/zend/bad/tests-lang/bug21820.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_get_arg.003.php
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_get_arg.003.php.expectf
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_get_args.003.php
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_get_args.003.php.expectregex
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_num_args.003.php
 delete mode 100644 hphp/test/zend/bad/tests-lang/func_num_args.003.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/020.php
 delete mode 100644 hphp/test/zend/bad/zend/020.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/bug35239.php
 delete mode 100644 hphp/test/zend/bad/zend/bug35239.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/bug54265.php
 delete mode 100644 hphp/test/zend/bad/zend/bug54265.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/bug55705.php
 delete mode 100644 hphp/test/zend/bad/zend/bug55705.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/callable_type_hint_001.php
 delete mode 100644 hphp/test/zend/bad/zend/callable_type_hint_001.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/callable_type_hint_003.php
 delete mode 100644 hphp/test/zend/bad/zend/callable_type_hint_003.php.expectf
 rename hphp/test/zend/{good => bad}/zend/closure_033.php (100%)
 create mode 100644 hphp/test/zend/bad/zend/closure_033.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/heredoc_005.php
 delete mode 100644 hphp/test/zend/bad/zend/heredoc_005.php.expectf
 delete mode 100644 hphp/test/zend/bad/zend/jump13.php
 delete mode 100644 hphp/test/zend/bad/zend/jump13.php.expectf
 rename hphp/test/zend/{bad => good}/ext-date/gmstrftime_basic.php (100%)
 rename hphp/test/zend/{bad => good}/ext-date/gmstrftime_basic.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-date/microtime_basic.php (100%)
 rename hphp/test/zend/{bad => good}/ext-date/microtime_basic.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-date/strftime_basic.php (100%)
 rename hphp/test/zend/{bad => good}/ext-date/strftime_basic.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation1.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation1.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation2.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation2.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation3.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation3.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation4.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation4.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation7.php (100%)
 rename hphp/test/zend/{bad => good}/ext-posix/posix_ttyname_variation7.php.expectf (100%)
 rename hphp/test/zend/{bad => good}/zend/bug43703.php (100%)
 rename hphp/test/zend/{bad => good}/zend/bug43703.php.expectf (100%)
 delete mode 100644 hphp/test/zend/good/zend/closure_033.php.expectf

diff --git a/hphp/test/zend/bad/ext-bz2/004.php b/hphp/test/zend/bad/ext-bz2/004.php
deleted file mode 100644
index 68868a65e..000000000
--- a/hphp/test/zend/bad/ext-bz2/004.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-$fd = bzopen(dirname(__FILE__)."/004_1.txt.bz2","r");
-var_dump(bzerror($fd));
-var_dump(bzerrstr($fd));
-var_dump(bzerrno($fd));
-
-$fd2 = bzopen(dirname(__FILE__)."/004_2.txt.bz2","r");
-var_dump(bzerror($fd2));
-var_dump(bzerrstr($fd2));
-var_dump(bzerrno($fd2));
-
-var_dump(bzread($fd, 10));
-var_dump(bzerror($fd));
-var_dump(bzerrstr($fd));
-var_dump(bzerrno($fd));
-
-var_dump(bzread($fd2, 10));
-var_dump(bzerror($fd2));
-var_dump(bzerrstr($fd2));
-var_dump(bzerrno($fd2));
-
-var_dump(bzread($fd));
-var_dump(bzerror($fd));
-var_dump(bzerrstr($fd));
-var_dump(bzerrno($fd));
-
-var_dump(bzread($fd2));
-var_dump(bzerror($fd2));
-var_dump(bzerrstr($fd2));
-var_dump(bzerrno($fd2));
-
-bzclose($fd2);
-var_dump(bzread($fd2));
-var_dump(bzerror($fd2));
-var_dump(bzerrstr($fd2));
-var_dump(bzerrno($fd2));
-
-echo "Done\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-bz2/004.php.expectf b/hphp/test/zend/bad/ext-bz2/004.php.expectf
deleted file mode 100644
index a1f36f064..000000000
--- a/hphp/test/zend/bad/ext-bz2/004.php.expectf
+++ /dev/null
@@ -1,61 +0,0 @@
-array(2) {
-  ["errno"]=>
-  int(0)
-  ["errstr"]=>
-  string(2) "OK"
-}
-string(2) "OK"
-int(0)
-array(2) {
-  ["errno"]=>
-  int(0)
-  ["errstr"]=>
-  string(2) "OK"
-}
-string(2) "OK"
-int(0)
-string(0) ""
-array(2) {
-  ["errno"]=>
-  int(-5)
-  ["errstr"]=>
-  string(16) "DATA_ERROR_MAGIC"
-}
-string(16) "DATA_ERROR_MAGIC"
-int(-5)
-string(0) ""
-array(2) {
-  ["errno"]=>
-  int(-4)
-  ["errstr"]=>
-  string(10) "DATA_ERROR"
-}
-string(10) "DATA_ERROR"
-int(-4)
-string(0) ""
-array(2) {
-  ["errno"]=>
-  int(-5)
-  ["errstr"]=>
-  string(16) "DATA_ERROR_MAGIC"
-}
-string(16) "DATA_ERROR_MAGIC"
-int(-5)
-string(0) ""
-array(2) {
-  ["errno"]=>
-  int(-4)
-  ["errstr"]=>
-  string(10) "DATA_ERROR"
-}
-string(10) "DATA_ERROR"
-int(-4)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-bool(false)
-Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-date/bug50055.php b/hphp/test/zend/bad/ext-date/bug50055.php
deleted file mode 100644
index 5a6ceb27f..000000000
--- a/hphp/test/zend/bad/ext-date/bug50055.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$now = '2010-03-07 13:21:38 UTC';
-//positive DateInterval
-$da1 = date_create( $now );
-$ds1 = date_create( $now );
-$i = DateInterval::createFromDateString('third Tuesday of next month');
-echo $da1->format( DateTime::ISO8601 ), "\n";
-echo date_add($da1, $i)->format( DateTime::ISO8601 ), "\n";
-date_sub($ds1, $i);
-
-//negative DateInterval
-$da2 = date_create( $now );
-$ds2 = date_create( $now );
-$i2 = DateInterval::createFromDateString('third Tuesday of last month');
-echo $da2->format( DateTime::ISO8601 ), "\n";
-echo date_add($da2, $i2)->format( DateTime::ISO8601 ), "\n";//works
-date_sub($ds2, $i);
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-date/bug50055.php.expectf b/hphp/test/zend/bad/ext-date/bug50055.php.expectf
deleted file mode 100644
index ad40950a1..000000000
--- a/hphp/test/zend/bad/ext-date/bug50055.php.expectf
+++ /dev/null
@@ -1,6 +0,0 @@
-2010-03-07T13:21:38+0000
-2010-04-20T13:21:38+0000
-HipHop Warning: %a
-2010-03-07T13:21:38+0000
-2010-02-16T13:21:38+0000
-HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-gd/crafted_gd2.php b/hphp/test/zend/bad/ext-gd/crafted_gd2.php
deleted file mode 100644
index acb105630..000000000
--- a/hphp/test/zend/bad/ext-gd/crafted_gd2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-imagecreatefromgd(dirname(__FILE__) . '/crafted.gd2');
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-gd/crafted_gd2.php.expectf b/hphp/test/zend/bad/ext-gd/crafted_gd2.php.expectf
deleted file mode 100644
index cfb6a8593..000000000
--- a/hphp/test/zend/bad/ext-gd/crafted_gd2.php.expectf
+++ /dev/null
@@ -1 +0,0 @@
-HipHop Warning: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-hash/hash_algos.php b/hphp/test/zend/bad/ext-hash/hash_algos.php
index 1cd67e1df..f82264a79 100644
--- a/hphp/test/zend/bad/ext-hash/hash_algos.php
+++ b/hphp/test/zend/bad/ext-hash/hash_algos.php
@@ -3,7 +3,7 @@
 /* Prototype  : array hash_algos (void)
  * Description: Return a list of registered hashing algorithms
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 
 echo "*** Testing hash_algos() : basic functionality ***\n";
diff --git a/hphp/test/zend/bad/ext-hash/hash_file_basic1.php b/hphp/test/zend/bad/ext-hash/hash_file_basic1.php
index d87040f2f..253a14b89 100644
--- a/hphp/test/zend/bad/ext-hash/hash_file_basic1.php
+++ b/hphp/test/zend/bad/ext-hash/hash_file_basic1.php
@@ -3,7 +3,7 @@
 /* Prototype  : string hash_file ( string algo, string filename [, bool raw_output] )
  * Description: Generate a hash value using the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 
 echo "*** Testing hash_file() : basic functionality ***\n";
@@ -13,9 +13,9 @@ $file = dirname(__FILE__) . "hash_file.txt";
 if (($fp = fopen( $file, "w+")) == FALSE) {
 	echo "Cannot create file ($file)";
     exit;
-}
+}	
 
-/* Writing into file */
+/* Writing into file */ 
 $content = "This is a sample string used to test the hash_file function with various hashing algorithms";
 if (is_writable($file)) {
   if (fwrite($fp, $content) === FALSE) {
@@ -24,7 +24,7 @@ if (is_writable($file)) {
   }
 }
 
-// close the file
+// close the file 
 fclose($fp);
 
 echo "adler32: " . hash_file('adler32', $file) . "\n";
diff --git a/hphp/test/zend/bad/ext-hash/hash_hmac_basic.php b/hphp/test/zend/bad/ext-hash/hash_hmac_basic.php
index dda7418fc..077e91a5c 100644
--- a/hphp/test/zend/bad/ext-hash/hash_hmac_basic.php
+++ b/hphp/test/zend/bad/ext-hash/hash_hmac_basic.php
@@ -3,7 +3,7 @@
 /* Prototype  : string hash_hmac  ( string $algo  , string $data  , string $key  [, bool $raw_output  ] )
  * Description: Generate a keyed hash value using the HMAC method
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 
 echo "*** Testing hash_hmac() : basic functionality ***\n";
diff --git a/hphp/test/zend/bad/ext-hash/hash_hmac_file_basic.php b/hphp/test/zend/bad/ext-hash/hash_hmac_file_basic.php
index fecd7bada..05d005eb4 100644
--- a/hphp/test/zend/bad/ext-hash/hash_hmac_file_basic.php
+++ b/hphp/test/zend/bad/ext-hash/hash_hmac_file_basic.php
@@ -4,7 +4,7 @@
 /* Prototype  : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] )
  * Description: Generate a keyed hash value using the HMAC method and the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 
 echo "*** Testing hash_hmac_file() : basic functionality ***\n";
@@ -14,9 +14,9 @@ $file = dirname(__FILE__) . "hash_hmac_file.txt";
 if (($fp = fopen( $file, "w+")) == FALSE) {
 	echo "Cannot create file ($file)";
     exit;
-}
+}	
 
-/* Writing into file */
+/* Writing into file */ 
 $content = "This is a sample string used to test the hash_hmac_file function with various hashing algorithms";
 if (is_writable($file)) {
   if (fwrite($fp, $content) === FALSE) {
@@ -25,7 +25,7 @@ if (is_writable($file)) {
   }
 }
 
-// close the files
+// close the files 
 fclose($fp);
 
 $key = 'secret';
diff --git a/hphp/test/zend/bad/ext-hash/joaat.php b/hphp/test/zend/bad/ext-hash/joaat.php
index 92c5ebf86..abcaa1ec0 100644
--- a/hphp/test/zend/bad/ext-hash/joaat.php
+++ b/hphp/test/zend/bad/ext-hash/joaat.php
@@ -12,7 +12,7 @@ $pass = true;
 
 foreach ($tests as $test) {
 	++$i;
-
+	
 	$result = hash("joaat", $test[0]);
 	if ($result != $test[1]) {
 		echo "Iteration " . $i . " failed - expected '" . $test[1] . "', got '" . $result . "' for '" . $test[1] . "'\n";
diff --git a/hphp/test/zend/bad/ext-hash/mhash_002.php b/hphp/test/zend/bad/ext-hash/mhash_002.php
index 0302e35de..6c6f8521f 100644
--- a/hphp/test/zend/bad/ext-hash/mhash_002.php
+++ b/hphp/test/zend/bad/ext-hash/mhash_002.php
@@ -22,7 +22,7 @@ $supported_hash_al = array(
 
 $hc = mhash_count() + 1;
 
-$known_hash_al = array();
+$known_hash_al = array();	
 for ($i=0; $i < $hc; $i++) {
 	$known_hash_al[mhash_get_hash_name($i)] = $i;
 }
@@ -33,6 +33,6 @@ foreach ($supported_hash_al as $name => $len) {
 		echo "$name = $len\n";
 	} else {
 		echo "$name ? $len\n";
-	}
+	} 
 }
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/bug31142_1.php.expectf b/hphp/test/zend/bad/ext-imap/bug31142_1.php.expectf
index 31dee1a61..fc6b5fc69 100644
--- a/hphp/test/zend/bad/ext-imap/bug31142_1.php.expectf
+++ b/hphp/test/zend/bad/ext-imap/bug31142_1.php.expectf
@@ -18,5 +18,5 @@ Content-Description: description3
 contents.data3
 
 
-
+	
 --%s--
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/bug35669.php b/hphp/test/zend/bad/ext-imap/bug35669.php
index ffcbc1667..9a2d6f4ef 100644
--- a/hphp/test/zend/bad/ext-imap/bug35669.php
+++ b/hphp/test/zend/bad/ext-imap/bug35669.php
@@ -2,15 +2,15 @@
 	$envelope["from"] = 'Santa <somewhere@northpole.gov>';
         $envelope["to"]  = 'The bad smurf <bad@smurf.com>';
         $envelope['date'] = 'Wed, 04 Jan 2006 19:24:43 -0500';
-
+                
         $multipart["type"] = TYPEMULTIPART;
         $multipart["subtype"] = "MIXED";
         $body[] = $multipart; //add multipart stuff
-
+        
         $textpart["type"] = TYPEMULTIPART;
         $textpart["subtype"] = "ALTERNATIVE";
         $body[] = $textpart; //add body part
-
+        
         $plain["type"] = TYPETEXT;
         $plain["subtype"] = "PLAIN";
         $plain["charset"] = "iso-8859-1";
@@ -18,9 +18,9 @@
         $plain["description"] = "Plaintype part of message";
         $plain['disposition'] = "inline";
         $plain["contents.data"] = 'See mom, it will crash';
-
+        
         $body[] = $plain; //next add plain text part
-
+        
         $html["type"] = TYPETEXT;
         $html["subtype"] = "HTML";
         $html["charset"] = "iso-8859-1";
@@ -28,8 +28,8 @@
         $html["description"] = "HTML part of message";
         $html['disposition'] = "inline";
         $html["contents.data"] = 'See mom, it will <b>crash</b>';
-
+        
         $body[] = $html;
-
+        
         echo imap_mail_compose($envelope, $body);
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/bug40854.php.expectf b/hphp/test/zend/bad/ext-imap/bug40854.php.expectf
index e02a5813c..f8af5f567 100644
--- a/hphp/test/zend/bad/ext-imap/bug40854.php.expectf
+++ b/hphp/test/zend/bad/ext-imap/bug40854.php.expectf
@@ -18,5 +18,5 @@ Content-Description: description3
 contents.data3
 
 
-
+	
 --%s--
\ 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 808d98bf5..249585860 100644
--- a/hphp/test/zend/bad/ext-imap/bug46918.php.expectf
+++ b/hphp/test/zend/bad/ext-imap/bug46918.php.expectf
@@ -1,48 +1,48 @@
 array (
-  0 =>
+  0 => 
   stdClass::__set_state(array(
      'mailbox' => 'iane',
      'host' => 'example.ac.uk',
      'personal' => 'ian eiloart',
   )),
-  1 =>
+  1 => 
   stdClass::__set_state(array(
      'mailbox' => 'shuf6',
      'host' => 'example.ac.uk',
   )),
-  2 =>
+  2 => 
   stdClass::__set_state(array(
      'mailbox' => 'blobby',
      'host' => 'example.com',
   )),
-  3 =>
+  3 => 
   stdClass::__set_state(array(
      'mailbox' => 'ian',
      'host' => 'example.ac.uk',
      'personal' => 'ian,eiloart',
   )),
-  4 =>
+  4 => 
   stdClass::__set_state(array(
      'mailbox' => 'foo',
      'host' => 'example.ac.uk',
      'adl' => '@example.com',
   )),
-  5 =>
+  5 => 
   stdClass::__set_state(array(
      'mailbox' => 'foo',
      'host' => '#',
   )),
-  6 =>
+  6 => 
   stdClass::__set_state(array(
      'mailbox' => 'ian',
      'host' => '-example.com',
   )),
-  7 =>
+  7 => 
   stdClass::__set_state(array(
      'mailbox' => 'ian',
      'host' => 'one',
   )),
-  8 =>
+  8 => 
   stdClass::__set_state(array(
      'mailbox' => 'UNEXPECTED_DATA_AFTER_ADDRESS',
      'host' => '.SYNTAX-ERROR.',
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 d8b98c6a3..3fc4cdf4d 100644
--- a/hphp/test/zend/bad/ext-imap/imap_append_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_append_basic.php
@@ -15,7 +15,7 @@ if (!is_resource($imap_stream)) {
 }
 
 $mb_details = imap_mailboxmsginfo($imap_stream);
-echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n";
+echo "Add a couple of msgs to new mailbox " . $mb_details->Mailbox . "\n"; 
 var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    , "From: webmaster@something.com\r\n"
                    . "To: info@something.com\r\n"
@@ -23,15 +23,15 @@ var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    . "\r\n"
                    . "this is a test message, please ignore\r\n"
                    ));
-
+                   
 var_dump(imap_append($imap_stream, $mb_details->Mailbox
                    , "From: webmaster@something.com\r\n"
                    . "To: info@something.com\r\n"
                    . "Subject: Another test\r\n"
                    . "\r\n"
                    . "this is another test message, please ignore it too!!\r\n"
-                   ));
-
+                   ));     
+                   
 $check = imap_check($imap_stream);
 echo "Msg Count after append : ". $check->Nmsgs . "\n";
 
@@ -40,6 +40,6 @@ var_dump(imap_headers($imap_stream));
 
 imap_close($imap_stream);
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_body.php b/hphp/test/zend/bad/ext-imap/imap_body.php
index 3dca01371..81a9b0324 100644
--- a/hphp/test/zend/bad/ext-imap/imap_body.php
+++ b/hphp/test/zend/bad/ext-imap/imap_body.php
@@ -6,7 +6,7 @@ echo  "Checking with incorrect parameter type\n";
 imap_body('');
 imap_body(false);
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 imap_body($stream_id);
 imap_body($stream_id,-1);
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 8d23d4389..92d22db9d 100644
--- a/hphp/test/zend/bad/ext-imap/imap_body_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_body_basic.php
@@ -15,8 +15,8 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
-
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
+    
 // show body for msg 1
 var_dump(imap_body($imap_stream, 1));
 
@@ -25,6 +25,6 @@ var_dump(imap_body($imap_stream, 1, FT_UID));
 
 imap_close($imap_stream);
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ 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 a82f7c5d1..c4ec84cf4 100644
--- a/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_bodystruct_basic.php
@@ -13,10 +13,10 @@ if (!is_resource($imap_stream)) {
 	exit("TEST FAILED: Unable to create test mailbox\n");
 }
 
-echo "\nGet and validate structure of body part 1\n";
-
-$m = imap_bodystruct($imap_stream, 1, "1");
+echo "\nGet and validate structure of body part 1\n"; 
 
+$m = imap_bodystruct($imap_stream, 1, "1"); 
+ 
 $mandatoryFields = array(
                     'ifsubtype',
                     'ifdescription',
@@ -26,9 +26,9 @@ $mandatoryFields = array(
                     'ifparameters',
                     );
 
-foreach($mandatoryFields as $mf)
+foreach($mandatoryFields as $mf) 
 {
-  if(isValid($m->$mf))
+  if(isValid($m->$mf)) 
   {
     echo "$mf is 0 or 1\n";
   }
@@ -38,29 +38,29 @@ foreach($mandatoryFields as $mf)
   }
 }
 
-if(is_array($m->parameters))
+if(is_array($m->parameters)) 
 {
   echo "parameters is an array\n";
 }
 
 echo "\nTry to get part 4!\n";
-var_dump(imap_bodystruct($imap_stream, 1, "4"));
+var_dump(imap_bodystruct($imap_stream, 1, "4")); 
 
 imap_close($imap_stream);
 
-function isValid($param)
+function isValid($param) 
 {
- if(($param == 0) || ($param == 1))
+ if(($param == 0) || ($param == 1)) 
  {
    $result=true;
  }
  else
  {
    $result=false;
- }
+ } 
 return $result;
 }
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ 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 d2b0dc259..9702f61ac 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
@@ -17,7 +17,7 @@ if (!is_resource($imap_stream)) {
 $check = imap_check($imap_stream);
 echo "Initial msg count in new_mailbox : ". $check->Nmsgs . "\n";
 
-echo "Set some flags\n";
+echo "Set some flags\n"; 
 var_dump(imap_setflag_full($imap_stream, "1,3", "\\Seen \\Answered"));
 var_dump(imap_setflag_full($imap_stream, "2,4", "\\Answered"));
 var_dump(imap_setflag_full($imap_stream, "5,7", "\\Flagged \\Deleted"));
@@ -40,6 +40,6 @@ var_dump(imap_search($imap_stream, "DELETED"));
 
 imap_close($imap_stream);
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ 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 139603b2c..a8d19e205 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_basic.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_close_error.php b/hphp/test/zend/bad/ext-imap/imap_close_error.php
index f14f08f3d..9f84871dd 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_error.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation1.php b/hphp/test/zend/bad/ext-imap/imap_close_variation1.php
index 12ce66be8..fc2f8e6d6 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_variation1.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_variation1.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -52,7 +52,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -62,7 +62,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 62d55f9e8..10b834523 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_variation2.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_variation2.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -50,7 +50,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
diff --git a/hphp/test/zend/bad/ext-imap/imap_close_variation3.php b/hphp/test/zend/bad/ext-imap/imap_close_variation3.php
index 3488554f3..7d28b6fcc 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_variation3.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_variation3.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
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 59b504fc3..5b05472bf 100644
--- a/hphp/test/zend/bad/ext-imap/imap_close_variation4.php
+++ b/hphp/test/zend/bad/ext-imap/imap_close_variation4.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_close(resource $stream_id [, int $options])
- * Description: Close an IMAP stream
+ * Description: Close an IMAP stream 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_createmailbox_basic.php b/hphp/test/zend/bad/ext-imap/imap_createmailbox_basic.php
index 8e3dc56da..2b2577d0b 100644
--- a/hphp/test/zend/bad/ext-imap/imap_createmailbox_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_createmailbox_basic.php
@@ -8,7 +8,7 @@ echo "*** Testing imap_createmailbox() : basic functionality ***\n";
 
 require_once(dirname(__FILE__).'/imap_include.inc');
 
-$imap_stream = imap_open($default_mailbox, $username, $password) or
+$imap_stream = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 $newname = "phpnewbox";
@@ -18,8 +18,8 @@ echo "Newname will be '$newname'\n";
 $newbox = imap_utf7_encode($server.$newname);
 if (imap_createmailbox($imap_stream, $newbox)) {
 
-	echo "Add a couple of msgs to '$newname' mailbox\n";
-	populate_mailbox($imap_stream, $newbox, 2);
+	echo "Add a couple of msgs to '$newname' mailbox\n"; 
+	populate_mailbox($imap_stream, $newbox, 2);	
 
     $status = imap_status($imap_stream, $newbox, SA_ALL);
     if ($status) {
@@ -29,7 +29,7 @@ if (imap_createmailbox($imap_stream, $newbox)) {
         echo "Unseen:      " . $status->unseen      . "\n";
         echo "UIDnext:     " . $status->uidnext     . "\n";
         echo "UIDvalidity: " . $status->uidvalidity . "\n";
-
+       
     } else {
         echo "imap_status on new mailbox failed: " . imap_last_error() . "\n";
     }
diff --git a/hphp/test/zend/bad/ext-imap/imap_errors_basic.php b/hphp/test/zend/bad/ext-imap/imap_errors_basic.php
index 8773b3582..cb58ac18a 100644
--- a/hphp/test/zend/bad/ext-imap/imap_errors_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_errors_basic.php
@@ -6,18 +6,18 @@
 
 echo "*** Testing imap_errors() : basic functionality ***\n";
 require_once(dirname(__FILE__).'/imap_include.inc');
-$password = "bogus"; // invalid password to use in this test
+$password = "bogus"; // invalid password to use in this test 
 
 echo "Issue open with invalid password with normal default number of retries, i.e 3\n";
 $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 3);
 
 echo "List any errors\n";
-var_dump(imap_errors());
+var_dump(imap_errors()); 
 
 echo "\n\nIssue open with invalid password with retries == 1\n";
 $mbox = imap_open($default_mailbox, $username, $password, OP_READONLY, 1);
 
 echo "List any errors\n";
-var_dump(imap_errors());
+var_dump(imap_errors()); 
 ?>
 ===Done===
\ 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 c58e0e24f..f570a99f6 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
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
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 55615a3d4..4ccd78cbe 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
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php
index 537105e32..7d6d65aa7 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation1.php
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -56,7 +56,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -66,7 +66,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 92bd70c4f..b2b27443a 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
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -60,7 +60,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -70,7 +70,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 6285e0a7f..bbf2b394b 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
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers of the given message sequence
+ * Description: Read an overview of the information in the headers of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -21,13 +21,13 @@ $msg_uid = imap_uid($stream_id, $msg_no);
 
 $options = array ('1',
                   true,
-                  1.000000000000001,
-                  0.00001e5,
-                  PHP_INT_MAX,
+                  1.000000000000001, 
+                  0.00001e5, 
+                  PHP_INT_MAX, 
                   -PHP_INT_MAX
                  );
 
-// iterate over each element of $options array
+// iterate over each element of $options array 
 $iterator = 1;
 imap_check($stream_id);
 foreach($options as $option) {
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php
index 018a2068c..1e792dda4 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetch_overview_variation4.php
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
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 82af73bb4..8dda6d0fd 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
@@ -1,7 +1,7 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers
- * of the given message sequence
+ * Description: Read an overview of the information in the headers 
+ * of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -28,7 +28,7 @@ foreach($sequences as $msg_no) {
 		foreach($overview as $ov) {
 			echo "\n";
 			displayOverviewFields($ov);
-		 }
+       		 }
         }
 }
 
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 5211535d4..d517b3ffc 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
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : array imap_fetch_overview(resource $stream_id, int $msg_no [, int $options])
- * Description: Read an overview of the information in the headers of the given message sequence
+ * Description: Read an overview of the information in the headers of the given message sequence 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -40,17 +40,17 @@ function create_multipart_message($imap_stream, $mailbox) {
 
 	$part1["type"] = TYPEMULTIPART;
 	$part1["subtype"] = "mixed";
-
+		
 	$part2["type"] = TYPETEXT;
 	$part2["subtype"] = "plain";
 	$part2["description"] = "imap_mail_compose() function";
 	$part2["contents.data"] = "message 1:xxxxxxxxxxxxxxxxxxxxxxxxxx";
-
+		
 	$part3["type"] = TYPETEXT;
 	$part3["subtype"] = "plain";
 	$part3["description"] = "Example";
 	$part3["contents.data"] = "message 2:yyyyyyyyyyyyyyyyyyyyyyyyyy";
-
+		
 	$file_handle = fopen(__FILE__, 'r+');
 	$file_size = 1;
 
@@ -62,12 +62,12 @@ function create_multipart_message($imap_stream, $mailbox) {
 	$part4['disposition'] = array ('filename' => 'Test');
 	$part4['type.parameters'] = array('name' => 'Test');
 	$part4["contents.data"] = base64_encode(fread($file_handle, 1));
-
+		
 	$body[1] = $part1;
 	$body[2] = $part2;
 	$body[3] = $part3;
 	$body[4] = $part4;
-
+		
 	$msg = imap_mail_compose($envelope, $body);
 
 	if (imap_append($imap_stream, $mailbox, $msg) === false) {
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 9f7b635a3..e71450f45 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_basic.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *           [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -27,14 +27,14 @@ foreach ($options as $key => $option) {
 		$msg_uid = imap_uid($stream_id, $msg_no);
 		var_dump( imap_fetchbody($stream_id, $msg_uid, $section, $option) );
 		break;
-
+		
 		case 'FT_PEEK';
 		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
 		$overview = imap_fetch_overview($stream_id, 1);
 		echo "Seen Flag: ";
 		var_dump( $overview[0]->seen );
 		break;
-
+		
 		case 'FT_INTERNAL';
 		var_dump( imap_fetchbody($stream_id, $msg_no, $section, $option) );
 		break;
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 0399e50c2..2121db4f4 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_error.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  :string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  :string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *          [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php
index a2247e6a0..7924acfdd 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation1.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *           [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -57,7 +57,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -67,7 +67,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 aeb078161..6670b5176 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation2.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *           [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 443f22b78..c06951d4d 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation3.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *           [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -59,7 +59,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -69,7 +69,7 @@ $inputs = array(
 /*19*/ "string",
        'string',
        $heredoc,
-
+       
        // object data
 /*22*/ new classA(),
 
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 22797f8f1..80d907d7e 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation4.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -20,8 +20,8 @@ $msg_uid = imap_uid($stream_id, $msg_no);
 $section = 1;
 
 //Note: the first four values are valid as they will all be cast to 1L.
-$options = array ('1', true,
-                  1.000000000000001, 0.00001e5,
+$options = array ('1', true, 
+                  1.000000000000001, 0.00001e5, 
                   PHP_INT_MAX, -PHP_INT_MAX);
 
 // iterate over each element of $options array to test whether FT_UID is set
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php
index 0d004e416..d101dd4b9 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation5.php
@@ -1,7 +1,7 @@
 <?php
-/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section
+/* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section 
  *           [, int options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
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 b3266b3d9..fa43016b7 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchbody_variation6.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchbody(resource $stream_id, int $msg_no, string $section [, int $options])
- * Description: Get a specific body section
+ * Description: Get a specific body section 
  * Source code: ext/imap/php_imap.c
  */
 
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 219c724ef..ab724411e 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_basic.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -10,7 +10,7 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 // Initialise all required variables
 $stream_id = setup_test_mailbox('', 1, $mailbox, 'multiPart'); // setup temp mailbox with 1 msg
 $msg_no = 1;
-$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL,
+$options = array('FT_UID' => FT_UID, 'FT_INTERNAL' => FT_INTERNAL, 
                  'FT_PREFETCHTEXT' => FT_PREFETCHTEXT);
 
 // Calling imap_fetchheader() with all possible arguments
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php
index ca1923524..678f95954 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_error.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php
index 88bf81d81..c584c5d61 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation1.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -71,14 +71,14 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-
+       
        // array data
 /*21*/ array(),
        $index_array,
        $assoc_array,
        array('foo', $index_array, $assoc_array),
-
-
+       
+       
        // object data
 /*25*/ new classA(),
 
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 55cac054e..c54024a9e 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation2.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -62,7 +62,7 @@ $inputs = array(
        false,
        TRUE,
        FALSE,
-
+       
        // empty data
 /*16*/ "",
        '',
@@ -71,14 +71,14 @@ $inputs = array(
 /*18*/ "string",
        'string',
        $heredoc,
-
+       
        // array data
 /*21*/ array(),
        $index_array,
        $assoc_array,
        array('foo', $index_array, $assoc_array),
-
-
+       
+       
        // object data
 /*25*/ new classA(),
 
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 d4f69170f..196fd4d69 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation3.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -19,8 +19,8 @@ $stream_id = setup_test_mailbox('', 1); // set up temporary mailbox with one sim
 $msg_no = 1;
 $msg_uid = imap_uid($stream_id, $msg_no);
 
-$options = array ('1', true,
-                  1.000000000000001, 0.00001e5,
+$options = array ('1', true, 
+                  1.000000000000001, 0.00001e5, 
                   PHP_INT_MAX, -PHP_INT_MAX);
 
 // iterate over each element of $options array to test whether FT_UID is set
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php
index a9da76f39..d5f3c0f27 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation4.php
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
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 b978afb06..a9844d396 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchheader_variation5.php
@@ -1,11 +1,11 @@
 <?php
 /* Prototype  : string imap_fetchheader(resource $stream_id, int $msg_no [, int $options])
- * Description: Get the full unfiltered header for a message
+ * Description: Get the full unfiltered header for a message 
  * Source code: ext/imap/php_imap.c
  */
 
 /*
- * Pass different integers and strings as $msg_no argument
+ * Pass different integers and strings as $msg_no argument 
  * to test behaviour of imap_fetchheader()
  */
 
@@ -17,7 +17,7 @@ $stream_id = setup_test_mailbox('', 3, $mailbox, 'notSimple'); // set up temp ma
 
 $sequences = array (0,     4, // out of range
                     '1,3', '1:3', // message sequences instead of numbers
-                    );
+                    ); 
 
 foreach($sequences as $msg_no) {
 	echo "\n-- \$msg_no is $msg_no --\n";
diff --git a/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php b/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php
index 19fd24c47..d876dd187 100644
--- a/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_fetchstructure_basic.php
@@ -28,6 +28,6 @@ var_dump($z->lines);
 var_dump(is_object($z->parameters));
 
 imap_close($stream_id);
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_gc_error.php b/hphp/test/zend/bad/ext-imap/imap_gc_error.php
index 7d8b0775c..f5919a16d 100644
--- a/hphp/test/zend/bad/ext-imap/imap_gc_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_gc_error.php
@@ -7,7 +7,7 @@ imap_gc('', false);
 imap_gc(false, false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 imap_gc($stream_id, -1);
 
diff --git a/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php b/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php
index 30501ac82..10a372df4 100644
--- a/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_getsubscribed_basic.php
@@ -7,7 +7,7 @@ imap_getsubscribed('');
 imap_getsubscribed(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_getsubscribed($stream_id);
@@ -28,6 +28,6 @@ var_dump(is_array($z));
 var_dump($z[0]);
 
 imap_close($stream_id);
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_headerinfo_basic.php b/hphp/test/zend/bad/ext-imap/imap_headerinfo_basic.php
index 5230aec69..773ad2f03 100644
--- a/hphp/test/zend/bad/ext-imap/imap_headerinfo_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_headerinfo_basic.php
@@ -7,7 +7,7 @@ $z = imap_headerinfo($stream_id, 1);
 
 $fields = array ('toaddress','to','fromaddress','from',
 'reply_toaddress','reply_to',
-	'senderaddress', 'sender',
+	'senderaddress', 'sender', 
 'subject','Subject',
 	'Recent','Unseen','Flagged','Answered','Deleted','Draft',
 	'Msgno','MailDate','Size','udate');
@@ -73,6 +73,6 @@ var_dump($z->udate);
 
 imap_close($stream_id);
 
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php b/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php
index b30e7f64a..1d6ac52a5 100644
--- a/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_headerinfo_error.php
@@ -7,9 +7,9 @@ imap_headerinfo('');
 imap_headerinfo(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-
+	
 imap_headerinfo($stream_id);
 
 imap_close($stream_id);
diff --git a/hphp/test/zend/bad/ext-imap/imap_list_basic.php b/hphp/test/zend/bad/ext-imap/imap_list_basic.php
index b5802c949..bce88e8b1 100644
--- a/hphp/test/zend/bad/ext-imap/imap_list_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_list_basic.php
@@ -7,7 +7,7 @@ imap_list('');
 imap_list(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_list($stream_id);
diff --git a/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php b/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php
index 7415c7d6d..d866a2ac0 100644
--- a/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_lsub_basic.php
@@ -7,7 +7,7 @@ imap_lsub('');
 imap_lsub(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
 
 imap_lsub($stream_id);
@@ -28,6 +28,6 @@ var_dump(is_array($z));
 var_dump($z[0]);
 
 imap_close($stream_id);
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_copy.php b/hphp/test/zend/bad/ext-imap/imap_mail_copy.php
index dfd89facf..e955672d1 100644
--- a/hphp/test/zend/bad/ext-imap/imap_mail_copy.php
+++ b/hphp/test/zend/bad/ext-imap/imap_mail_copy.php
@@ -13,9 +13,9 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 
 
 echo "Test with IMAP server\n";
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-
+	
 var_dump(imap_mail_copy($stream_id));
 var_dump(imap_mail_copy($stream_id,-1));
 var_dump(imap_mail_copy($stream_id, ''));
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 ed7d8516a..db1017f2a 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
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_mail_copy  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
- * Description: Copies mail messages specified by msglist  to specified mailbox.
+ * Description: Copies mail messages specified by msglist  to specified mailbox. 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -16,12 +16,12 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
 
 var_dump(imap_mail_copy($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
 
 imap_close($imap_stream);
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_mail_move.php b/hphp/test/zend/bad/ext-imap/imap_mail_move.php
index f3ce0cc5a..8724f20ed 100644
--- a/hphp/test/zend/bad/ext-imap/imap_mail_move.php
+++ b/hphp/test/zend/bad/ext-imap/imap_mail_move.php
@@ -13,9 +13,9 @@ require_once(dirname(__FILE__).'/imap_include.inc');
 
 
 echo "Test with IMAP server\n";
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-
+	
 var_dump(imap_mail_move($stream_id));
 var_dump(imap_mail_move($stream_id,-1));
 var_dump(imap_mail_move($stream_id, ''));
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 bb8d7be70..e8a61b291 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
@@ -1,6 +1,6 @@
 <?php
 /* Prototype  : bool imap_mail_move  ( resource $imap_stream  , string $msglist  , string $mailbox  [, int $options = 0  ] )
- * Description: Copies mail messages specified by msglist  to specified mailbox.
+ * Description: Copies mail messages specified by msglist  to specified mailbox. 
  * Source code: ext/imap/php_imap.c
  */
 
@@ -16,12 +16,12 @@ if (!is_resource($imap_stream)) {
 }
 
 $check = imap_check($imap_stream);
-echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";
+echo "Msg Count in new mailbox: ". $check->Nmsgs . "\n";    
 
 var_dump(imap_mail_move($imap_stream, '1', 'INBOX.'.$mailbox_prefix));
 
 imap_close($imap_stream);
 ?>
-===Done===<?php
+===Done===<?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php b/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php
index ea330859a..64f70f21c 100644
--- a/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_renamemailbox_basic.php
@@ -8,7 +8,7 @@ imap_renamemailbox(false);
 
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-
+	
 $stream_id = setup_test_mailbox('', 1);
 
 if (!is_resource($stream_id)) {
@@ -32,6 +32,6 @@ var_dump(imap_createmailbox($stream_id, $newbox.'.test'));
 var_dump(imap_renamemailbox($stream_id, $newbox.'.test', $newbox.'.testd'));
 
 imap_close($stream_id);
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_rfc822_parse_headers_basic.php b/hphp/test/zend/bad/ext-imap/imap_rfc822_parse_headers_basic.php
index c32299bf6..590e055ce 100644
--- a/hphp/test/zend/bad/ext-imap/imap_rfc822_parse_headers_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_rfc822_parse_headers_basic.php
@@ -7,7 +7,7 @@ $z = imap_headerinfo($stream_id, 1);
 
 $fields = array ('toaddress','to','fromaddress','from',
 'reply_toaddress','reply_to',
-	'senderaddress', 'sender',
+	'senderaddress', 'sender', 
 'subject','Subject',
 	'MailDate','Size','udate');
 
@@ -73,6 +73,6 @@ var_dump($z->udate);
 
 imap_close($stream_id);
 
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php b/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php
index c47d3812d..9458ddfe4 100644
--- a/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_savebody_basic.php
@@ -26,7 +26,7 @@ var_dump($z);
 echo "Size: ".filesize($file)."\n";
 
 imap_close($stream_id);
-?><?php
+?><?php 
 @unlink(dirname(__FILE__).'/tmpsavebody.txt');
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_undelete_basic.php b/hphp/test/zend/bad/ext-imap/imap_undelete_basic.php
index 51b7606e1..787caf61f 100644
--- a/hphp/test/zend/bad/ext-imap/imap_undelete_basic.php
+++ b/hphp/test/zend/bad/ext-imap/imap_undelete_basic.php
@@ -9,6 +9,6 @@ var_dump(imap_undelete($stream_id, 1));
 
 imap_close($stream_id);
 
-?><?php
+?><?php 
 require_once('clean.inc');
 ?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-imap/imap_undelete_error.php b/hphp/test/zend/bad/ext-imap/imap_undelete_error.php
index e156406e4..fa36cb073 100644
--- a/hphp/test/zend/bad/ext-imap/imap_undelete_error.php
+++ b/hphp/test/zend/bad/ext-imap/imap_undelete_error.php
@@ -7,9 +7,9 @@ imap_undelete('');
 imap_undelete(false);
 
 require_once(dirname(__FILE__).'/imap_include.inc');
-$stream_id = imap_open($default_mailbox, $username, $password) or
+$stream_id = imap_open($default_mailbox, $username, $password) or 
 	die("Cannot connect to mailbox $default_mailbox: " . imap_last_error());
-
+	
 imap_undelete($stream_id);
 
 imap_close($stream_id);
diff --git a/hphp/test/zend/bad/tests-classes/type_hinting_005a.php b/hphp/test/zend/bad/tests-classes/type_hinting_005a.php
new file mode 100644
index 000000000..a5835b750
--- /dev/null
+++ b/hphp/test/zend/bad/tests-classes/type_hinting_005a.php
@@ -0,0 +1,10 @@
+<?php
+Class C { function f(array $a) {} }
+
+echo "Compatible hint.\n";
+Class D1 extends C { function f(array $a) {} }
+
+echo "Class hint, should be array.\n";
+Class D2 extends C { function f(SomeClass $a) {} }
+?>
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-classes/type_hinting_005a.php.expectf b/hphp/test/zend/bad/tests-classes/type_hinting_005a.php.expectf
new file mode 100644
index 000000000..c9214e192
--- /dev/null
+++ b/hphp/test/zend/bad/tests-classes/type_hinting_005a.php.expectf
@@ -0,0 +1,4 @@
+Strict Standards: Declaration of D2::f() should be compatible with C::f(array $a) in hphp/test/zend/bad/tests-classes/type_hinting_005a.php on line 8
+Compatible hint.
+Class hint, should be array.
+==DONE==
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-func/010.php b/hphp/test/zend/bad/tests-func/010.php
deleted file mode 100644
index 9b4073284..000000000
--- a/hphp/test/zend/bad/tests-func/010.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-// the stack size + some random constant
-$boundary = 64*1024;
-$limit    = $boundary+42;
-
-
-function test($a,$b)
-{
-	var_dump($a === $b);
-	test2($a,$b);
-}
-
-function test2($a, $b)
-{
-	if ($a !== $b) {
-		var_dump("something went wrong: $a !== $b");
-	}
-}
-
-
-// generate the function
-$str = "<?php\nfunction x(";
-
-for($i=0; $i < $limit; ++$i) {
-	$str .= '$v'.dechex($i).($i===($limit-1) ? '' : ',');
-}
-
-$str .= ') {
-	test($v42, \'42\');
-	test(\'4000\', $v4000);
-	test2($v300, \'300\');
-	test($v0, \'0\'); // first
-	test($v'.dechex($limit-1).", '".dechex($limit-1).'\'); // last
-	test($v'.dechex($boundary).", '".dechex($boundary).'\'); //boundary
-	test($v'.dechex($boundary+1).", '".dechex($boundary+1).'\'); //boundary+1
-	test($v'.dechex($boundary-1).", '".dechex($boundary-1).'\'); //boundary-1
-}';
-
-// generate the function call
-$str .= "\n\nx(";
-
-for($i=0; $i< $limit; ++$i) {
-	$str .= "'".dechex($i)."'".($i===($limit-1) ? '' : ',');
-}
-
-$str .= ");\n";
-
-$filename = dirname(__FILE__).'/010-file.php';
-file_put_contents(dirname(__FILE__).'/010-file.php', $str);
-unset($str);
-
-include($filename);
-
-echo "Done\n";
-
-?><?php
-@unlink(dirname(__FILE__).'/010-file.php');
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-func/010.php.expectf b/hphp/test/zend/bad/tests-func/010.php.expectf
deleted file mode 100644
index 372b89541..000000000
--- a/hphp/test/zend/bad/tests-func/010.php.expectf
+++ /dev/null
@@ -1,8 +0,0 @@
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php b/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php
deleted file mode 100644
index c50fc4fec..000000000
--- a/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- 
-define("MAX_64Bit", 9223372036854775807);
-define("MAX_32Bit", 2147483647);
-define("MIN_64Bit", -9223372036854775807 - 1);
-define("MIN_32Bit", -2147483647 - 1);
-
-$longVals = array(
-    MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
-    MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
-);
-
-$otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MAX_64Bit);
-
-error_reporting(E_ERROR);
-
-foreach ($longVals as $longVal) {
-   foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal / $otherVal ---\n";   
-      var_dump($longVal/$otherVal);
-   }
-}
-
-foreach ($otherVals as $otherVal) {
-   foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal / $longVal ---\n";   
-      var_dump($otherVal/$longVal);
-   }
-}
-   
-?>
-===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php.expectf b/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php.expectf
deleted file mode 100644
index 3c2cff852..000000000
--- a/hphp/test/zend/bad/tests-lang-operators/divide_basiclong_64bit.php.expectf
+++ /dev/null
@@ -1,541 +0,0 @@
---- testing: 9223372036854775807 / 0 ---
-bool(false)
---- testing: 9223372036854775807 / 1 ---
-int(9223372036854775807)
---- testing: 9223372036854775807 / -1 ---
-int(-9223372036854775807)
---- testing: 9223372036854775807 / 7 ---
-int(1317624576693539401)
---- testing: 9223372036854775807 / 9 ---
-float(1.0248191152061E+18)
---- testing: 9223372036854775807 / 65 ---
-float(1.4189803133623E+17)
---- testing: 9223372036854775807 / -44 ---
-float(-2.096220917467E+17)
---- testing: 9223372036854775807 / 2147483647 ---
-float(4294967298)
---- testing: 9223372036854775807 / 9223372036854775807 ---
-int(1)
---- testing: -9223372036854775808 / 0 ---
-bool(false)
---- testing: -9223372036854775808 / 1 ---
-int(-9223372036854775808)
---- testing: -9223372036854775808 / -1 ---
-float(9.2233720368548E+18)
---- testing: -9223372036854775808 / 7 ---
-float(-1.3176245766935E+18)
---- testing: -9223372036854775808 / 9 ---
-float(-1.0248191152061E+18)
---- testing: -9223372036854775808 / 65 ---
-float(-1.4189803133623E+17)
---- testing: -9223372036854775808 / -44 ---
-float(2.096220917467E+17)
---- testing: -9223372036854775808 / 2147483647 ---
-float(-4294967298)
---- testing: -9223372036854775808 / 9223372036854775807 ---
-float(-1)
---- testing: 2147483647 / 0 ---
-bool(false)
---- testing: 2147483647 / 1 ---
-int(2147483647)
---- testing: 2147483647 / -1 ---
-int(-2147483647)
---- testing: 2147483647 / 7 ---
-float(306783378.14286)
---- testing: 2147483647 / 9 ---
-float(238609294.11111)
---- testing: 2147483647 / 65 ---
-float(33038209.953846)
---- testing: 2147483647 / -44 ---
-float(-48806446.522727)
---- testing: 2147483647 / 2147483647 ---
-int(1)
---- testing: 2147483647 / 9223372036854775807 ---
-float(2.3283064354545E-10)
---- testing: -2147483648 / 0 ---
-bool(false)
---- testing: -2147483648 / 1 ---
-int(-2147483648)
---- testing: -2147483648 / -1 ---
-int(2147483648)
---- testing: -2147483648 / 7 ---
-float(-306783378.28571)
---- testing: -2147483648 / 9 ---
-float(-238609294.22222)
---- testing: -2147483648 / 65 ---
-float(-33038209.969231)
---- testing: -2147483648 / -44 ---
-float(48806446.545455)
---- testing: -2147483648 / 2147483647 ---
-float(-1.0000000004657)
---- testing: -2147483648 / 9223372036854775807 ---
-float(-2.3283064365387E-10)
---- testing: 9223372034707292160 / 0 ---
-bool(false)
---- testing: 9223372034707292160 / 1 ---
-int(9223372034707292160)
---- testing: 9223372034707292160 / -1 ---
-int(-9223372034707292160)
---- testing: 9223372034707292160 / 7 ---
-float(1.3176245763868E+18)
---- testing: 9223372034707292160 / 9 ---
-float(1.0248191149675E+18)
---- testing: 9223372034707292160 / 65 ---
-float(1.4189803130319E+17)
---- testing: 9223372034707292160 / -44 ---
-float(-2.0962209169789E+17)
---- testing: 9223372034707292160 / 2147483647 ---
-float(4294967297)
---- testing: 9223372034707292160 / 9223372036854775807 ---
-float(0.99999999976717)
---- testing: -9223372034707292160 / 0 ---
-bool(false)
---- testing: -9223372034707292160 / 1 ---
-int(-9223372034707292160)
---- testing: -9223372034707292160 / -1 ---
-int(9223372034707292160)
---- testing: -9223372034707292160 / 7 ---
-float(-1.3176245763868E+18)
---- testing: -9223372034707292160 / 9 ---
-float(-1.0248191149675E+18)
---- testing: -9223372034707292160 / 65 ---
-float(-1.4189803130319E+17)
---- testing: -9223372034707292160 / -44 ---
-float(2.0962209169789E+17)
---- testing: -9223372034707292160 / 2147483647 ---
-float(-4294967297)
---- testing: -9223372034707292160 / 9223372036854775807 ---
-float(-0.99999999976717)
---- testing: 2147483648 / 0 ---
-bool(false)
---- testing: 2147483648 / 1 ---
-int(2147483648)
---- testing: 2147483648 / -1 ---
-int(-2147483648)
---- testing: 2147483648 / 7 ---
-float(306783378.28571)
---- testing: 2147483648 / 9 ---
-float(238609294.22222)
---- testing: 2147483648 / 65 ---
-float(33038209.969231)
---- testing: 2147483648 / -44 ---
-float(-48806446.545455)
---- testing: 2147483648 / 2147483647 ---
-float(1.0000000004657)
---- testing: 2147483648 / 9223372036854775807 ---
-float(2.3283064365387E-10)
---- testing: -2147483649 / 0 ---
-bool(false)
---- testing: -2147483649 / 1 ---
-int(-2147483649)
---- testing: -2147483649 / -1 ---
-int(2147483649)
---- testing: -2147483649 / 7 ---
-float(-306783378.42857)
---- testing: -2147483649 / 9 ---
-float(-238609294.33333)
---- testing: -2147483649 / 65 ---
-float(-33038209.984615)
---- testing: -2147483649 / -44 ---
-float(48806446.568182)
---- testing: -2147483649 / 2147483647 ---
-float(-1.0000000009313)
---- testing: -2147483649 / 9223372036854775807 ---
-float(-2.3283064376229E-10)
---- testing: 4294967294 / 0 ---
-bool(false)
---- testing: 4294967294 / 1 ---
-int(4294967294)
---- testing: 4294967294 / -1 ---
-int(-4294967294)
---- testing: 4294967294 / 7 ---
-float(613566756.28571)
---- testing: 4294967294 / 9 ---
-float(477218588.22222)
---- testing: 4294967294 / 65 ---
-float(66076419.907692)
---- testing: 4294967294 / -44 ---
-float(-97612893.045455)
---- testing: 4294967294 / 2147483647 ---
-int(2)
---- testing: 4294967294 / 9223372036854775807 ---
-float(4.656612870909E-10)
---- testing: 4294967295 / 0 ---
-bool(false)
---- testing: 4294967295 / 1 ---
-int(4294967295)
---- testing: 4294967295 / -1 ---
-int(-4294967295)
---- testing: 4294967295 / 7 ---
-float(613566756.42857)
---- testing: 4294967295 / 9 ---
-float(477218588.33333)
---- testing: 4294967295 / 65 ---
-float(66076419.923077)
---- testing: 4294967295 / -44 ---
-float(-97612893.068182)
---- testing: 4294967295 / 2147483647 ---
-float(2.0000000004657)
---- testing: 4294967295 / 9223372036854775807 ---
-float(4.6566128719932E-10)
---- testing: 4294967293 / 0 ---
-bool(false)
---- testing: 4294967293 / 1 ---
-int(4294967293)
---- testing: 4294967293 / -1 ---
-int(-4294967293)
---- testing: 4294967293 / 7 ---
-float(613566756.14286)
---- testing: 4294967293 / 9 ---
-float(477218588.11111)
---- testing: 4294967293 / 65 ---
-float(66076419.892308)
---- testing: 4294967293 / -44 ---
-float(-97612893.022727)
---- testing: 4294967293 / 2147483647 ---
-float(1.9999999995343)
---- testing: 4294967293 / 9223372036854775807 ---
-float(4.6566128698248E-10)
---- testing: 9223372036854775806 / 0 ---
-bool(false)
---- testing: 9223372036854775806 / 1 ---
-int(9223372036854775806)
---- testing: 9223372036854775806 / -1 ---
-int(-9223372036854775806)
---- testing: 9223372036854775806 / 7 ---
-float(1.3176245766935E+18)
---- testing: 9223372036854775806 / 9 ---
-float(1.0248191152061E+18)
---- testing: 9223372036854775806 / 65 ---
-float(1.4189803133623E+17)
---- testing: 9223372036854775806 / -44 ---
-float(-2.096220917467E+17)
---- testing: 9223372036854775806 / 2147483647 ---
-int(4294967298)
---- testing: 9223372036854775806 / 9223372036854775807 ---
-float(1)
---- testing: 9.2233720368548E+18 / 0 ---
-bool(false)
---- testing: 9.2233720368548E+18 / 1 ---
-float(9.2233720368548E+18)
---- testing: 9.2233720368548E+18 / -1 ---
-float(-9.2233720368548E+18)
---- testing: 9.2233720368548E+18 / 7 ---
-float(1.3176245766935E+18)
---- testing: 9.2233720368548E+18 / 9 ---
-float(1.0248191152061E+18)
---- testing: 9.2233720368548E+18 / 65 ---
-float(1.4189803133623E+17)
---- testing: 9.2233720368548E+18 / -44 ---
-float(-2.096220917467E+17)
---- testing: 9.2233720368548E+18 / 2147483647 ---
-float(4294967298)
---- testing: 9.2233720368548E+18 / 9223372036854775807 ---
-float(1)
---- testing: -9223372036854775807 / 0 ---
-bool(false)
---- testing: -9223372036854775807 / 1 ---
-int(-9223372036854775807)
---- testing: -9223372036854775807 / -1 ---
-int(9223372036854775807)
---- testing: -9223372036854775807 / 7 ---
-int(-1317624576693539401)
---- testing: -9223372036854775807 / 9 ---
-float(-1.0248191152061E+18)
---- testing: -9223372036854775807 / 65 ---
-float(-1.4189803133623E+17)
---- testing: -9223372036854775807 / -44 ---
-float(2.096220917467E+17)
---- testing: -9223372036854775807 / 2147483647 ---
-float(-4294967298)
---- testing: -9223372036854775807 / 9223372036854775807 ---
-int(-1)
---- testing: -9.2233720368548E+18 / 0 ---
-bool(false)
---- testing: -9.2233720368548E+18 / 1 ---
-float(-9.2233720368548E+18)
---- testing: -9.2233720368548E+18 / -1 ---
-float(9.2233720368548E+18)
---- testing: -9.2233720368548E+18 / 7 ---
-float(-1.3176245766935E+18)
---- testing: -9.2233720368548E+18 / 9 ---
-float(-1.0248191152061E+18)
---- testing: -9.2233720368548E+18 / 65 ---
-float(-1.4189803133623E+17)
---- testing: -9.2233720368548E+18 / -44 ---
-float(2.096220917467E+17)
---- testing: -9.2233720368548E+18 / 2147483647 ---
-float(-4294967298)
---- testing: -9.2233720368548E+18 / 9223372036854775807 ---
-float(-1)
---- testing: 0 / 9223372036854775807 ---
-int(0)
---- testing: 0 / -9223372036854775808 ---
-int(0)
---- testing: 0 / 2147483647 ---
-int(0)
---- testing: 0 / -2147483648 ---
-int(0)
---- testing: 0 / 9223372034707292160 ---
-int(0)
---- testing: 0 / -9223372034707292160 ---
-int(0)
---- testing: 0 / 2147483648 ---
-int(0)
---- testing: 0 / -2147483649 ---
-int(0)
---- testing: 0 / 4294967294 ---
-int(0)
---- testing: 0 / 4294967295 ---
-int(0)
---- testing: 0 / 4294967293 ---
-int(0)
---- testing: 0 / 9223372036854775806 ---
-int(0)
---- testing: 0 / 9.2233720368548E+18 ---
-float(0)
---- testing: 0 / -9223372036854775807 ---
-int(0)
---- testing: 0 / -9.2233720368548E+18 ---
-float(-0)
---- testing: 1 / 9223372036854775807 ---
-float(1.0842021724855E-19)
---- testing: 1 / -9223372036854775808 ---
-float(-1.0842021724855E-19)
---- testing: 1 / 2147483647 ---
-float(4.6566128752458E-10)
---- testing: 1 / -2147483648 ---
-float(-4.6566128730774E-10)
---- testing: 1 / 9223372034707292160 ---
-float(1.0842021727379E-19)
---- testing: 1 / -9223372034707292160 ---
-float(-1.0842021727379E-19)
---- testing: 1 / 2147483648 ---
-float(4.6566128730774E-10)
---- testing: 1 / -2147483649 ---
-float(-4.656612870909E-10)
---- testing: 1 / 4294967294 ---
-float(2.3283064376229E-10)
---- testing: 1 / 4294967295 ---
-float(2.3283064370808E-10)
---- testing: 1 / 4294967293 ---
-float(2.328306438165E-10)
---- testing: 1 / 9223372036854775806 ---
-float(1.0842021724855E-19)
---- testing: 1 / 9.2233720368548E+18 ---
-float(1.0842021724855E-19)
---- testing: 1 / -9223372036854775807 ---
-float(-1.0842021724855E-19)
---- testing: 1 / -9.2233720368548E+18 ---
-float(-1.0842021724855E-19)
---- testing: -1 / 9223372036854775807 ---
-float(-1.0842021724855E-19)
---- testing: -1 / -9223372036854775808 ---
-float(1.0842021724855E-19)
---- testing: -1 / 2147483647 ---
-float(-4.6566128752458E-10)
---- testing: -1 / -2147483648 ---
-float(4.6566128730774E-10)
---- testing: -1 / 9223372034707292160 ---
-float(-1.0842021727379E-19)
---- testing: -1 / -9223372034707292160 ---
-float(1.0842021727379E-19)
---- testing: -1 / 2147483648 ---
-float(-4.6566128730774E-10)
---- testing: -1 / -2147483649 ---
-float(4.656612870909E-10)
---- testing: -1 / 4294967294 ---
-float(-2.3283064376229E-10)
---- testing: -1 / 4294967295 ---
-float(-2.3283064370808E-10)
---- testing: -1 / 4294967293 ---
-float(-2.328306438165E-10)
---- testing: -1 / 9223372036854775806 ---
-float(-1.0842021724855E-19)
---- testing: -1 / 9.2233720368548E+18 ---
-float(-1.0842021724855E-19)
---- testing: -1 / -9223372036854775807 ---
-float(1.0842021724855E-19)
---- testing: -1 / -9.2233720368548E+18 ---
-float(1.0842021724855E-19)
---- testing: 7 / 9223372036854775807 ---
-float(7.5894152073985E-19)
---- testing: 7 / -9223372036854775808 ---
-float(-7.5894152073985E-19)
---- testing: 7 / 2147483647 ---
-float(3.2596290126721E-9)
---- testing: 7 / -2147483648 ---
-float(-3.2596290111542E-9)
---- testing: 7 / 9223372034707292160 ---
-float(7.5894152091656E-19)
---- testing: 7 / -9223372034707292160 ---
-float(-7.5894152091656E-19)
---- testing: 7 / 2147483648 ---
-float(3.2596290111542E-9)
---- testing: 7 / -2147483649 ---
-float(-3.2596290096363E-9)
---- testing: 7 / 4294967294 ---
-float(1.629814506336E-9)
---- testing: 7 / 4294967295 ---
-float(1.6298145059566E-9)
---- testing: 7 / 4294967293 ---
-float(1.6298145067155E-9)
---- testing: 7 / 9223372036854775806 ---
-float(7.5894152073985E-19)
---- testing: 7 / 9.2233720368548E+18 ---
-float(7.5894152073985E-19)
---- testing: 7 / -9223372036854775807 ---
-float(-7.5894152073985E-19)
---- testing: 7 / -9.2233720368548E+18 ---
-float(-7.5894152073985E-19)
---- testing: 9 / 9223372036854775807 ---
-float(9.7578195523695E-19)
---- testing: 9 / -9223372036854775808 ---
-float(-9.7578195523695E-19)
---- testing: 9 / 2147483647 ---
-float(4.1909515877212E-9)
---- testing: 9 / -2147483648 ---
-float(-4.1909515857697E-9)
---- testing: 9 / 9223372034707292160 ---
-float(9.7578195546415E-19)
---- testing: 9 / -9223372034707292160 ---
-float(-9.7578195546415E-19)
---- testing: 9 / 2147483648 ---
-float(4.1909515857697E-9)
---- testing: 9 / -2147483649 ---
-float(-4.1909515838181E-9)
---- testing: 9 / 4294967294 ---
-float(2.0954757938606E-9)
---- testing: 9 / 4294967295 ---
-float(2.0954757933727E-9)
---- testing: 9 / 4294967293 ---
-float(2.0954757943485E-9)
---- testing: 9 / 9223372036854775806 ---
-float(9.7578195523695E-19)
---- testing: 9 / 9.2233720368548E+18 ---
-float(9.7578195523695E-19)
---- testing: 9 / -9223372036854775807 ---
-float(-9.7578195523695E-19)
---- testing: 9 / -9.2233720368548E+18 ---
-float(-9.7578195523695E-19)
---- testing: 65 / 9223372036854775807 ---
-float(7.0473141211558E-18)
---- testing: 65 / -9223372036854775808 ---
-float(-7.0473141211558E-18)
---- testing: 65 / 2147483647 ---
-float(3.0267983689098E-8)
---- testing: 65 / -2147483648 ---
-float(-3.0267983675003E-8)
---- testing: 65 / 9223372034707292160 ---
-float(7.0473141227966E-18)
---- testing: 65 / -9223372034707292160 ---
-float(-7.0473141227966E-18)
---- testing: 65 / 2147483648 ---
-float(3.0267983675003E-8)
---- testing: 65 / -2147483649 ---
-float(-3.0267983660908E-8)
---- testing: 65 / 4294967294 ---
-float(1.5133991844549E-8)
---- testing: 65 / 4294967295 ---
-float(1.5133991841025E-8)
---- testing: 65 / 4294967293 ---
-float(1.5133991848072E-8)
---- testing: 65 / 9223372036854775806 ---
-float(7.0473141211558E-18)
---- testing: 65 / 9.2233720368548E+18 ---
-float(7.0473141211558E-18)
---- testing: 65 / -9223372036854775807 ---
-float(-7.0473141211558E-18)
---- testing: 65 / -9.2233720368548E+18 ---
-float(-7.0473141211558E-18)
---- testing: -44 / 9223372036854775807 ---
-float(-4.7704895589362E-18)
---- testing: -44 / -9223372036854775808 ---
-float(4.7704895589362E-18)
---- testing: -44 / 2147483647 ---
-float(-2.0489096651082E-8)
---- testing: -44 / -2147483648 ---
-float(2.0489096641541E-8)
---- testing: -44 / 9223372034707292160 ---
-float(-4.7704895600469E-18)
---- testing: -44 / -9223372034707292160 ---
-float(4.7704895600469E-18)
---- testing: -44 / 2147483648 ---
-float(-2.0489096641541E-8)
---- testing: -44 / -2147483649 ---
-float(2.0489096632E-8)
---- testing: -44 / 4294967294 ---
-float(-1.0244548325541E-8)
---- testing: -44 / 4294967295 ---
-float(-1.0244548323156E-8)
---- testing: -44 / 4294967293 ---
-float(-1.0244548327926E-8)
---- testing: -44 / 9223372036854775806 ---
-float(-4.7704895589362E-18)
---- testing: -44 / 9.2233720368548E+18 ---
-float(-4.7704895589362E-18)
---- testing: -44 / -9223372036854775807 ---
-float(4.7704895589362E-18)
---- testing: -44 / -9.2233720368548E+18 ---
-float(4.7704895589362E-18)
---- testing: 2147483647 / 9223372036854775807 ---
-float(2.3283064354545E-10)
---- testing: 2147483647 / -9223372036854775808 ---
-float(-2.3283064354545E-10)
---- testing: 2147483647 / 2147483647 ---
-int(1)
---- testing: 2147483647 / -2147483648 ---
-float(-0.99999999953434)
---- testing: 2147483647 / 9223372034707292160 ---
-float(2.3283064359966E-10)
---- testing: 2147483647 / -9223372034707292160 ---
-float(-2.3283064359966E-10)
---- testing: 2147483647 / 2147483648 ---
-float(0.99999999953434)
---- testing: 2147483647 / -2147483649 ---
-float(-0.99999999906868)
---- testing: 2147483647 / 4294967294 ---
-float(0.5)
---- testing: 2147483647 / 4294967295 ---
-float(0.49999999988358)
---- testing: 2147483647 / 4294967293 ---
-float(0.50000000011642)
---- testing: 2147483647 / 9223372036854775806 ---
-float(2.3283064354545E-10)
---- testing: 2147483647 / 9.2233720368548E+18 ---
-float(2.3283064354545E-10)
---- testing: 2147483647 / -9223372036854775807 ---
-float(-2.3283064354545E-10)
---- testing: 2147483647 / -9.2233720368548E+18 ---
-float(-2.3283064354545E-10)
---- testing: 9223372036854775807 / 9223372036854775807 ---
-int(1)
---- testing: 9223372036854775807 / -9223372036854775808 ---
-float(-1)
---- testing: 9223372036854775807 / 2147483647 ---
-float(4294967298)
---- testing: 9223372036854775807 / -2147483648 ---
-float(-4294967296)
---- testing: 9223372036854775807 / 9223372034707292160 ---
-float(1.0000000002328)
---- testing: 9223372036854775807 / -9223372034707292160 ---
-float(-1.0000000002328)
---- testing: 9223372036854775807 / 2147483648 ---
-float(4294967296)
---- testing: 9223372036854775807 / -2147483649 ---
-float(-4294967294)
---- testing: 9223372036854775807 / 4294967294 ---
-float(2147483649)
---- testing: 9223372036854775807 / 4294967295 ---
-float(2147483648.5)
---- testing: 9223372036854775807 / 4294967293 ---
-float(2147483649.5)
---- testing: 9223372036854775807 / 9223372036854775806 ---
-float(1)
---- testing: 9223372036854775807 / 9.2233720368548E+18 ---
-float(1)
---- testing: 9223372036854775807 / -9223372036854775807 ---
-int(-1)
---- testing: 9223372036854775807 / -9.2233720368548E+18 ---
-float(-1)
-===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php b/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php
deleted file mode 100644
index 32485fa9a..000000000
--- a/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
- 
-define("MAX_64Bit", 9223372036854775807);
-define("MAX_32Bit", 2147483647);
-define("MIN_64Bit", -9223372036854775807 - 1);
-define("MIN_32Bit", -2147483647 - 1);
-
-$longVals = array(
-    MAX_64Bit, MIN_64Bit, MAX_32Bit, MIN_32Bit, MAX_64Bit - MAX_32Bit, MIN_64Bit - MIN_32Bit,
-    MAX_32Bit + 1, MIN_32Bit - 1, MAX_32Bit * 2, (MAX_32Bit * 2) + 1, (MAX_32Bit * 2) - 1, 
-    MAX_64Bit -1, MAX_64Bit + 1, MIN_64Bit + 1, MIN_64Bit - 1
-);
-
-$otherVals = array(0, 1, -1, 7, 9, 65, -44, MAX_32Bit, MAX_64Bit);
-
-error_reporting(E_ERROR);
-
-foreach ($longVals as $longVal) {
-   foreach($otherVals as $otherVal) {
-	   echo "--- testing: $longVal % $otherVal ---\n";   
-      var_dump($longVal%$otherVal);
-   }
-}
-
-foreach ($otherVals as $otherVal) {
-   foreach($longVals as $longVal) {
-	   echo "--- testing: $otherVal % $longVal ---\n";   
-      var_dump($otherVal%$longVal);
-   }
-}
-   
-?>
-===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php.expectf b/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php.expectf
deleted file mode 100644
index cfb67540e..000000000
--- a/hphp/test/zend/bad/tests-lang-operators/modulus_basiclong_64bit.php.expectf
+++ /dev/null
@@ -1,541 +0,0 @@
---- testing: 9223372036854775807 % 0 ---
-bool(false)
---- testing: 9223372036854775807 % 1 ---
-int(0)
---- testing: 9223372036854775807 % -1 ---
-int(0)
---- testing: 9223372036854775807 % 7 ---
-int(0)
---- testing: 9223372036854775807 % 9 ---
-int(7)
---- testing: 9223372036854775807 % 65 ---
-int(7)
---- testing: 9223372036854775807 % -44 ---
-int(7)
---- testing: 9223372036854775807 % 2147483647 ---
-int(1)
---- testing: 9223372036854775807 % 9223372036854775807 ---
-int(0)
---- testing: -9223372036854775808 % 0 ---
-bool(false)
---- testing: -9223372036854775808 % 1 ---
-int(0)
---- testing: -9223372036854775808 % -1 ---
-int(0)
---- testing: -9223372036854775808 % 7 ---
-int(-1)
---- testing: -9223372036854775808 % 9 ---
-int(-8)
---- testing: -9223372036854775808 % 65 ---
-int(-8)
---- testing: -9223372036854775808 % -44 ---
-int(-8)
---- testing: -9223372036854775808 % 2147483647 ---
-int(-2)
---- testing: -9223372036854775808 % 9223372036854775807 ---
-int(-1)
---- testing: 2147483647 % 0 ---
-bool(false)
---- testing: 2147483647 % 1 ---
-int(0)
---- testing: 2147483647 % -1 ---
-int(0)
---- testing: 2147483647 % 7 ---
-int(1)
---- testing: 2147483647 % 9 ---
-int(1)
---- testing: 2147483647 % 65 ---
-int(62)
---- testing: 2147483647 % -44 ---
-int(23)
---- testing: 2147483647 % 2147483647 ---
-int(0)
---- testing: 2147483647 % 9223372036854775807 ---
-int(2147483647)
---- testing: -2147483648 % 0 ---
-bool(false)
---- testing: -2147483648 % 1 ---
-int(0)
---- testing: -2147483648 % -1 ---
-int(0)
---- testing: -2147483648 % 7 ---
-int(-2)
---- testing: -2147483648 % 9 ---
-int(-2)
---- testing: -2147483648 % 65 ---
-int(-63)
---- testing: -2147483648 % -44 ---
-int(-24)
---- testing: -2147483648 % 2147483647 ---
-int(-1)
---- testing: -2147483648 % 9223372036854775807 ---
-int(-2147483648)
---- testing: 9223372034707292160 % 0 ---
-bool(false)
---- testing: 9223372034707292160 % 1 ---
-int(0)
---- testing: 9223372034707292160 % -1 ---
-int(0)
---- testing: 9223372034707292160 % 7 ---
-int(6)
---- testing: 9223372034707292160 % 9 ---
-int(6)
---- testing: 9223372034707292160 % 65 ---
-int(10)
---- testing: 9223372034707292160 % -44 ---
-int(28)
---- testing: 9223372034707292160 % 2147483647 ---
-int(1)
---- testing: 9223372034707292160 % 9223372036854775807 ---
-int(9223372034707292160)
---- testing: -9223372034707292160 % 0 ---
-bool(false)
---- testing: -9223372034707292160 % 1 ---
-int(0)
---- testing: -9223372034707292160 % -1 ---
-int(0)
---- testing: -9223372034707292160 % 7 ---
-int(-6)
---- testing: -9223372034707292160 % 9 ---
-int(-6)
---- testing: -9223372034707292160 % 65 ---
-int(-10)
---- testing: -9223372034707292160 % -44 ---
-int(-28)
---- testing: -9223372034707292160 % 2147483647 ---
-int(-1)
---- testing: -9223372034707292160 % 9223372036854775807 ---
-int(-9223372034707292160)
---- testing: 2147483648 % 0 ---
-bool(false)
---- testing: 2147483648 % 1 ---
-int(0)
---- testing: 2147483648 % -1 ---
-int(0)
---- testing: 2147483648 % 7 ---
-int(2)
---- testing: 2147483648 % 9 ---
-int(2)
---- testing: 2147483648 % 65 ---
-int(63)
---- testing: 2147483648 % -44 ---
-int(24)
---- testing: 2147483648 % 2147483647 ---
-int(1)
---- testing: 2147483648 % 9223372036854775807 ---
-int(2147483648)
---- testing: -2147483649 % 0 ---
-bool(false)
---- testing: -2147483649 % 1 ---
-int(0)
---- testing: -2147483649 % -1 ---
-int(0)
---- testing: -2147483649 % 7 ---
-int(-3)
---- testing: -2147483649 % 9 ---
-int(-3)
---- testing: -2147483649 % 65 ---
-int(-64)
---- testing: -2147483649 % -44 ---
-int(-25)
---- testing: -2147483649 % 2147483647 ---
-int(-2)
---- testing: -2147483649 % 9223372036854775807 ---
-int(-2147483649)
---- testing: 4294967294 % 0 ---
-bool(false)
---- testing: 4294967294 % 1 ---
-int(0)
---- testing: 4294967294 % -1 ---
-int(0)
---- testing: 4294967294 % 7 ---
-int(2)
---- testing: 4294967294 % 9 ---
-int(2)
---- testing: 4294967294 % 65 ---
-int(59)
---- testing: 4294967294 % -44 ---
-int(2)
---- testing: 4294967294 % 2147483647 ---
-int(0)
---- testing: 4294967294 % 9223372036854775807 ---
-int(4294967294)
---- testing: 4294967295 % 0 ---
-bool(false)
---- testing: 4294967295 % 1 ---
-int(0)
---- testing: 4294967295 % -1 ---
-int(0)
---- testing: 4294967295 % 7 ---
-int(3)
---- testing: 4294967295 % 9 ---
-int(3)
---- testing: 4294967295 % 65 ---
-int(60)
---- testing: 4294967295 % -44 ---
-int(3)
---- testing: 4294967295 % 2147483647 ---
-int(1)
---- testing: 4294967295 % 9223372036854775807 ---
-int(4294967295)
---- testing: 4294967293 % 0 ---
-bool(false)
---- testing: 4294967293 % 1 ---
-int(0)
---- testing: 4294967293 % -1 ---
-int(0)
---- testing: 4294967293 % 7 ---
-int(1)
---- testing: 4294967293 % 9 ---
-int(1)
---- testing: 4294967293 % 65 ---
-int(58)
---- testing: 4294967293 % -44 ---
-int(1)
---- testing: 4294967293 % 2147483647 ---
-int(2147483646)
---- testing: 4294967293 % 9223372036854775807 ---
-int(4294967293)
---- testing: 9223372036854775806 % 0 ---
-bool(false)
---- testing: 9223372036854775806 % 1 ---
-int(0)
---- testing: 9223372036854775806 % -1 ---
-int(0)
---- testing: 9223372036854775806 % 7 ---
-int(6)
---- testing: 9223372036854775806 % 9 ---
-int(6)
---- testing: 9223372036854775806 % 65 ---
-int(6)
---- testing: 9223372036854775806 % -44 ---
-int(6)
---- testing: 9223372036854775806 % 2147483647 ---
-int(0)
---- testing: 9223372036854775806 % 9223372036854775807 ---
-int(9223372036854775806)
---- testing: 9.2233720368548E+18 % 0 ---
-bool(false)
---- testing: 9.2233720368548E+18 % 1 ---
-int(0)
---- testing: 9.2233720368548E+18 % -1 ---
-int(0)
---- testing: 9.2233720368548E+18 % 7 ---
-int(-1)
---- testing: 9.2233720368548E+18 % 9 ---
-int(-8)
---- testing: 9.2233720368548E+18 % 65 ---
-int(-8)
---- testing: 9.2233720368548E+18 % -44 ---
-int(-8)
---- testing: 9.2233720368548E+18 % 2147483647 ---
-int(-2)
---- testing: 9.2233720368548E+18 % 9223372036854775807 ---
-int(-1)
---- testing: -9223372036854775807 % 0 ---
-bool(false)
---- testing: -9223372036854775807 % 1 ---
-int(0)
---- testing: -9223372036854775807 % -1 ---
-int(0)
---- testing: -9223372036854775807 % 7 ---
-int(0)
---- testing: -9223372036854775807 % 9 ---
-int(-7)
---- testing: -9223372036854775807 % 65 ---
-int(-7)
---- testing: -9223372036854775807 % -44 ---
-int(-7)
---- testing: -9223372036854775807 % 2147483647 ---
-int(-1)
---- testing: -9223372036854775807 % 9223372036854775807 ---
-int(0)
---- testing: -9.2233720368548E+18 % 0 ---
-bool(false)
---- testing: -9.2233720368548E+18 % 1 ---
-int(0)
---- testing: -9.2233720368548E+18 % -1 ---
-int(0)
---- testing: -9.2233720368548E+18 % 7 ---
-int(-1)
---- testing: -9.2233720368548E+18 % 9 ---
-int(-8)
---- testing: -9.2233720368548E+18 % 65 ---
-int(-8)
---- testing: -9.2233720368548E+18 % -44 ---
-int(-8)
---- testing: -9.2233720368548E+18 % 2147483647 ---
-int(-2)
---- testing: -9.2233720368548E+18 % 9223372036854775807 ---
-int(-1)
---- testing: 0 % 9223372036854775807 ---
-int(0)
---- testing: 0 % -9223372036854775808 ---
-int(0)
---- testing: 0 % 2147483647 ---
-int(0)
---- testing: 0 % -2147483648 ---
-int(0)
---- testing: 0 % 9223372034707292160 ---
-int(0)
---- testing: 0 % -9223372034707292160 ---
-int(0)
---- testing: 0 % 2147483648 ---
-int(0)
---- testing: 0 % -2147483649 ---
-int(0)
---- testing: 0 % 4294967294 ---
-int(0)
---- testing: 0 % 4294967295 ---
-int(0)
---- testing: 0 % 4294967293 ---
-int(0)
---- testing: 0 % 9223372036854775806 ---
-int(0)
---- testing: 0 % 9.2233720368548E+18 ---
-int(0)
---- testing: 0 % -9223372036854775807 ---
-int(0)
---- testing: 0 % -9.2233720368548E+18 ---
-int(0)
---- testing: 1 % 9223372036854775807 ---
-int(1)
---- testing: 1 % -9223372036854775808 ---
-int(1)
---- testing: 1 % 2147483647 ---
-int(1)
---- testing: 1 % -2147483648 ---
-int(1)
---- testing: 1 % 9223372034707292160 ---
-int(1)
---- testing: 1 % -9223372034707292160 ---
-int(1)
---- testing: 1 % 2147483648 ---
-int(1)
---- testing: 1 % -2147483649 ---
-int(1)
---- testing: 1 % 4294967294 ---
-int(1)
---- testing: 1 % 4294967295 ---
-int(1)
---- testing: 1 % 4294967293 ---
-int(1)
---- testing: 1 % 9223372036854775806 ---
-int(1)
---- testing: 1 % 9.2233720368548E+18 ---
-int(1)
---- testing: 1 % -9223372036854775807 ---
-int(1)
---- testing: 1 % -9.2233720368548E+18 ---
-int(1)
---- testing: -1 % 9223372036854775807 ---
-int(-1)
---- testing: -1 % -9223372036854775808 ---
-int(-1)
---- testing: -1 % 2147483647 ---
-int(-1)
---- testing: -1 % -2147483648 ---
-int(-1)
---- testing: -1 % 9223372034707292160 ---
-int(-1)
---- testing: -1 % -9223372034707292160 ---
-int(-1)
---- testing: -1 % 2147483648 ---
-int(-1)
---- testing: -1 % -2147483649 ---
-int(-1)
---- testing: -1 % 4294967294 ---
-int(-1)
---- testing: -1 % 4294967295 ---
-int(-1)
---- testing: -1 % 4294967293 ---
-int(-1)
---- testing: -1 % 9223372036854775806 ---
-int(-1)
---- testing: -1 % 9.2233720368548E+18 ---
-int(-1)
---- testing: -1 % -9223372036854775807 ---
-int(-1)
---- testing: -1 % -9.2233720368548E+18 ---
-int(-1)
---- testing: 7 % 9223372036854775807 ---
-int(7)
---- testing: 7 % -9223372036854775808 ---
-int(7)
---- testing: 7 % 2147483647 ---
-int(7)
---- testing: 7 % -2147483648 ---
-int(7)
---- testing: 7 % 9223372034707292160 ---
-int(7)
---- testing: 7 % -9223372034707292160 ---
-int(7)
---- testing: 7 % 2147483648 ---
-int(7)
---- testing: 7 % -2147483649 ---
-int(7)
---- testing: 7 % 4294967294 ---
-int(7)
---- testing: 7 % 4294967295 ---
-int(7)
---- testing: 7 % 4294967293 ---
-int(7)
---- testing: 7 % 9223372036854775806 ---
-int(7)
---- testing: 7 % 9.2233720368548E+18 ---
-int(7)
---- testing: 7 % -9223372036854775807 ---
-int(7)
---- testing: 7 % -9.2233720368548E+18 ---
-int(7)
---- testing: 9 % 9223372036854775807 ---
-int(9)
---- testing: 9 % -9223372036854775808 ---
-int(9)
---- testing: 9 % 2147483647 ---
-int(9)
---- testing: 9 % -2147483648 ---
-int(9)
---- testing: 9 % 9223372034707292160 ---
-int(9)
---- testing: 9 % -9223372034707292160 ---
-int(9)
---- testing: 9 % 2147483648 ---
-int(9)
---- testing: 9 % -2147483649 ---
-int(9)
---- testing: 9 % 4294967294 ---
-int(9)
---- testing: 9 % 4294967295 ---
-int(9)
---- testing: 9 % 4294967293 ---
-int(9)
---- testing: 9 % 9223372036854775806 ---
-int(9)
---- testing: 9 % 9.2233720368548E+18 ---
-int(9)
---- testing: 9 % -9223372036854775807 ---
-int(9)
---- testing: 9 % -9.2233720368548E+18 ---
-int(9)
---- testing: 65 % 9223372036854775807 ---
-int(65)
---- testing: 65 % -9223372036854775808 ---
-int(65)
---- testing: 65 % 2147483647 ---
-int(65)
---- testing: 65 % -2147483648 ---
-int(65)
---- testing: 65 % 9223372034707292160 ---
-int(65)
---- testing: 65 % -9223372034707292160 ---
-int(65)
---- testing: 65 % 2147483648 ---
-int(65)
---- testing: 65 % -2147483649 ---
-int(65)
---- testing: 65 % 4294967294 ---
-int(65)
---- testing: 65 % 4294967295 ---
-int(65)
---- testing: 65 % 4294967293 ---
-int(65)
---- testing: 65 % 9223372036854775806 ---
-int(65)
---- testing: 65 % 9.2233720368548E+18 ---
-int(65)
---- testing: 65 % -9223372036854775807 ---
-int(65)
---- testing: 65 % -9.2233720368548E+18 ---
-int(65)
---- testing: -44 % 9223372036854775807 ---
-int(-44)
---- testing: -44 % -9223372036854775808 ---
-int(-44)
---- testing: -44 % 2147483647 ---
-int(-44)
---- testing: -44 % -2147483648 ---
-int(-44)
---- testing: -44 % 9223372034707292160 ---
-int(-44)
---- testing: -44 % -9223372034707292160 ---
-int(-44)
---- testing: -44 % 2147483648 ---
-int(-44)
---- testing: -44 % -2147483649 ---
-int(-44)
---- testing: -44 % 4294967294 ---
-int(-44)
---- testing: -44 % 4294967295 ---
-int(-44)
---- testing: -44 % 4294967293 ---
-int(-44)
---- testing: -44 % 9223372036854775806 ---
-int(-44)
---- testing: -44 % 9.2233720368548E+18 ---
-int(-44)
---- testing: -44 % -9223372036854775807 ---
-int(-44)
---- testing: -44 % -9.2233720368548E+18 ---
-int(-44)
---- testing: 2147483647 % 9223372036854775807 ---
-int(2147483647)
---- testing: 2147483647 % -9223372036854775808 ---
-int(2147483647)
---- testing: 2147483647 % 2147483647 ---
-int(0)
---- testing: 2147483647 % -2147483648 ---
-int(2147483647)
---- testing: 2147483647 % 9223372034707292160 ---
-int(2147483647)
---- testing: 2147483647 % -9223372034707292160 ---
-int(2147483647)
---- testing: 2147483647 % 2147483648 ---
-int(2147483647)
---- testing: 2147483647 % -2147483649 ---
-int(2147483647)
---- testing: 2147483647 % 4294967294 ---
-int(2147483647)
---- testing: 2147483647 % 4294967295 ---
-int(2147483647)
---- testing: 2147483647 % 4294967293 ---
-int(2147483647)
---- testing: 2147483647 % 9223372036854775806 ---
-int(2147483647)
---- testing: 2147483647 % 9.2233720368548E+18 ---
-int(2147483647)
---- testing: 2147483647 % -9223372036854775807 ---
-int(2147483647)
---- testing: 2147483647 % -9.2233720368548E+18 ---
-int(2147483647)
---- testing: 9223372036854775807 % 9223372036854775807 ---
-int(0)
---- testing: 9223372036854775807 % -9223372036854775808 ---
-int(9223372036854775807)
---- testing: 9223372036854775807 % 2147483647 ---
-int(1)
---- testing: 9223372036854775807 % -2147483648 ---
-int(2147483647)
---- testing: 9223372036854775807 % 9223372034707292160 ---
-int(2147483647)
---- testing: 9223372036854775807 % -9223372034707292160 ---
-int(2147483647)
---- testing: 9223372036854775807 % 2147483648 ---
-int(2147483647)
---- testing: 9223372036854775807 % -2147483649 ---
-int(1)
---- testing: 9223372036854775807 % 4294967294 ---
-int(1)
---- testing: 9223372036854775807 % 4294967295 ---
-int(2147483647)
---- testing: 9223372036854775807 % 4294967293 ---
-int(2147483650)
---- testing: 9223372036854775807 % 9223372036854775806 ---
-int(1)
---- testing: 9223372036854775807 % 9.2233720368548E+18 ---
-int(9223372036854775807)
---- testing: 9223372036854775807 % -9223372036854775807 ---
-int(0)
---- testing: 9223372036854775807 % -9.2233720368548E+18 ---
-int(9223372036854775807)
-===DONE===
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/bug21820.php b/hphp/test/zend/bad/tests-lang/bug21820.php
deleted file mode 100644
index da97117ac..000000000
--- a/hphp/test/zend/bad/tests-lang/bug21820.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-error_reporting(E_ALL);
-
-$arr = array('foo' => 'bar');
-echo "$arr['foo']";
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/bug21820.php.expectf b/hphp/test/zend/bad/tests-lang/bug21820.php.expectf
deleted file mode 100644
index 0985d6113..000000000
--- a/hphp/test/zend/bad/tests-lang/bug21820.php.expectf
+++ /dev/null
@@ -1 +0,0 @@
-Parse error: %s error, %s(T_STRING)%s(T_VARIABLE)%s(T_NUM_STRING)%sin %sbug21820.php on line %d
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_get_arg.003.php b/hphp/test/zend/bad/tests-lang/func_get_arg.003.php
deleted file mode 100644
index 060451d2a..000000000
--- a/hphp/test/zend/bad/tests-lang/func_get_arg.003.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-var_dump (func_get_arg(0));
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_get_arg.003.php.expectf b/hphp/test/zend/bad/tests-lang/func_get_arg.003.php.expectf
deleted file mode 100644
index 32195d571..000000000
--- a/hphp/test/zend/bad/tests-lang/func_get_arg.003.php.expectf
+++ /dev/null
@@ -1,2 +0,0 @@
-HipHop Warning: %a
-bool(false)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_get_args.003.php b/hphp/test/zend/bad/tests-lang/func_get_args.003.php
deleted file mode 100644
index 2ab67e586..000000000
--- a/hphp/test/zend/bad/tests-lang/func_get_args.003.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-var_dump(func_get_args());	
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_get_args.003.php.expectregex b/hphp/test/zend/bad/tests-lang/func_get_args.003.php.expectregex
deleted file mode 100644
index 731ae2f26..000000000
--- a/hphp/test/zend/bad/tests-lang/func_get_args.003.php.expectregex
+++ /dev/null
@@ -1,2 +0,0 @@
-HipHop Warning: .+
-bool\(false\)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_num_args.003.php b/hphp/test/zend/bad/tests-lang/func_num_args.003.php
deleted file mode 100644
index a7cb12368..000000000
--- a/hphp/test/zend/bad/tests-lang/func_num_args.003.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-var_dump(func_num_args());	
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/tests-lang/func_num_args.003.php.expectf b/hphp/test/zend/bad/tests-lang/func_num_args.003.php.expectf
deleted file mode 100644
index 3afcb4275..000000000
--- a/hphp/test/zend/bad/tests-lang/func_num_args.003.php.expectf
+++ /dev/null
@@ -1,2 +0,0 @@
-HipHop Warning: %a
-int(-1)
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/020.php b/hphp/test/zend/bad/zend/020.php
deleted file mode 100644
index a7011d988..000000000
--- a/hphp/test/zend/bad/zend/020.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-var_dump(func_get_arg(1,2,3));
-var_dump(func_get_arg(1));
-var_dump(func_get_arg());
-
-function bar() {
-	var_dump(func_get_arg(1));
-}
-
-function foo() {
-	bar(func_get_arg(1));
-}
-
-foo(1,2);
-
-echo "Done\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/020.php.expectf b/hphp/test/zend/bad/zend/020.php.expectf
deleted file mode 100644
index 2b85b487d..000000000
--- a/hphp/test/zend/bad/zend/020.php.expectf
+++ /dev/null
@@ -1,9 +0,0 @@
-HipHop Warning: %a
-NULL
-HipHop Warning: %a
-bool(false)
-HipHop Warning: %a
-NULL
-HipHop Warning: %a
-bool(false)
-Done
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug35239.php b/hphp/test/zend/bad/zend/bug35239.php
deleted file mode 100644
index ed0b9dc9c..000000000
--- a/hphp/test/zend/bad/zend/bug35239.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$a = new stdClass; 
-$a->x0 = new stdClass;
-$a->x0->y0 = 'a';
-$a->x0->y1 =& $a->x0;
-$a->x0->y2 =& $a->x0;
-$a->x0->y0 = 'b';
-var_dump($a);
-$a->x0->y1 = "ok\n";
-echo $a->x0;
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug35239.php.expectf b/hphp/test/zend/bad/zend/bug35239.php.expectf
deleted file mode 100644
index a706e2e28..000000000
--- a/hphp/test/zend/bad/zend/bug35239.php.expectf
+++ /dev/null
@@ -1,12 +0,0 @@
-object(stdClass)#%d (1) {
-  ["x0"]=>
-  &object(stdClass)#%d (3) {
-    ["y0"]=>
-    string(1) "b"
-    ["y1"]=>
-    *RECURSION*
-    ["y2"]=>
-    *RECURSION*
-  }
-}
-ok
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug54265.php b/hphp/test/zend/bad/zend/bug54265.php
deleted file mode 100644
index 10356bfa2..000000000
--- a/hphp/test/zend/bad/zend/bug54265.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-function my_errorhandler($errno,$errormsg) {
-  global $my_var;
-  $my_var = 0;
-  echo "EROOR: $errormsg\n";
-}
-set_error_handler("my_errorhandler");
-$my_var = str_repeat("A",$my_var[0]->errormsg = "xyz");
-echo "ok\n";
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug54265.php.expectf b/hphp/test/zend/bad/zend/bug54265.php.expectf
deleted file mode 100644
index 1fd808cb0..000000000
--- a/hphp/test/zend/bad/zend/bug54265.php.expectf
+++ /dev/null
@@ -1,2 +0,0 @@
-EROOR: Creating default object from empty value
-ok
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug55705.php b/hphp/test/zend/bad/zend/bug55705.php
deleted file mode 100644
index e2ebba06e..000000000
--- a/hphp/test/zend/bad/zend/bug55705.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-function f(callable $c) {}
-f();
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/bug55705.php.expectf b/hphp/test/zend/bad/zend/bug55705.php.expectf
deleted file mode 100644
index 84ab28484..000000000
--- a/hphp/test/zend/bad/zend/bug55705.php.expectf
+++ /dev/null
@@ -1 +0,0 @@
-Catchable fatal error: Argument 1 passed to f() must be callable, none given, called in hphp/test/zend/bad/zend/bug55705.php on line 3 and defined in hphp/test/zend/bad/zend/bug55705.php on line %d
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/callable_type_hint_001.php b/hphp/test/zend/bad/zend/callable_type_hint_001.php
deleted file mode 100644
index 8eba4cb03..000000000
--- a/hphp/test/zend/bad/zend/callable_type_hint_001.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-class bar {
-    function baz() {}
-    static function foo() {}
-}
-function foo(callable $bar) {
-    var_dump($bar);
-}
-$closure = function () {};
-
-foo("strpos");
-foo("foo");
-foo(array("bar", "baz"));
-foo(array("bar", "foo"));
-foo($closure);
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/callable_type_hint_001.php.expectf b/hphp/test/zend/bad/zend/callable_type_hint_001.php.expectf
deleted file mode 100644
index 6e2168023..000000000
--- a/hphp/test/zend/bad/zend/callable_type_hint_001.php.expectf
+++ /dev/null
@@ -1,18 +0,0 @@
-string(6) "strpos"
-string(3) "foo"
-
-Strict Standards: Non-static method bar::baz() should not be called statically in %scallable_type_hint_001.php on line %d
-array(2) {
-  [0]=>
-  string(3) "bar"
-  [1]=>
-  string(3) "baz"
-}
-array(2) {
-  [0]=>
-  string(3) "bar"
-  [1]=>
-  string(3) "foo"
-}
-object(Closure)#%d (0) {
-}
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/callable_type_hint_003.php b/hphp/test/zend/bad/zend/callable_type_hint_003.php
deleted file mode 100644
index 16c6b0a0f..000000000
--- a/hphp/test/zend/bad/zend/callable_type_hint_003.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-function foo(callable $a, $b, callable $c) {
-	var_dump($a, $b, $c);
-}
-function bar(callable $a = null) {
-	var_dump($a);
-}
-
-foo("strpos", 123, "strpos");
-bar("substr");
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/callable_type_hint_003.php.expectf b/hphp/test/zend/bad/zend/callable_type_hint_003.php.expectf
deleted file mode 100644
index 9cb9eb2d5..000000000
--- a/hphp/test/zend/bad/zend/callable_type_hint_003.php.expectf
+++ /dev/null
@@ -1,4 +0,0 @@
-string(6) "strpos"
-int(123)
-string(6) "strpos"
-string(6) "substr"
\ No newline at end of file
diff --git a/hphp/test/zend/good/zend/closure_033.php b/hphp/test/zend/bad/zend/closure_033.php
similarity index 100%
rename from hphp/test/zend/good/zend/closure_033.php
rename to hphp/test/zend/bad/zend/closure_033.php
diff --git a/hphp/test/zend/bad/zend/closure_033.php.expectf b/hphp/test/zend/bad/zend/closure_033.php.expectf
new file mode 100644
index 000000000..aa451a735
--- /dev/null
+++ b/hphp/test/zend/bad/zend/closure_033.php.expectf
@@ -0,0 +1,2 @@
+Test::{closure}()
+HipHop Fatal error: %a
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/heredoc_005.php b/hphp/test/zend/bad/zend/heredoc_005.php
deleted file mode 100644
index d0a5d135a..000000000
--- a/hphp/test/zend/bad/zend/heredoc_005.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-require_once 'nowdoc.inc';
-
-print <<<ENDOFHEREDOC
-This is heredoc test #s $a, $b, $c['c'], and $d->d.
-
-ENDOFHEREDOC;
-
-$x = <<<ENDOFHEREDOC
-This is heredoc test #s $a, $b, $c['c'], and $d->d.
-
-ENDOFHEREDOC;
-
-print "{$x}";
-
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/heredoc_005.php.expectf b/hphp/test/zend/bad/zend/heredoc_005.php.expectf
deleted file mode 100644
index aef93bc40..000000000
--- a/hphp/test/zend/bad/zend/heredoc_005.php.expectf
+++ /dev/null
@@ -1 +0,0 @@
-Parse error: %s in %sheredoc_005.php on line 6
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/jump13.php b/hphp/test/zend/bad/zend/jump13.php
deleted file mode 100644
index 15e4f848c..000000000
--- a/hphp/test/zend/bad/zend/jump13.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-goto a;
-e: return;
-try {
-    a: print 1;
-    goto b;
-    try {
-        b: print 2;
-        goto c;
-    }
-    catch(Exception $e) {
-        c: print 3;
-        goto d;    
-    }    
-}
-catch(Exception $e) {
-    d: print 4;
-    goto e;    
-}
-?>
\ No newline at end of file
diff --git a/hphp/test/zend/bad/zend/jump13.php.expectf b/hphp/test/zend/bad/zend/jump13.php.expectf
deleted file mode 100644
index 274c0052d..000000000
--- a/hphp/test/zend/bad/zend/jump13.php.expectf
+++ /dev/null
@@ -1 +0,0 @@
-1234
\ No newline at end of file
diff --git a/hphp/test/zend/config.hdf b/hphp/test/zend/config.hdf
index 9ec774c3f..a91091ebb 100644
--- a/hphp/test/zend/config.hdf
+++ b/hphp/test/zend/config.hdf
@@ -1,3 +1,3 @@
 Eval {
-  EnableObjDestructCall = true
-}
\ No newline at end of file
+ EnableObjDestructCall = true
+ }
\ No newline at end of file
diff --git a/hphp/test/zend/bad/ext-date/gmstrftime_basic.php b/hphp/test/zend/good/ext-date/gmstrftime_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-date/gmstrftime_basic.php
rename to hphp/test/zend/good/ext-date/gmstrftime_basic.php
diff --git a/hphp/test/zend/bad/ext-date/gmstrftime_basic.php.expectf b/hphp/test/zend/good/ext-date/gmstrftime_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-date/gmstrftime_basic.php.expectf
rename to hphp/test/zend/good/ext-date/gmstrftime_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-date/microtime_basic.php b/hphp/test/zend/good/ext-date/microtime_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-date/microtime_basic.php
rename to hphp/test/zend/good/ext-date/microtime_basic.php
diff --git a/hphp/test/zend/bad/ext-date/microtime_basic.php.expectf b/hphp/test/zend/good/ext-date/microtime_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-date/microtime_basic.php.expectf
rename to hphp/test/zend/good/ext-date/microtime_basic.php.expectf
diff --git a/hphp/test/zend/bad/ext-date/strftime_basic.php b/hphp/test/zend/good/ext-date/strftime_basic.php
similarity index 100%
rename from hphp/test/zend/bad/ext-date/strftime_basic.php
rename to hphp/test/zend/good/ext-date/strftime_basic.php
diff --git a/hphp/test/zend/bad/ext-date/strftime_basic.php.expectf b/hphp/test/zend/good/ext-date/strftime_basic.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-date/strftime_basic.php.expectf
rename to hphp/test/zend/good/ext-date/strftime_basic.php.expectf
diff --git a/hphp/test/zend/good/ext-hash/hash_error.php b/hphp/test/zend/good/ext-hash/hash_error.php
index b628b9154..75fc20c79 100644
--- a/hphp/test/zend/good/ext-hash/hash_error.php
+++ b/hphp/test/zend/good/ext-hash/hash_error.php
@@ -3,7 +3,7 @@
 /* Prototype  : string hash  ( string $algo  , string $data  [, bool $raw_output  ] )
  * Description: Generate a hash value (message digest)
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 echo "*** Testing hash() : error conditions ***\n";
 
@@ -12,7 +12,7 @@ var_dump(hash());
 var_dump(hash('adler32'));
 
 echo "\n-- Testing hash() function with more than expected no. of arguments --\n";
-$extra_arg= 10;
+$extra_arg= 10; 
 var_dump(hash('adler32', '', false, $extra_arg));
 
 echo "\n-- Testing hash() function with invalid hash algorithm --\n";
diff --git a/hphp/test/zend/good/ext-hash/hash_file_basic.php b/hphp/test/zend/good/ext-hash/hash_file_basic.php
index 119359981..4231c563f 100644
--- a/hphp/test/zend/good/ext-hash/hash_file_basic.php
+++ b/hphp/test/zend/good/ext-hash/hash_file_basic.php
@@ -2,7 +2,7 @@
 /* Prototype  : string hash_file(string algo, string filename[, bool raw_output = false])
  * Description: Generate a hash of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
  */
 
 echo "*** Testing hash_file() : basic functionality ***\n";
diff --git a/hphp/test/zend/good/ext-hash/hash_file_error.php b/hphp/test/zend/good/ext-hash/hash_file_error.php
index 690122bf9..c8316c04f 100644
--- a/hphp/test/zend/good/ext-hash/hash_file_error.php
+++ b/hphp/test/zend/good/ext-hash/hash_file_error.php
@@ -2,7 +2,7 @@
 /* Prototype  : string hash_file(string algo, string filename[, bool raw_output = false])
  * Description: Generate a hash of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
  */
 
 echo "*** Testing hash_file() : error conditions ***\n";
diff --git a/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php b/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php
index 8015aae42..204c5f5d7 100644
--- a/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php
+++ b/hphp/test/zend/good/ext-hash/hash_hmac_file_error.php
@@ -3,7 +3,7 @@
 /* Prototype  : string hash_hmac_file ( string algo, string filename, string key [, bool raw_output] )
  * Description: Generate a keyed hash value using the HMAC method and the contents of a given file
  * Source code: ext/hash/hash.c
- * Alias to functions:
+ * Alias to functions: 
 */
 
 echo "*** Testing hash() : error conditions ***\n";
@@ -17,7 +17,7 @@ var_dump(hash_hmac_file('crc32'));
 var_dump(hash_hmac_file('crc32', $file));
 
 echo "\n-- Testing hash_hmac_file() function with more than expected no. of arguments --\n";
-$extra_arg = 10;
+$extra_arg = 10; 
 hash_hmac_file('crc32', $file, $key, TRUE, $extra_arg);
 
 echo "\n-- Testing hash_hmac_file() function with invalid hash algorithm --\n";
diff --git a/hphp/test/zend/good/ext-imap/imap_alerts_error.php b/hphp/test/zend/good/ext-imap/imap_alerts_error.php
index 80b6f1aa9..b3356ab9a 100644
--- a/hphp/test/zend/good/ext-imap/imap_alerts_error.php
+++ b/hphp/test/zend/good/ext-imap/imap_alerts_error.php
@@ -1,8 +1,8 @@
 <?php
 /* Prototype  : array imap_alerts(void)
- * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called.
+ * Description: Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called. 
  * Source code: ext/imap/php_imap.c
- * Alias to functions:
+ * Alias to functions: 
  */
 
 echo "*** Testing imap_alerts() : error conditions ***\n";
diff --git a/hphp/test/zend/good/ext-imap/imap_base64_basic.php b/hphp/test/zend/good/ext-imap/imap_base64_basic.php
index 080f220f6..2bcbe201c 100644
--- a/hphp/test/zend/good/ext-imap/imap_base64_basic.php
+++ b/hphp/test/zend/good/ext-imap/imap_base64_basic.php
@@ -28,7 +28,7 @@ if (imap_base64($base64) == $hex) {
 	echo "TEST PASSED\n";
 } else {
 	echo "TEST FAILED";
-}
+}		
 
 ?>
 ===Done===
\ No newline at end of file
diff --git a/hphp/test/zend/good/ext-imap/imap_binary_basic.php b/hphp/test/zend/good/ext-imap/imap_binary_basic.php
index 453f0feb0..95013632b 100644
--- a/hphp/test/zend/good/ext-imap/imap_binary_basic.php
+++ b/hphp/test/zend/good/ext-imap/imap_binary_basic.php
@@ -11,7 +11,7 @@ $str = b'This is an example string to be base 64 encoded';
 $base64 = imap_binary($str);
 var_dump(bin2hex($base64));
 
-echo "Encode a string which results in more than 60 charters of output\n";
+echo "Encode a string which results in more than 60 charters of output\n"; 
 $str = b'This is a long string with results in more than 60 characters of output';
 $base64 = imap_binary($str);
 var_dump(bin2hex($base64));
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname.php b/hphp/test/zend/good/ext-posix/posix_ttyname.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname.php.expectf
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation1.php b/hphp/test/zend/good/ext-posix/posix_ttyname_variation1.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation1.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation1.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation1.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname_variation1.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation1.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation1.php.expectf
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation2.php b/hphp/test/zend/good/ext-posix/posix_ttyname_variation2.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation2.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation2.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation2.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname_variation2.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation2.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation2.php.expectf
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation3.php b/hphp/test/zend/good/ext-posix/posix_ttyname_variation3.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation3.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation3.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation3.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname_variation3.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation3.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation3.php.expectf
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation4.php b/hphp/test/zend/good/ext-posix/posix_ttyname_variation4.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation4.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation4.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation4.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname_variation4.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation4.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation4.php.expectf
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation7.php b/hphp/test/zend/good/ext-posix/posix_ttyname_variation7.php
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation7.php
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation7.php
diff --git a/hphp/test/zend/bad/ext-posix/posix_ttyname_variation7.php.expectf b/hphp/test/zend/good/ext-posix/posix_ttyname_variation7.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/ext-posix/posix_ttyname_variation7.php.expectf
rename to hphp/test/zend/good/ext-posix/posix_ttyname_variation7.php.expectf
diff --git a/hphp/test/zend/bad/zend/bug43703.php b/hphp/test/zend/good/zend/bug43703.php
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43703.php
rename to hphp/test/zend/good/zend/bug43703.php
diff --git a/hphp/test/zend/bad/zend/bug43703.php.expectf b/hphp/test/zend/good/zend/bug43703.php.expectf
similarity index 100%
rename from hphp/test/zend/bad/zend/bug43703.php.expectf
rename to hphp/test/zend/good/zend/bug43703.php.expectf
diff --git a/hphp/test/zend/good/zend/closure_033.php.expectf b/hphp/test/zend/good/zend/closure_033.php.expectf
deleted file mode 100644
index 3fd748ad8..000000000
--- a/hphp/test/zend/good/zend/closure_033.php.expectf
+++ /dev/null
@@ -1,2 +0,0 @@
-Test::%a
-HipHop Fatal error: %a
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index b0f7fd7d6..dabb99c78 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -14,100 +14,50 @@ import shutil
 import subprocess
 import sys
 
-bad_tests = (
-    # SESSION is bused on husdon
-    'unset_cv05.php', 
-    'unset_cv06.php',
-
-    # unpredictable numbers - we need param matching
-    'bug29971.php',
-    'bug35143.php',
-    'gettimeofday_basic.php',
-    'localtime_basic.php',
-    'time_basic.php',
-    'posix_getpgid_basic.php',
-    'posix_getpgid_basic.php',
-    'posix_getpgrp_basic.php',
-    'posix_getpid_basic.php',
-    'posix_getppid_basic.php',
-    'posix_getsid_basic.php',
-    'posix_times_basic.php',
-    'socket_getsockname.php',
-    'fileinode_variation1.php',
-    'filestat.php',
-    'fstat_basic.php',
-    'fstat.php',
-    'touch_basic.php',
-    'openssl_random_pseudo_bytes.php',
-    'pcntl_fork_basic.php',
-    'posix_times.php',
-    'array_diff_assoc_variation6.php',
-    'bug39322.php',
-    'getmypid_basic.php',
-    'getrusage_basic.php',
-   
-    # not implemented extensions
-    'phar', # this appears in filenames
-
-    # works in interp but not others
-    'bug25922.php',
-    'bug34064.php',
-    'objects_029.php',
-    'objects_030.php',
-
-    # line number is inconsistent on stack overflow
-    'bug41633_3.php',
-
-    # broken in Jenkins
-    'bug35239.php',
-    'bug54265.php',
-    
-    # our build machines have no members in group 0...
-    'ext-posix/posix_getgrgid.php',
-)
-
+# Don't even pull these into the repo. 
+# We want runnig the bad tests to still complete.
 no_import = (
     # these hang forever
-    '005a.phpt',
-    'array_012.phpt',
-    'array_pad_variation2.phpt',
-    'bug27508.phpt',
-    'gzgetc_basic.phpt',
-    'gzgets_basic.phpt',
-    'observer_003.phpt',
-    'observer_004.phpt',
-    'observer_005.phpt',
-    'observer_006.phpt',
-    'observer_009.phpt',
-    'sleep_error.phpt',
-    'socket_select-wrongparams-1.phpt',
-    'test010.phpt',
-    'usleep_error.phpt',
+    '/ext/sockets/tests/socket_select-wrongparams-1.phpt',
+    '/ext/spl/tests/array_012.phpt',
+    '/ext/spl/tests/observer_003.phpt',
+    '/ext/spl/tests/observer_004.phpt',
+    '/ext/spl/tests/observer_005.phpt',
+    '/ext/spl/tests/observer_006.phpt',
+    '/ext/spl/tests/observer_009.phpt',
+    '/ext/standard/tests/array/array_pad_variation2.phpt',
+    '/ext/standard/tests/file/bug27508.phpt',
+    '/ext/standard/tests/general_functions/sleep_error.phpt',
+    '/ext/standard/tests/general_functions/usleep_error.phpt',
+    '/ext/zlib/tests/gzgetc_basic.phpt',
+    '/ext/zlib/tests/gzgets_basic.phpt',
+    '/tests/func/005a.phpt',
+    '/tests/run-test/test010.phpt',
 
     # segfaults
-    'bz2/tests/004.phpt',
-    'date/tests/bug50055.phpt',
-    'operators/divide_basiclong_64bit.phpt',
-    'operators/modulus_basiclong_64bit.phpt',
-    'lang/bug21820.phpt',
-    'lang/func_get_arg.003.phpt',
-    'lang/func_num_args.003.phpt',
-    'lang/func_get_args.003.phpt',
-    'func/010.phpt',
-    'Zend/tests/020.phpt',
-    'Zend/tests/bug35239.phpt',
-    'Zend/tests/bug54265.phpt',
-    'Zend/tests/bug55705.phpt',
-    'Zend/tests/callable_type_hint_001.phpt',
-    'Zend/tests/callable_type_hint_003.phpt',
-    'Zend/tests/jump13.phpt',
-    'Zend/tests/heredoc_005.phpt',
-    'gd/tests/crafted_gd2.phpt',
-    'pcntl/tests/pcntl_exec.phpt',
-    'pcntl/tests/pcntl_exec_2.phpt',
-    'pcntl/tests/pcntl_exec_3.phpt',
-    'session/tests/bug61728.phpt',
-    'session/tests/session_module_name_variation2.phpt',
+    '/Zend/tests/020.phpt',
+    '/Zend/tests/bug35239.phpt',
+    '/Zend/tests/bug54265.phpt',
+    '/Zend/tests/bug55705.phpt',
+    '/Zend/tests/callable_type_hint_001.phpt',
+    '/Zend/tests/callable_type_hint_003.phpt',
+    '/Zend/tests/heredoc_005.phpt',
+    '/Zend/tests/jump13.phpt',
+    '/ext/bz2/tests/004.phpt',
+    '/ext/date/tests/bug50055.phpt',
+    '/ext/gd/tests/crafted_gd2.phpt',
+    '/ext/pcntl/tests/pcntl_exec.phpt',
+    '/ext/pcntl/tests/pcntl_exec_2.phpt',
+    '/ext/pcntl/tests/pcntl_exec_3.phpt',
+    '/ext/session/tests/bug61728.phpt',
+    '/ext/session/tests/session_module_name_variation2.phpt',
+    '/tests/func/010.phpt',
+    '/tests/lang/bug21820.phpt',
+    '/tests/lang/func_get_arg.003.phpt',
+    '/tests/lang/func_get_args.003.phpt',
+    '/tests/lang/func_num_args.003.phpt',
+    '/tests/lang/operators/divide_basiclong_64bit.phpt',
+    '/tests/lang/operators/modulus_basiclong_64bit.phpt',
 
     # intermittent segfaults
     '/Zend/tests/001.phpt',
@@ -115,18 +65,16 @@ no_import = (
     '/Zend/tests/003.phpt',
 
     # not imported yet, but will be
-    '/ext/gd',
-    '/ext/standard',
     '/ext/mysql',
     '/ext/pdo_mysql',
     '/ext/pdo_sqlite',
     '/ext/pgsql',
     '/ext/spl',
     '/ext/sqlite3',
+    '/ext/standard',
     '/ext/xmlwriter',
 
     # not implemented extensions
-    '/sapi',
     '/ext/calendar',
     '/ext/com_dotnet',
     '/ext/dba',
@@ -146,9 +94,9 @@ no_import = (
     '/ext/odbc',
     '/ext/pdo_dblib',
     '/ext/pdo_firebird',
+    '/ext/pdo_oci',
     '/ext/pdo_odbc',
     '/ext/pdo_pgsql',
-    '/ext/pdo_oci',
     '/ext/phar',
     '/ext/pspell',
     '/ext/readline',
@@ -167,32 +115,65 @@ no_import = (
     '/ext/xmlrpc',
     '/ext/xsl',
     '/ext/zip',
+    '/sapi',
+)
+
+# For mark these as failing
+bad_tests = (
+    # SESSION is bused on husdon
+    '/zend/unset_cv05.php', 
+    '/zend/unset_cv06.php',
+
+    # unpredictable numbers - we need param matching
+    '/ext-date/bug35143.php',
+    '/ext-date/gettimeofday_basic.php',
+    '/ext-date/localtime_basic.php',
+    '/ext-date/time_basic.php',
+    '/ext-openssl/openssl_random_pseudo_bytes.php',
+    '/ext-pcntl/pcntl_fork_basic.php',
+    '/ext-posix/posix_getpgid_basic.php',
+    '/ext-posix/posix_getpgrp_basic.php',
+    '/ext-posix/posix_getpid_basic.php',
+    '/ext-posix/posix_getppid_basic.php',
+    '/ext-posix/posix_getsid_basic.php',
+    '/ext-posix/posix_times.php',
+    '/ext-posix/posix_times_basic.php',
+    '/ext-sockets/socket_getsockname.php',
+    '/ext-standard/array/array_diff_assoc_variation6.php',
+    '/ext-standard/file/fileinode_variation1.php',
+    '/ext-standard/file/filestat.php',
+    '/ext-standard/fstat.php',
+    '/ext-standard/fstat_basic.php',
+    '/ext-standard/general_functions/bug39322.php',
+    '/ext-standard/general_functions/getmypid_basic.php',
+    '/ext-standard/general_functions/getrusage_basic.php',
+    '/ext-standard/touch_basic.php',
+    '/tests-basic/bug29971.php',
+   
+    # not implemented extensions
+    'phar', # this appears in filenames
+
+    # works in interp but not others
+    '/tests-lang/bug25922.php',
+    '/zend/bug34064.php',
+    '/zend/objects_029.php',
+    '/zend/objects_030.php',
+
+    # line number is inconsistent on stack overflow
+    '/zend/bug41633_3.php',
+
+    # broken in Jenkins
+    '/zend/bug35239.php',
+    '/zend/bug54265.php',
+    
+    # our build machines have no members in group 0...
+    '/ext-posix/posix_getgrgid.php',
 )
 
 # Random other files that zend wants
 other_files = (
-    'curl_testdata1.txt',
-    'curl_testdata2.txt',
-    'autoload_root.p5c',
-    'autoload_derived.p5c',
-    'autoload_implements.p5c',
-    'autoload_interface.p5c',
-    'constants_basic_003.inc',
-    'interface_optional_arg_003.inc',
-    '015.inc',
-    '016.inc',
-    '023-2.inc',
-    'inc.inc',
-    'inc_throw.inc',
-    'bug54804.inc',
-    'nowdoc.inc',
-    'ns_022.inc',
-    'ns_027.inc',
-    'ns_028.inc',
-    'ns_065.inc',
-    'ns_066.inc',
-    'ns_067.inc',
-    'unset.inc',
+    '/ext-curl/curl_testdata1.txt',
+    '/ext-curl/curl_testdata2.txt',
     '/ext-exif/bug48378.jpeg',
     '/ext-gd/Tuffy.ttf',
     '/ext-gd/bug37346.gif',
@@ -236,12 +217,34 @@ other_files = (
     '/ext-xmlreader/relaxNG2.rng',
     '/ext-xmlreader/relaxNG3.rng',
     '/ext-zlib/004.txt.gz',
+    '/tests-classes/autoload_derived.p5c',
+    '/tests-classes/autoload_implements.p5c',
+    '/tests-classes/autoload_interface.p5c',
+    '/tests-classes/autoload_root.p5c',
+    '/tests-classes/constants_basic_003.inc',
+    '/tests-classes/interface_optional_arg_003.inc',
+    '/tests-lang/015.inc',
+    '/tests-lang/016.inc',
+    '/tests-lang/023-2.inc',
+    '/tests-lang/inc.inc',
+    '/tests-lang/inc_throw.inc',
     '/tests/quicktester.inc',
+    '/zend/bug54804.inc',
+    '/zend/nowdoc.inc',
+    '/zend/ns_022.inc',
+    '/zend/ns_027.inc',
+    '/zend/ns_028.inc',
+    '/zend/ns_065.inc',
+    '/zend/ns_066.inc',
+    '/zend/ns_067.inc',
+    '/zend/unset.inc',
 )
 
+# Map strings from one style to another
 errors = (
     # generic inconsistencies
-    ('Variable passed to ([^\s]+)\(\) is not an array or object', 'Invalid operand type was used: expecting an array'),
+    ('Variable passed to ([^\s]+)\(\) is not an array or object', 
+        'Invalid operand type was used: expecting an array'),
     ('bcdiv\(\): ', ''),
     ('bcsqrt\(\): ', ''),
     ('bcpowmod\(\): ', ''),
@@ -332,7 +335,8 @@ def walk(filename, source):
             # tests are really inconsistent about whitespace
             exp = re.sub(r'(\r\n|\r|\n)', '\n', exp.strip())
 
-            exp = exp.replace('in %s on', 'in %s/%s/%s on' % ('hphp/test/zend/all', source_dir, dest_filename))
+            exp = exp.replace('in %s on', 'in %s/%s/%s on' % 
+                    ('hphp/test/zend/all', source_dir, dest_filename))
 
             # PHP puts a newline in that we don't
             exp = exp.replace('\n\nFatal error:', '\nFatal error:')
@@ -343,9 +347,12 @@ def walk(filename, source):
             if key == 'EXPECTREGEX':
                 match_rest_of_line = '.+'
 
-            exp = re.sub(r'Fatal\\? error\\?:.*', 'HipHop Fatal error: '+match_rest_of_line, exp)
-            exp = re.sub(r'Warning\\?:.*', 'HipHop Warning: '+match_rest_of_line, exp)
-            exp = re.sub(r'Notice\\?:.*', 'HipHop Notice: '+match_rest_of_line, exp)
+            exp = re.sub(r'Fatal\\? error\\?:.*', 
+                    'HipHop Fatal error: '+match_rest_of_line, exp)
+            exp = re.sub(r'Warning\\?:.*', 
+                    'HipHop Warning: '+match_rest_of_line, exp)
+            exp = re.sub(r'Notice\\?:.*', 
+                    'HipHop Notice: '+match_rest_of_line, exp)
 
             for error in errors:
                 exp = re.sub(error[0], error[1], exp)
@@ -363,7 +370,7 @@ def walk(filename, source):
         exp = sections['EXPECTF']
         file(full_dest_filename+'.expectf', 'w').write(exp)
     else:
-        print "Malformed test, no --EXPECT-- or --EXPECTF-- or --EXPECTREGEX--: ", filename
+        print "Malformed test, no --EXPECT*--: ", filename
         return
 
     test = sections['FILE']
@@ -381,7 +388,8 @@ def walk(filename, source):
     if sections.has_key('COOKIE'):
         test = test.replace(
             '<?php', 
-            '<?php\n$_COOKIE = http_parse_cookie("' + sections['COOKIE'] + '");\n'
+            '<?php\n$_COOKIE = http_parse_cookie("' + 
+                sections['COOKIE'] + '");\n'
         )
     if sections.has_key('ENV'):
         for line in sections['ENV'].split('\n'):
@@ -449,6 +457,11 @@ if not os.path.isdir('test/zend/all'):
 else:
     print "Running all tests from zend/all"
 
+file('test/zend/hphp_config.hdf', 'w').write('')
+file('test/zend/config.hdf', 'w').write(
+    'Eval {\n EnableObjDestructCall = true\n }'
+)
+
 stdout = subprocess.Popen(
     [
         'tools/verify_to_json.php',
@@ -465,7 +478,6 @@ stdout = subprocess.Popen(
 # segfaults also print on stderr
 stdout = re.sub('\nsh: line 1:.*', '', stdout)
 # fbmake, you are crazy
-print stdout
 results = json.loads('['+stdout.strip().replace("\n", ",\n")+']')[-1]['results']
 
 if args.verbose: