Handle "line %d" and extra lines for errors in expected output

2013-03-30 14:12:37 -07:00
commit 329d6c3aa3
@@ -1,16 +1,13 @@
 int(0)
 int(1)
-
 HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/001.php on line %d
 int(0)
 int(2)
 int(0)
-
 HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/001.php on line %d
 int(1)
 int(2)
 int(1)
-
 HipHop Warning: func_num_args():  Called from the global scope - no function context in hphp/test/zend/bad/001.php on line %d
 int(-1)
 Done
@@ -1,63 +1,45 @@
 HipHop Warning: func_get_arg():  The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d
 bool(false)
 int(10)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
 int(1)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/002.php on line %d and defined in hphp/test/zend/bad/002.php on line %d
-
 HipHop Warning: func_get_arg():  Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
 int(1)
 int(2)
-
 HipHop Warning: func_get_arg():  Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  The argument number should be >= 0 in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 0 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/002.php on line %d
 int(1)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
 int(1)
 int(2)
-
 HipHop Warning: func_get_arg():  Argument 2 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
 int(1)
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/002.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg():  Called from the global scope - no function context in hphp/test/zend/bad/002.php on line %d
 bool(false)
 Done
@@ -8,7 +8,6 @@ array(1) {
  [0]=>
  int(1)
 }
-
 HipHop Warning: Missing argument 1 for test2(), called in hphp/test/zend/bad/003.php on line %d and defined in hphp/test/zend/bad/003.php on line %d
 array(0) {
 }
@@ -20,7 +19,6 @@ array(2) {
 }
 array(0) {
 }
