make phinq tests slightly more reviewable

... attempting to use diff on expect files containing
 non-printing characters doesn't seem like a good idea, and having
 .expect that are treated as binary makes them hard to review.

Reviewed By: @hermanventer

Differential Revision: D1144149

(flaky www test)

hphp/runtime/ext/ext_collections.h

@@ -61,7 +61,7 @@ using ExtCollectionObjectData = ExtObjectDataFlags<
 void throwOOB(int64_t key) ATTRIBUTE_NORETURN;
 
 ///////////////////////////////////////////////////////////////////////////////
-// class BaseVector encapsulates functionality that is common to both
+// class BaseVector: encapsulates functionality that is common to both
 // c_Vector and c_FrozenVector. It doesn't map to any PHP-land class.
 
 class BaseVector : public ExtCollectionObjectData {
@@ -423,7 +423,6 @@ class c_Vector : public BaseVector {
   void initFvFields(c_FrozenVector* fv);
 
   // Friends
-
   friend void collectionAppend(ObjectData* obj, TypedValue* val);
   friend void triggerCow(c_Vector* vec);
 

hphp/test/quick/phinq/from1.php

@@ -11,7 +11,7 @@ $q = from $c in $customers
      select tuple($c->Name, $o->OrderID, $o->Total);
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo from();

hphp/test/quick/phinq/from2.php

@@ -12,5 +12,5 @@ $q = from $c in $customers
      select tuple($c->Name, $o->OrderID, $o->Total);
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/groupby1.php

@@ -13,7 +13,7 @@ $q = from $c in $customers
      select Map { "Country" => $g->Key, "CustCount" => $g->Count() };
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo into();

hphp/test/quick/phinq/groupby2.php

@@ -10,7 +10,7 @@ $q = from $c in $customers
      group $c->Name by $c->Country;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo in();

hphp/test/quick/phinq/groupby3.php

@@ -15,5 +15,5 @@ $q = from $c in getCustomers()
      select Map { "Country" => $g->Key, "CustCount" => $g->Count() };
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/into1.php

@@ -12,7 +12,7 @@ $q = from $student in $students
        group $student by $student->LastName;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo into();

hphp/test/quick/phinq/into2.php

@@ -15,5 +15,5 @@ $q = from $student in $f->students
        group $student by $student->LastName;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/join1.php

@@ -13,9 +13,7 @@ $q = from $c in $customers
      select tuple($c->Name, $o->OrderID, $o->Total);
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo (new C())->join();
-
-

hphp/test/quick/phinq/join2.php

@@ -17,7 +17,7 @@ $q = from $c in $customers
      select Map {"Name" => $c->Name, "OrderCount" => $n };
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo into();

hphp/test/quick/phinq/join3.php

@@ -11,5 +11,5 @@ $q = from $c in $customers
      select tuple($c->Name, $o->OrderDate, $p->ProductName);
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/let1.php

@@ -13,7 +13,7 @@ $q = from $o in $orders
      select Map {"OrderID" => $o->OrderID, "Total" => $t };
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo let();

hphp/test/quick/phinq/orderby1.php

@@ -14,7 +14,7 @@ $q = from $c in $customers
      select tuple($c->Name, $o->OrderID, $o->Total);
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo ascending();

hphp/test/quick/phinq/orderby2.php

@@ -9,7 +9,7 @@ $q = from $o in $orders
      select $o;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 $q2 = from $o in $orders
@@ -17,5 +17,5 @@ $q2 = from $o in $orders
      select $o;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/queryable.inc

@@ -7,3 +7,11 @@ class Queryable {
   }
 }
 
+function print_result($e) {
+  if (is_string($e)) {
+    echo 'string(', strlen($e), ')', ' with \000 printed as <0>:', "\n",
+      strtr($e, [chr(0) => '<0>']), "\n";
+  } else {
+    var_dump($e);
+  }
+}

hphp/test/quick/phinq/select1.php

@@ -13,7 +13,7 @@ function foo() {
 
 $q = foo();
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo select();

hphp/test/quick/phinq/select2.php

@@ -9,5 +9,5 @@ $q = from $c in $customers
      select $c;
 
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }

hphp/test/quick/phinq/where1.php

@@ -14,7 +14,7 @@ function foo() {
 
 $q = foo();
 foreach ($q as $e) {
-  echo $e."\n";
+  print_result($e);
 }
 
 echo where();