-
 HipHop Warning: Missing argument 2 for test3() in hphp/test/zend/bad/003.php on line %d
 array(1) {
  [0]=>
@@ -36,7 +34,6 @@ array(1) {
  [0]=>
  int(1)
 }
-
 HipHop Warning: func_get_args():  Called from the global scope - no function context in hphp/test/zend/bad/003.php on line %d
 bool(false)
 Done
@@ -1,7 +1,6 @@
 HipHop Warning: strncmp() expects exactly 3 parameters, 2 given in hphp/test/zend/bad/004.php on line %d
 NULL
 int(0)
-
 HipHop Warning: Length must be greater than or equal to 0 in hphp/test/zend/bad/004.php on line %d
 bool(false)
 int(0)
@@ -1,6 +1,5 @@
 HipHop Warning: strncasecmp() expects exactly 3 parameters, 1 given in hphp/test/zend/bad/006.php on line %d
 NULL
-
 HipHop Warning: Length must be greater than or equal to 0 in hphp/test/zend/bad/006.php on line %d
 bool(false)
 int(0)
@@ -1,9 +1,7 @@
 HipHop Warning: each() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/007.php on line %d
 NULL
-
 HipHop Warning: Variable passed to each() is not an array or object in hphp/test/zend/bad/007.php on line %d
 NULL
-
 HipHop Warning: Variable passed to each() is not an array or object in hphp/test/zend/bad/007.php on line %d
 NULL
 array(4) {
@@ -1,25 +1,19 @@
 HipHop Warning: define() expects at least 2 parameters, 0 given in hphp/test/zend/bad/008.php on line %d
 NULL
-
 HipHop Warning: define() expects at least 2 parameters, 1 given in hphp/test/zend/bad/008.php on line %d
 NULL
 bool(true)
-
 HipHop Warning: define() expects parameter 3 to be boolean, array given in hphp/test/zend/bad/008.php on line %d
 NULL
-
 HipHop Warning: define() expects parameter 1 to be string, array given in hphp/test/zend/bad/008.php on line %d
 NULL
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Constant test const already defined in hphp/test/zend/bad/008.php on line %d
 bool(false)
-
 HipHop Warning: Constants may only evaluate to scalar values in hphp/test/zend/bad/008.php on line %d
 bool(false)
-
 HipHop Warning: Constants may only evaluate to scalar values in hphp/test/zend/bad/008.php on line %d
 bool(false)
 int(1)
@@ -5,10 +5,8 @@ Strict Standards: Non-static method foo::bar() should not be called statically i
 string(3) "foo"
 string(3) "foo"
 string(3) "foo"
-
 HipHop Warning: get_class() called without object from outside a class in hphp/test/zend/bad/009.php on line %d
 bool(false)
-
 HipHop Warning: get_class() expects parameter 1 to be object, string given in hphp/test/zend/bad/009.php on line %d
 bool(false)
 string(3) "foo"
@@ -1,6 +1,5 @@
 HipHop Warning: property_exists() expects exactly 2 parameters, 0 given in hphp/test/zend/bad/011.php on line %d
 NULL
-
 HipHop Warning: property_exists() expects exactly 2 parameters, 1 given in hphp/test/zend/bad/011.php on line %d
 NULL
 bool(true)
@@ -16,13 +15,10 @@ bool(true)
 bool(true)
 bool(false)
 bool(false)
-
 HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d
 NULL
-
 HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d
 NULL
-
 HipHop Warning: First parameter must either be an object or the name of an existing class in hphp/test/zend/bad/011.php on line %d
 NULL
 bool(true)
@@ -2,7 +2,6 @@ HipHop Warning: class_exists() expects at least 1 parameter, 0 given in hphp/tes
 NULL
 bool(false)
 bool(false)
-
 HipHop Warning: class_exists() expects parameter 1 to be string, array given in hphp/test/zend/bad/012.php on line %d
 NULL
 bool(false)
@@ -2,7 +2,6 @@ HipHop Warning: interface_exists() expects at least 1 parameter, 0 given in hphp
 NULL
 bool(false)
 bool(false)
-
 HipHop Warning: interface_exists() expects parameter 1 to be string, array given in hphp/test/zend/bad/013.php on line %d
 NULL
 bool(false)
@@ -8,7 +8,6 @@ array(2) {
  [1]=>
  string(%d) "%s"
 }
-
 HipHop Warning: get_included_files() expects exactly 0 parameters, 2 given in hphp/test/zend/bad/014.php on line %d
 NULL
 array(2) {
@@ -17,7 +16,6 @@ array(2) {
  [1]=>
  string(%d) "%s"
 }
-
 HipHop Warning: get_included_files() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/014.php on line %d
 NULL
 array(2) {
@@ -1,18 +1,13 @@
 HipHop Warning: trigger_error() expects at least 1 parameter, 0 given in hphp/test/zend/bad/015.php on line %d
 NULL
-
 HipHop Notice: error in hphp/test/zend/bad/015.php on line %d
 bool(true)
-
 HipHop Warning: trigger_error() expects parameter 1 to be string, array given in hphp/test/zend/bad/015.php on line %d
 NULL
-
 HipHop Warning: Invalid error type specified in hphp/test/zend/bad/015.php on line %d
 bool(false)
-
 HipHop Warning: Invalid error type specified in hphp/test/zend/bad/015.php on line %d
 bool(false)
-
 HipHop Warning: error in hphp/test/zend/bad/015.php on line %d
 bool(true)

@@ -1,6 +1,5 @@
 HipHop Warning: get_resource_type() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/017.php on line %d
 NULL
-
 HipHop Warning: get_resource_type() expects parameter 1 to be resource, string given in hphp/test/zend/bad/017.php on line %d
 NULL
 string(6) "stream"
@@ -9,26 +8,21 @@ string(5) "array"
 int(%d)
 string(5) "array"
 int(%d)
-
 HipHop Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in hphp/test/zend/bad/017.php on line %d
 NULL
-
 HipHop Warning: get_defined_constants() expects at most 1 parameter, 2 given in hphp/test/zend/bad/017.php on line %d
 NULL
 string(5) "array"
 string(5) "array"
 int(%d)
-
 HipHop Warning: get_defined_functions() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/017.php on line %d
 NULL
 string(5) "array"
 int(%d)
-
 HipHop Warning: get_declared_interfaces() expects exactly 0 parameters, 1 given in hphp/test/zend/bad/017.php on line %d
 NULL
 string(5) "array"
 int(%d)
-
 HipHop Warning: get_extension_funcs() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/017.php on line %d
 NULL
 bool(false)
@@ -1,12 +1,9 @@
 HipHop Warning: constant() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/018.php on line %d
 NULL
-
 HipHop Warning: constant() expects exactly 1 parameter, 2 given in hphp/test/zend/bad/018.php on line %d
 NULL
-
 HipHop Warning: constant(): Couldn't find constant  in hphp/test/zend/bad/018.php on line %d
 NULL
-
 HipHop Warning: constant() expects parameter 1 to be string, array given in hphp/test/zend/bad/018.php on line %d
 NULL
 int(1)
@@ -13,7 +13,7 @@ echo "*** Testing unset(), empty() & isset() with scalar variables ***\n";

 // testing scalar variables
 $scalar_variables = array(
-  0,
+  0,    
  1,
  +1
  -1,
@@ -49,23 +49,23 @@ foreach ($scalar_variables as $scalar_var) {
  echo "-- Iteration $loop_counter --\n"; $loop_counter++;

  // checking with isset before unsetting, expected: bool(true)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) );  
  // checking if the var is empty, expected: bool(false) on most
  // except "", 0, "0", NULL, FALSE
-  var_dump( empty($scalar_var) );
-
+  var_dump( empty($scalar_var) );  
+  
  // destroy the variable using unset
-  unset( $scalar_var );
-  // dump and see if its destroyed, expcted: NULL
-  var_dump( $scalar_var );
+  unset( $scalar_var );   
+  // dump and see if its destroyed, expcted: NULL 
+  var_dump( $scalar_var ); 

  // check using isset to see if unset, expected: bool(false)
-  var_dump( isset($scalar_var) );
-  var_dump( isset($scalar_var, $set_var) );
+  var_dump( isset($scalar_var) ); 
+  var_dump( isset($scalar_var, $set_var) ); 

  // empty to check if empty, expecting bool(true)
-  var_dump( empty($scalar_var) );
+  var_dump( empty($scalar_var) ); 

  // isset() with two args, one arg only unset, expected: bool(false)
  var_dump( isset($scalar_var, $set_var) );
@@ -87,36 +87,36 @@ $array_variables = array(
  array(1 => "One", 2 => "two"),
  array("Name" => "Jack", "Age" => "30"),
  array(1,2, "One" => "1", 2 => "two", ""=>"empty", "" => '')
-);
+);  

 $outer_loop_counter = 1;
 foreach ($array_variables as $array_var) {
  echo "--- Outerloop Iteration $outer_loop_counter ---\n";
-
+  
  // check the isset and unset on non existing key
  $var = 1;  // a var which is defined
  // try to unset the element which is non-existent
-  unset($array_var['non_existent']);
+  unset($array_var['non_existent']); 
  // check using isset() & empty() on a non_existent element in the array
  var_dump( isset($array_var['non_existent']) );
  var_dump( isset($array_var['non_existent'], $var) );
  var_dump( isset($array_var['non_existent'], $array_var['none']) );
  var_dump( empty($array_var['non_existent']) );

-  // testing empty and isset on arrays
+  // testing empty and isset on arrays 
  var_dump( empty($array_var) ); // expecting bool(false), except: array(), which is considered empty
  var_dump( isset($array_var) ); // expecting bool(true), except: array(), which is not set

-  // get the keys of the $array_var
+  // get the keys of the $array_var 
  $keys = array_keys($array_var);
  // unset each element in the array and see the working of unset, isset & empty
  $inner_loop_counter = 1;
  foreach ($keys as $key_value) {
-    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n";
+    echo "-- Innerloop Iteration $inner_loop_counter of Outerloop Iteration $outer_loop_counter --\n"; 
    $inner_loop_counter++;

    // unset the element
-    unset($array_var[$key_value]);
+    unset($array_var[$key_value]); 
    // dump the array after element was unset
    var_dump($array_var);
    // check using isset for the element that was unset
@@ -124,10 +124,10 @@ foreach ($array_variables as $array_var) {
    // calling isset with more args
    var_dump( isset($array_var[$key_val], $array_var) ); //expected: bool(false)

-    // calling empty, expected bool(true)
+    // calling empty, expected bool(true) 
    var_dump( empty($array_var[$key_val]) );

-    // dump the array to see that that array did not get modified
+    // dump the array to see that that array did not get modified 
    // because of using isset, empty and unset on its element
    var_dump($array_var);
  }
@@ -141,7 +141,7 @@ foreach ($array_variables as $array_var) {
  // use isset to see that array is not set
  var_dump( isset($array_var) ); //expected: bool(false)
  var_dump( isset($array_var, $array_var[$key_val]) ); // expected: bool(false)
-
+  
  // empty() to see if the array is empty
  var_dump( empty($array_var) ); // expected: bool(true)
 }
@@ -180,12 +180,12 @@ foreach ($resources as $resource) {
  unset($temp_var);
  // now the isset() with both the args as unset
  var_dump( isset($resource, $temp_var) ); // expected: bool(false);
-
-  // dump the resource to see if there any effect on it
+  
+  // dump the resource to see if there any effect on it 
  var_dump($resource);
 }
 // unset and dump the array containing all the resources to see that
-// unset works correctly
+// unset works correctly 
 unset($resources);
 var_dump($resources);
 var_dump( isset($resources) );  //expected: bool(false)
@@ -197,12 +197,12 @@ class Point
  var $x;
  var $y;
  var $lable;
-
+  
  function Point($x, $y) {
    $this->x = $x;
    $this->y = $y;
  }
-
+  
  function setLable($lable) {
    $this->lable = $lable;
  }
@@ -212,8 +212,8 @@ class Point
 }
 $point1 = new Point(30,40);

-// use unset/empty/isset to check the object
-var_dump($point1); // dump the object
+// use unset/empty/isset to check the object 
+var_dump($point1); // dump the object 

 // check the object and member that is not set
 var_dump( isset($point1) );  // expected: bool(true)
@@ -226,7 +226,7 @@ $point1->setLable("Point1");
 var_dump( isset($point1->$lable) );  //expected: bool(true)
 var_dump( empty($point1->$lable) );  //expected: bool(false)

-// dump the object to see that obj was not harmed
+// dump the object to see that obj was not harmed 
 // because of the usage of the isset & empty
 var_dump($point1);

@@ -267,36 +267,36 @@ var_dump($point2);

 /* testing variation in operation for isset(), empty() & unset().
 Note: Most of the variation for function unset() is testing by a
-      set of testcases named "Zend/tests/unset_cv??.phpt", only
+      set of testcases named "Zend/tests/unset_cv??.phpt", only 
      variation not tested are attempted here */

 echo "\n*** Testing possible variation in operation for isset(), empty() & unset() ***\n";
-/* unset() variation1: checking unset on static variable inside a function.
+/* unset() variation1: checking unset on static variable inside a function. 
 * unset() destroys the variable only in the context of the rest of a function
 * Following calls will restore the previous value of a variable.
 */
 echo "\n** Testing unset() variation 1: unset on static variable inside a function **\n";
 function test_unset1() {
  static $static_var;
-
+  
  // increment the value of the static. this change is in function context
  $static_var ++;
-
-  echo "value of static_var before unset: $static_var\n";
-  // check using isset and empty
+ 
+  echo "value of static_var before unset: $static_var\n"; 
+  // check using isset and empty 
  var_dump( isset($static_var) );
  var_dump( empty($static_var) );
-
+  
  // unset the static var
  unset($static_var);
-  echo "value of static_var after unset: $static_var\n";
-  // check using isset and empty
+  echo "value of static_var after unset: $static_var\n"; 
+  // check using isset and empty 
  var_dump( isset($static_var) );
  var_dump( empty($static_var) );

  // assign a value to static var
  $static_var = 20;
-  echo "value of static_var after new assignment: $static_var\n";
+  echo "value of static_var after new assignment: $static_var\n"; 
 }
 // call the functiont
 test_unset1();
@@ -305,10 +305,10 @@ test_unset1();


 echo "\n** Testing unset() variation 2: unset on a variable passed by ref. inside of a function **\n";
-/* unset() variation2: Pass by reference
- * If a variable that is PASSED BY REFERENCE is unset() inside of a function,
+/* unset() variation2: Pass by reference  
+ * If a variable that is PASSED BY REFERENCE is unset() inside of a function, 
 * only the local variable is destroyed. The variable in the calling environment
- * will retain the same value as before unset()  was called.
+ * will retain the same value as before unset()  was called. 
 */
 function test_unset2( &$ref_val ) {
  // unset the variable passed
@@ -326,7 +326,7 @@ var_dump($value);
 test_unset2($value);
 var_dump($value);

-
+ 
 echo "\n** Testing unset() variation 3: unset on a global variable inside of a function **\n";
 /* unset() variation2: unset on a global variable inside a function
 * If a globalized variable is unset() inside of a function, only the
@@ -337,17 +337,17 @@ $global_var = 10;

 function test_unset3() {
  global $global_var;
-
-  // check the $global_var using isset and empty
-  var_dump( isset($global_var) );
-  var_dump( empty($global_var) );
-
+   
+  // check the $global_var using isset and empty 
+  var_dump( isset($global_var) ); 
+  var_dump( empty($global_var) ); 
+ 
  // unset the global var
  unset($global_var);
-
-  // check the $global_var using isset and empty
-  var_dump( isset($global_var) );
-  var_dump( empty($global_var) );
+ 
+  // check the $global_var using isset and empty 
+  var_dump( isset($global_var) ); 
+  var_dump( empty($global_var) ); 
 }

 var_dump($global_var);
@@ -3,7 +3,6 @@
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -15,7 +14,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -27,7 +25,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -39,7 +36,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -51,7 +47,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -63,7 +58,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -75,7 +69,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -87,7 +80,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -99,7 +91,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -111,7 +102,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -123,7 +113,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -135,7 +124,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -147,7 +135,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -159,7 +146,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -171,7 +157,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -183,7 +168,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -195,7 +179,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -207,7 +190,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -219,7 +201,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -231,7 +212,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -243,7 +223,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -255,7 +234,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -267,7 +245,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -279,7 +256,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -291,7 +267,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -303,7 +278,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -315,7 +289,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: scalar_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -332,7 +305,6 @@ bool(false)
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -348,18 +320,14 @@ bool(true)
 -- Innerloop Iteration 1 of Outerloop Iteration 2 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -375,18 +343,14 @@ bool(true)
 -- Innerloop Iteration 1 of Outerloop Iteration 3 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -402,18 +366,14 @@ bool(true)
 -- Innerloop Iteration 1 of Outerloop Iteration 4 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -429,18 +389,14 @@ bool(true)
 -- Innerloop Iteration 1 of Outerloop Iteration 5 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -462,13 +418,10 @@ array(3) {
  [3]=>
  int(4)
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(3) {
@@ -486,13 +439,10 @@ array(2) {
  [3]=>
  int(4)
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(2) {
@@ -506,13 +456,10 @@ array(1) {
  [3]=>
  int(4)
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(1) {
@@ -522,18 +469,14 @@ array(1) {
 -- Innerloop Iteration 4 of Outerloop Iteration 6 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -553,13 +496,10 @@ array(2) {
  [2]=>
  float(5.6)
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(2) {
@@ -573,13 +513,10 @@ array(1) {
  [2]=>
  float(5.6)
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(1) {
@@ -589,18 +526,14 @@ array(1) {
 -- Innerloop Iteration 3 of Outerloop Iteration 7 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -618,13 +551,10 @@ array(1) {
  [2]=>
  string(3) "two"
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(1) {
@@ -634,18 +564,14 @@ array(1) {
 -- Innerloop Iteration 2 of Outerloop Iteration 8 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -663,13 +589,10 @@ array(1) {
  ["Age"]=>
  string(2) "30"
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(1) {
@@ -679,18 +602,14 @@ array(1) {
 -- Innerloop Iteration 2 of Outerloop Iteration 9 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -714,13 +633,10 @@ array(4) {
  [""]=>
  string(0) ""
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(4) {
@@ -742,13 +658,10 @@ array(3) {
  [""]=>
  string(0) ""
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(3) {
@@ -766,13 +679,10 @@ array(2) {
  [""]=>
  string(0) ""
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(2) {
@@ -786,13 +696,10 @@ array(1) {
  [""]=>
  string(0) ""
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(1) {
@@ -802,18 +709,14 @@ array(1) {
 -- Innerloop Iteration 5 of Outerloop Iteration 10 --
 array(0) {
 }
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: key_val in hphp/test/zend/bad/019.php on line %d
 bool(true)
 array(0) {
 }
-
 HipHop Notice: Undefined variable: array_var in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -831,7 +734,6 @@ bool(false)
 bool(true)
 bool(false)
 bool(false)
-
 HipHop Notice: Undefined variable: resource in hphp/test/zend/bad/019.php on line %d
 NULL
 -- Iteration 2 --
@@ -844,10 +746,8 @@ bool(false)
 bool(true)
 bool(false)
 bool(false)
-
 HipHop Notice: Undefined variable: resource in hphp/test/zend/bad/019.php on line %d
 NULL
-
 HipHop Notice: Undefined variable: resources in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -864,16 +764,12 @@ object(Point)#%d (3) {
 }
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d
 bool(true)
-
 HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d
 bool(false)
-
 HipHop Notice: Undefined variable: lable in hphp/test/zend/bad/019.php on line %d
 bool(true)
 object(Point)#%d (3) {
@@ -898,7 +794,6 @@ bool(true)
 bool(false)
 bool(false)
 bool(true)
-
 HipHop Notice: Undefined variable: point1 in hphp/test/zend/bad/019.php on line %d
 NULL
 bool(false)
@@ -928,27 +823,24 @@ object(Point)#%d (3) {
 value of static_var before unset: 1
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d
-value of static_var after unset:
+value of static_var after unset: 
 bool(false)
 bool(true)
 value of static_var after new assignment: 20
 value of static_var before unset: 2
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d
-value of static_var after unset:
+value of static_var after unset: 
 bool(false)
 bool(true)
 value of static_var after new assignment: 20
 value of static_var before unset: 3
 bool(true)
 bool(false)
-
 HipHop Notice: Undefined variable: static_var in hphp/test/zend/bad/019.php on line %d
-value of static_var after unset:
+value of static_var after unset: 
 bool(false)
 bool(true)
 value of static_var after new assignment: 20
@@ -1,12 +1,9 @@
 HipHop Warning: func_get_arg() expects exactly 1 parameter, 3 given in hphp/test/zend/bad/020.php on line %d
 NULL
-
 HipHop Warning: func_get_arg():  Called from the global scope - no function context in hphp/test/zend/bad/020.php on line %d
 bool(false)
-
 HipHop Warning: func_get_arg() expects exactly 1 parameter, 0 given in hphp/test/zend/bad/020.php on line %d
 NULL
-
 HipHop Warning: func_get_arg():  Argument 1 not passed to function in hphp/test/zend/bad/020.php on line %d
 bool(false)
 Done
@@ -1,34 +1,22 @@
 HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d
 NULL
-
 HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d
-
 HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d
 NULL
-
 HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d
 int(1)
-
 HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d
-
 HipHop Notice: Undefined variable: %s in hphp/test/zend/bad/024.php on line %d
 int(0)
-
 HipHop Notice: Undefined variable: a in hphp/test/zend/bad/024.php on line %d
 NULL
-
 HipHop Notice: Undefined variable: b in hphp/test/zend/bad/024.php on line %d
 int(1)
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d
 NULL
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d
 NULL
-
 HipHop Notice: Undefined variable: c in hphp/test/zend/bad/024.php on line %d
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/024.php on line %d
 NULL
@@ -1,5 +1,4 @@
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/026.php on line %d
 ok
-
 HipHop Warning: Creating default object from empty value in hphp/test/zend/bad/026.php on line %d
 ok
@@ -1,7 +1,5 @@
 bool(true)
 bool(true)
 bool(true)
-
 HipHop Notice: Undefined offset: 2 in hphp/test/zend/bad/028.php on line %d
-
 HipHop Fatal error: Function name must be a string in hphp/test/zend/bad/028.php on line %d
@@ -4,7 +4,7 @@ class foo {
 	public $test = 0;
 	private $test_2 = 1;
 	protected $test_3 = 2;
-
+	
 	public function bar() {
 		try {
 			throw new Exception('foo');
@@ -12,13 +12,13 @@ class foo {
 			var_dump($this);
 		}

-		$this->baz();
+		$this->baz();		
 	}
-
+	
 	public function baz() {
 		foreach ($this as $k => $v) {
 			printf("'%s' => '%s'\n", $k, $v);
-		}
+		}		
 		print "ok\n";
 	}
 }
@@ -1,4 +1,4 @@
-<?php
+<?php 

 function test($var) { }
 test($arr[]);
@@ -1,4 +1,4 @@
-<?php
+<?php 

 $arr[1][2][3][4][5];

@@ -1,11 +1,6 @@
 HipHop Notice: Undefined variable: arr in hphp/test/zend/bad/033.php on line %d
-
 HipHop Notice: Undefined variable: arr in hphp/test/zend/bad/033.php on line %d
-
 HipHop Notice: Undefined variable: arr in hphp/test/zend/bad/033.php on line %d
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/033.php on line %d
-
 HipHop Warning: Creating default object from empty value in hphp/test/zend/bad/033.php on line %d
-
 HipHop Warning: Creating default object from empty value in hphp/test/zend/bad/033.php on line %d
@@ -1 +0,0 @@
-3
@@ -1,3 +1,2 @@
 HipHop Warning: Illegal offset type in hphp/test/zend/bad/036.php on line %d
-
 HipHop Warning: Illegal offset type in hphp/test/zend/bad/036.php on line %d
@@ -1,3 +1,2 @@
 int(1)
-
 HipHop Fatal error: Access to undeclared static property: Closure::$x in hphp/test/zend/bad/037.php on line %d
@@ -6,7 +6,7 @@ trait THello {
 }

 class TraitsTest {
-	use THello;
+	use THello;  
 }

 $test = new TraitsTest();
@@ -13,7 +13,7 @@ trait THelloA {

 class TraitsTest1 {
 	use THelloB;
-	use THelloA;
+	use THelloA;  
 }


@@ -4,7 +4,7 @@ error_reporting(E_ALL);
 trait THelloB {
  public function hello() {
    echo 'Hello';
-  }
+  }  
 }

 trait THelloA {
@@ -1,3 +1,2 @@
 bool(false)
-
 HipHop Fatal error: Call to protected method B1::f() from context 'B2' in hphp/test/zend/bad/access_modifiers_009.php on line %d
@@ -18,7 +18,7 @@ abstract class b extends a {
 class c extends b {
 	public function __construct() {
 		$this->test();
-	}
+	}	
 }

 new c;
@@ -1,3 +1,2 @@
 HipHop Notice: Object of class stdClass could not be converted to int in hphp/test/zend/bad/add_002.php on line %d
-
 HipHop Fatal error: Unsupported operand types in hphp/test/zend/bad/add_002.php on line %d
@@ -1,3 +1,2 @@
 HipHop Notice: Object of class stdClass could not be converted to int in hphp/test/zend/bad/add_003.php on line %d
-
 HipHop Fatal error: Unsupported operand types in hphp/test/zend/bad/add_003.php on line %d
@@ -4,7 +4,7 @@ trait T1 {
  function m2() { echo "T:m2\n"; }
 }

-class C1 {
+class C1 { 
  use T1 { m1 as a1; }
 }

@@ -1,5 +1,4 @@
 T:m1
 T:m1
 T:m2
-
 HipHop Fatal error: Call to undefined method C1::a2() in hphp/test/zend/bad/alias01.php on line %d
@@ -1,11 +1,11 @@
 <?php
 Class Base {
 	public function &test($foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}
+	}	
 }

 class Sub extends Base {
 	public function &test() {
-	}
+	}	
 }
 ?>
@@ -1 +1 @@
-Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d
+Strict Standards: Declaration of Sub::test() should be compatible with & Base::test($foo, array $bar, $option = NULL, $extra = 'llllllllll...') in %sargument_restriction_001.php on line %d 
@@ -1,11 +1,11 @@
 <?php
 Abstract Class Base {
 	public function test($foo, array &$bar, $option = NULL, $extra = 3.141592653589793238462643383279502884197169399375105  ) {
-	}
+	}	
 }

 class Sub extends Base {
 	public function test($foo, array &$bar) {
-	}
+	}	
 }
 ?>
@@ -4,11 +4,11 @@ class Foo {

 Abstract Class Base {
 	public function test(Foo $foo, array $bar, $option = NULL, $extra = "lllllllllllllllllllllllllllllllllllllllllllllllllll") {
-	}
+	}	
 }

 class Sub extends Base {
 	public function test() {
-	}
+	}	
 }
 ?>
@@ -1,6 +1,6 @@
 <?php
 class Sub implements ArrayAccess {
 	public function offsetSet() {
-	}
+	}	
 }
 ?>
@@ -1,11 +1,11 @@
 <?php
 Abstract Class Base {
 	public function test($foo, $extra = array("test")) {
-	}
+	}	
 }

 class Sub extends Base {
 	public function test($foo, $extra) {
-	}
+	}	
 }
 ?>
@@ -20,7 +20,7 @@ fwrite($fp, "This is a test.\n");
 print "Done.\n";
 fclose($fp);
 // Uncommenting the following 'print' line causes the segfault to stop occuring
-// print "2\n";
+// print "2\n";  
 readfile(dirname(__FILE__)."/test.txt");
 unlink(dirname(__FILE__)."/test.txt");
 ?>
@@ -2,3 +2,4 @@ array(1) {
  ["public"]=>
  string(6) "public"
 }
+
@@ -1 +0,0 @@
-===DONE===
@@ -45,7 +45,7 @@ echo $o;

 echo "===THROW===\n";

-class Error
+class Error 
 {
 	function __toString() {
 		throw new Exception("This is an error!");
@@ -2,5 +2,4 @@ Hello World!
 ===NONE===
 string(52) "Method None::__toString() must return a string value"
 ===THROW===
-
 HipHop Fatal error: Method Error::__toString() must not throw an exception in %sbug26166.php on line %d
@@ -2,7 +2,7 @@

 class array_iterator implements IteratorAggregate {
        public function getIterator() {
-                return array('foo', 'bar');
+                return array('foo', 'bar');     
        }
 }

@@ -1 +0,0 @@
-===DONE===
@@ -5,7 +5,7 @@ class Base
 	public    $Foo = 1;
 	protected $Bar = 2;
 	private   $Baz = 3;
-
+	
 	function __construct()
 	{
 		echo __METHOD__ . "\n";
@@ -3,7 +3,7 @@
 class BaseClass
 {
 	private $private_base = "Base";
-
+	
 	function printVars ()
 	{
 		var_dump($this->private_base);
@@ -1,9 +1,7 @@
 ===BASE===
 string(4) "Base"
-
 HipHop Notice: Undefined property: BaseClass::$private_child in %sbug29674.php on line %d
 NULL
 ===CHILD===
 string(4) "Base"
-
 HipHop Fatal error: Cannot access private property ChildClass::$private_child in %sbug29674.php on line %d
@@ -1,5 +1,5 @@
 foo: foo foo2
-bar: bar
+bar: bar 
 HipHop Notice: Undefined property: bar::$foo2 in hphp/test/zend/bad/bug29689.php on line %d

 ---baz--
@@ -1,3 +1,4 @@
 #0  userErrorHandler(8, Undefined variable: b, %sbug29896.php, 11, Array ([A1] => Test1)) called at [%sbug29896.php:11]
 #1  GenerateError1(Test1) called at [%sbug29896.php:16]
 #2  GenerateError2(Test2) called at [%sbug29896.php:19]
+
@@ -1 +1,2 @@
 ok
+
@@ -21,7 +21,7 @@ class hariCow extends FIIFO {
 		} catch(Exception $e) {
 		}
 	}
-
+	
 	public function __toString() {
 		return "Rusticus in asino sedet.";
 	}
@@ -1,2 +0,0 @@
-page_show
-===DONE===
@@ -1 +0,0 @@
-2 - 3
@@ -1 +1,2 @@
 HipHop Fatal error: Interface 'a' not found in %sbug30519.php on line 2
+
@@ -1,2 +0,0 @@
-Caught
-===DONE===
@@ -1,13 +1,13 @@
 <?php
 error_reporting(-1);
-
+                           
 function my_error($errno, $errstr, $errfile, $errline)
 {
        print "$errstr ($errno) in $errfile:$errline\n";
        return false;
 }
 set_error_handler('my_error');
-
+                           
 $f = fopen("/tmp/blah", "r");
 ?>
 ===DONE===
@@ -1,4 +1,3 @@
 fopen(/tmp/blah): failed to open stream: No such file or directory (2) in %s:%d
-
 HipHop Warning: fopen(/tmp/blah): failed to open stream: No such file or directory in hphp/test/zend/bad/bug30998.php on line %d
 ===DONE===
@@ -11,13 +11,10 @@ ok
 ok
 ok
 ok
-
 HipHop Notice: Trying to get property of non-object in hphp/test/zend/bad/bug31098.php on line %d
 ok
-
 HipHop Warning: Illegal string offset 'wrong' in hphp/test/zend/bad/bug31098.php on line %d
 ok
 ok
-
 HipHop Warning: Illegal string offset 'wrong' in hphp/test/zend/bad/bug31098.php on line %d
 ok
@@ -3,5 +3,4 @@ Caught: Test1::__construct
 __autoload(Test2,2)
 Caught: __autoload
 __autoload(Test3,3)
-
 HipHop Fatal error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code on line 1
@@ -1,4 +1,3 @@
 HipHop Notice: Undefined variable: nonesuchvar in hphp/test/zend/bad/bug31720.php on line %d
-
 HipHop Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in hphp/test/zend/bad/bug31720.php on line %d
 ===DONE===
@@ -1,2 +0,0 @@
-Caught
-===DONE===
@@ -3,8 +3,8 @@ class test
 {
    private static $instance = null;
    private $myname = '';
-
-    private function __construct( $value = '' )
+    
+    private function __construct( $value = '' ) 
    {
        echo "New class $value created \n";
        $this -> myname = $value;
@@ -33,7 +33,7 @@ class test
        }
        return $instance2;
    }
-    public function __destruct()
+    public function __destruct() 
    {
        if ( defined('SCRIPT_END') )
        {
@@ -42,7 +42,7 @@ class test
            echo "Class " . $this -> myname . " destroyed beforce script end\n";
        }
    }
-}
+}    
 echo "Try static instance inside class :\n";
 $getCopyofSingleton    = test::getInstance();
 $getCopyofSingleton    = null;
@@ -1,11 +1,11 @@
 Try static instance inside class :
-New class Singleton1 created
+New class Singleton1 created 
 Using old class Singleton1

 Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 49
 Using old class Singleton1
 Try static instance inside function :
-New class Singleton2 created
+New class Singleton2 created 
 Using old class Singleton2

 Strict Standards: Only variables should be assigned by reference in %sbug32322.php on line 55
@@ -1,7 +1,7 @@
 <?php
 class BUG {
  public $error = "please fix this thing, it wasted a nice part of my life!\n";
-  static function instance() {return new BUG();}
+  static function instance() {return new BUG();}  

  function __destruct()
  {
@@ -1,3 +1,4 @@
 BUG
 please fix this thing, it wasted a nice part of my life!
 this is still executed
+
@@ -3,7 +3,5 @@ A Object
 (
    [q] => 3
 )
-
 HipHop Notice: Indirect modification of overloaded property A::$whatever has no effect in %sbug32660.php on line 23
-
 HipHop Fatal error: Cannot assign by reference to overloaded object in %sbug32660.php on line 23
@@ -1 +1,2 @@
 ok
+
@@ -1 +0,0 @@
-===DONE===
@@ -1 +0,0 @@
-ok
@@ -2,9 +2,7 @@ object(Foo)#1 (1) {
  ["bar"]=>
  string(3) "bat"
 }
-
 HipHop Notice: Object of class Foo could not be converted to int in %sbug33999.php on line 9
 int(1)
-
 HipHop Notice: Object of class Foo could not be converted to double in %sbug33999.php on line 12
 float(1)
@@ -1,3 +1,4 @@
 (((
 here
 )))
+
@@ -3,7 +3,7 @@ class XmlTest {

    function test_ref(&$test)
    {
-	$test = "ok";
+    	$test = "ok";
    }

    function test($test)
@@ -2,5 +2,5 @@ array(1) {
  [0]=>
  string(2) "ok"
 }
-
 HipHop Fatal error: Cannot use [] for reading in %sbug34064.php on line 18
+
@@ -1,3 +1,4 @@
 bool(false)
 ok
 ok
+
@@ -1 +0,0 @@
-foobar
@@ -1,5 +1,5 @@
 <?php
-$a = new stdClass;
+$a = new stdClass; 
 $a->x0 = new stdClass;
 $a->x0->y0 = 'a';
 $a->x0->y1 =& $a->x0;
@@ -2,7 +2,7 @@
 $code = '
 <?php
  $x = <<<EOT
-some string
+some string    
 EOT
  $y = 2;
 ?>';
@@ -1,4 +1,3 @@
 HipHop Warning: Attempt to modify property of non-object in %sbug36303.php on line 3
-
 HipHop Warning: Invalid argument supplied for foreach() in %sbug36303.php on line 3
 ok
@@ -1,4 +1,4 @@
-<?php
+<?php 
 function test($s) {
  echo "'".trim(str_replace("&nbsp;", " ", htmlspecialchars_decode(strip_tags(highlight_string($s,1)))))."'\n";
 }
@@ -1,3 +1,4 @@
 EHLO
 EHLO
 EHLO
+
@@ -5,7 +5,7 @@ function error_handler($errno, $errstr, $errfile, $errline, $context) {

 set_error_handler('error_handler');

-class Foo {
+class Foo {	
 	function bar(array $foo) {
 	}
 }
@@ -3,5 +3,4 @@ C1::test
 B2::doTest
 C2::test
 B4::doTest
-
 HipHop Fatal error: Call to protected C4::__construct() from context 'B4' in %sbug37632.php on line %d
@@ -1,5 +1,4 @@
 string(3) "bar"
-
 HipHop Notice: Undefined offset: 2 in %sbug37667.php on line 16
 NULL
 object(Test)#%d (1) {
@@ -9,9 +8,7 @@ object(Test)#%d (1) {
    string(3) "bar"
  }
 }
-
 HipHop Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 20
-
 HipHop Notice: Indirect modification of overloaded property Test::$property has no effect in %sbug37667.php on line 21
 object(Test)#%d (1) {
  ["property":protected]=>
@@ -1,2 +1,3 @@
 clonned
 NO LEAK
+
@@ -1,7 +1,5 @@
 string(3) "Foo"
-
 HipHop Warning: Constants may only evaluate to scalar values in %sbug37811.php on line %d
-
 HipHop Notice: Use of undefined constant Baz - assumed 'Baz' in %sbug37811.php on line %d
 string(3) "Baz"
 ===DONE===
@@ -17,17 +17,17 @@ function get_error_context() {
  $backtrace = debug_backtrace();
  $n = 1;
  foreach ($backtrace as $call) {
-	echo $n++." ";
-	if (isset($call["file"])) {
-		echo $call["file"];
-		if (isset($call["line"])) {
-			echo ":".$call["line"];
-		}
-	}
-	if (isset($call["function"])) {
-		echo " ".$call["function"]."()";
-	}
-	echo "\n";
+  	echo $n++." ";
+  	if (isset($call["file"])) {
+  		echo $call["file"];
+  		if (isset($call["line"])) {
+  			echo ":".$call["line"];
+  		}
+  	}
+  	if (isset($call["function"])) {
+  		echo " ".$call["function"]."()";
+  	}
+  	echo "\n";
  }
  echo "\n";
 }
@@ -1,10 +1,10 @@
 <?php
 class A {
-
+	
 	public function __construct() {
 		$this -> foo();
 	}
-
+	
 	private function foo() {
 		echo __METHOD__ . "\r\n";
 	}
@@ -16,7 +16,7 @@ class B extends A {
 	}
 }

-class C extends A {
+class C extends A {	
 	protected function foo() {
 		echo __METHOD__ . "\r\n";
 	}
@@ -1,39 +1,21 @@
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: %i in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: %i in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 0 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 4 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 12 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: Uninitialized string offset: 12 in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
-
 HipHop Notice: String offset cast occurred in hphp/test/zend/bad/bug39018.php on line %d
 b
 Done
@@ -1,9 +1,9 @@
 <?php

-class a { function a() { var_dump("a::a() called"); } }
-class b extends a {}
+class a { function a() { var_dump("a::a() called"); } } 
+class b extends a {} 

-$b = new b;
+$b = new b; 
 var_dump(is_callable(array($b,"a")));
 var_dump(is_callable(array($b,"b")));
 var_dump(is_callable(array($b,"__construct")));
@@ -1,4 +1,4 @@
-<?php
+<?php 
  $s = "";
  list($a, $b) = $s[0];
 echo "I am alive";
@@ -1,6 +1,5 @@
 HipHop Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d
-
 HipHop Notice: Uninitialized string offset: 1 in %sbug39304.php on line %d
-
 HipHop Notice: Uninitialized string offset: 0 in %sbug39304.php on line %d
 I am alive
+
@@ -1,4 +1,4 @@
-<?php
+<?php 
  $s = "";
  list($a, $b) = $s[0];
  var_dump($a,$b);
@@ -1,7 +1,5 @@
 HipHop Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line %d
-
 HipHop Notice: Uninitialized string offset: 1 in %sbug39304_2_4.php on line %d
-
 HipHop Notice: Uninitialized string offset: 0 in %sbug39304_2_4.php on line %d
 string(0) ""
 string(0) ""
@@ -1 +0,0 @@
-LOWERCASE
--- a/Mostrar Mais
+++ b/Mostrar Mais
				`@@ -1 +1,2 @@`
				`HipHop Fatal error: Interface 'a' not found in %sbug30519.php on line 2`